diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-22 07:50:37 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-22 07:50:37 +0000 |
| commit | 62c35a1eef30c187cb2d1d879dd43bf216921b9a (patch) | |
| tree | 3016bd5ce52089e94136ab1b87da20fef8ffe732 | |
| parent | 66c0fdbaef3426de9b00c11e5f732cccfee8b236 (diff) | |
Teach kdump(1) about USB, VIDIOC and generic DRM ioctls.
ok deraadt@, guenther@
| -rw-r--r-- | usr.bin/kdump/Makefile | 7 | ||||
| -rw-r--r-- | usr.bin/kdump/mkioctls | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 9b1beef54ff..e308c79fd97 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/08/22 02:02:33 guenther Exp $ +# $OpenBSD: Makefile,v 1.25 2013/11/22 07:50:36 mpi Exp $ LDSTATIC=${STATIC} PROG= kdump @@ -16,6 +16,8 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls /usr/include/dev/systrace.h \ /usr/include/dev/wscons/wsconsio.h \ /usr/include/dev/vndioctl.h \ + /usr/include/dev/pci/drm/drm.h \ + /usr/include/dev/usb/usb.h \ /usr/include/net/bpf.h \ /usr/include/net/if_ppp.h \ /usr/include/net/if_pppoe.h \ @@ -37,7 +39,8 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls /usr/include/sys/radioio.h \ /usr/include/sys/scanio.h \ /usr/include/sys/scsiio.h \ - /usr/include/sys/sockio.h > ioctl.c + /usr/include/sys/sockio.h \ + /usr/include/sys/videoio.h > ioctl.c kdump_subr.c: ${.CURDIR}/mksubr sh ${.CURDIR}/mksubr /usr/include > ${.TARGET} diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index c0e833e640b..11d6cf652b7 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: mkioctls,v 1.29 2013/07/16 00:41:03 guenther Exp $ +# $OpenBSD: mkioctls,v 1.30 2013/11/22 07:50:36 mpi Exp $ # # Copyright (c) 1994 @@ -73,11 +73,14 @@ BEGIN { print "#include <sys/scanio.h>" print "#include <sys/scsiio.h>" print "#include <sys/tty.h>" + print "#include <sys/videoio.h>" print "#include <crypto/cryptodev.h>" print "#include <dev/biovar.h>" print "#include <dev/systrace.h>" print "#include <dev/wscons/wsconsio.h>" print "#include <dev/vndioctl.h>" + print "#include <dev/pci/drm/drm.h>" + print "#include <dev/usb/usb.h>" print "#define COMPAT_43" print "#include <sys/ioctl.h>" print "#include \"kdump.h\"" @@ -89,7 +92,7 @@ BEGIN { print "" } -/^[ ]*#[ ]*define[ ]+(AGPIOC_|ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|GPIO|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ ]+_IO/ { +/^[ ]*#[ ]*define[ ]+(AGPIOC_|ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ ]+(DRM)?_IO/ { # find where the name starts for (i = 1; i <= NF; i++) |