diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/kdump/Makefile | 20 | ||||
| -rw-r--r-- | usr.bin/kdump/mkioctls | 27 |
2 files changed, 40 insertions, 7 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 0e1ff7df91c..5c17ab3ccb2 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/12/04 17:41:00 mickey Exp $ +# $OpenBSD: Makefile,v 1.7 2003/06/23 16:53:06 mickey Exp $ LDSTATIC=${STATIC} PROG= kdump @@ -7,11 +7,25 @@ SRCS= kdump.c ioctl.c subr.c .PATH: ${.CURDIR}/../ktrace CLEANFILES+=ioctl.c -ioctl.c: mkioctls +ioctl.c: ${.CURDIR}/mkioctls /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include/sys/ioctl.h \ ${DESTDIR}/usr/include/sys/ioctl_compat.h \ - ${DESTDIR}/usr/include/dev/wscons/wsconsio.h \ + ${DESTDIR}/usr/include/crypto/cryptodev.h \ + ${DESTDIR}/usr/include/dev/biovar.h \ + ${DESTDIR}/usr/include/dev/ccdvar.h \ + ${DESTDIR}/usr/include/dev/ramdisk.h \ + ${DESTDIR}/usr/include/dev/rndioctl.h \ ${DESTDIR}/usr/include/dev/systrace.h \ + ${DESTDIR}/usr/include/dev/wscons/wsconsio.h \ + ${DESTDIR}/usr/include/dev/vndioctl.h \ + ${DESTDIR}/usr/include/scsi/ses.h \ + ${DESTDIR}/usr/include/net/bpf.h \ + ${DESTDIR}/usr/include/net/if_ieee80211.h \ + ${DESTDIR}/usr/include/net/if_ppp.h \ + ${DESTDIR}/usr/include/net/if_tun.h \ + ${DESTDIR}/usr/include/net/pfvar.h \ + ${DESTDIR}/usr/include/netinet6/in6_var.h \ + ${DESTDIR}/usr/include/sys/agpio.h \ ${DESTDIR}/usr/include/sys/ataio.h \ ${DESTDIR}/usr/include/sys/audioio.h \ ${DESTDIR}/usr/include/sys/cdio.h \ diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 48019e95417..a205aee08b8 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: mkioctls,v 1.11 2003/06/03 02:56:09 millert Exp $ +# $OpenBSD: mkioctls,v 1.12 2003/06/23 16:53:06 mickey Exp $ # # Copyright (c) 1994 @@ -38,18 +38,30 @@ BEGIN { print "#include <sys/socketvar.h>" print "#include <net/route.h>" print "#include <net/if.h>" + print "#include <net/bpf.h>" print "#include <netinet/in.h>" print "#include <netinet/ip_mroute.h>" print "#include <netinet/if_ether.h>" + print "#include <netinet6/in6_var.h>" + print "#include <netinet6/nd6.h>" + print "#include <netinet6/ip6_mroute.h>" print "#include <net/if_bridge.h>" print "#include <sys/termios.h>" print "#include <netinet/ip_ipsp.h>" print "#include <net/if_enc.h>" + print "#include <net/if_ieee80211.h>" + print "#include <net/ppp_defs.h>" + print "#include <net/if_ppp.h>" + print "#include <net/if_pppvar.h>" + print "#include <net/if_tun.h>" + print "#include <net/pfvar.h>" print "#include <sys/disklabel.h>" + print "#include <sys/agpio.h>" print "#include <sys/ataio.h>" print "#include <sys/audioio.h>" print "#include <sys/cdio.h>" print "#include <sys/chio.h>" + print "#include <sys/disk.h>" print "#include <sys/dkbad.h>" print "#include <sys/dkio.h>" print "#include <sys/filio.h>" @@ -59,8 +71,15 @@ BEGIN { print "#include <sys/radioio.h>" print "#include <sys/scanio.h>" print "#include <sys/scsiio.h>" - print "#include <dev/wscons/wsconsio.h>" + print "#include <crypto/cryptodev.h>" + print "#include <dev/biovar.h>" + print "#include <dev/ccdvar.h>" + print "#include <dev/ramdisk.h>" + print "#include <dev/rndioctl.h>" print "#include <dev/systrace.h>" + print "#include <dev/wscons/wsconsio.h>" + print "#include <dev/vndioctl.h>" + print "#include <scsi/ses.h>" print "#define COMPAT_43" print "#include <sys/ioctl.h>" print "" @@ -72,8 +91,8 @@ BEGIN { print "" } -/^#[ ]*define[ ]*(ATAIO|AUDIO_|CDIO|CHIO|DIOC|MIDI_|SEQUENCER_|TIO|FIO|FIBMAP|MTIOC|SIO|OSIO|PCIOC|RIOC|STRIOC|SCIOC|OSCIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z]*[ ]*_IO/ { - +/^#[ ]*define[ ]*(AGPIOC_|ATAIO|AUDIO_|BIOC|CCDIOC|CDIO|CIOC|CHIO|DIOC|MIDI_|SEQUENCER_|TIO|FIO|FIBMAP|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|RD_|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z_0-9]*[ ]*_IO/ { + # find where the name starts for (i = 1; i <= NF; i++) if ($i ~ /define/) |