Include <dev/efi/efiio.h> to pretty print EFIIOC_* ioctls

No base usage yet, only efivar(1) from sysutils/efivar.

OK guenther

diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 703a195..6cae73b 100644 (file)
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.38 2023/11/20 17:43:51 kn Exp $
+#      $OpenBSD: Makefile,v 1.39 2023/11/20 17:48:27 kn Exp $
 
 LDSTATIC=${STATIC}
 PROG=  kdump
@@ -12,6 +12,7 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
        CC="${CC}" \
        /bin/sh ${.CURDIR}/mkioctls \
            ${SYS_DIR}/dev/biovar.h \
+           ${SYS_DIR}/dev/efi/efiio.h \
            ${SYS_DIR}/dev/ipmi.h \
            ${SYS_DIR}/dev/pci/drm/include/uapi/drm/i915_drm.h \
            ${SYS_DIR}/dev/pv/pvvar.h \

diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 502e2f0..3f22ae4 100644 (file)
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $OpenBSD: mkioctls,v 1.44 2023/11/20 17:43:51 kn Exp $
+#      $OpenBSD: mkioctls,v 1.45 2023/11/20 17:48:27 kn Exp $
 
 #
 # Copyright (c) 1994
@@ -81,6 +81,7 @@ BEGIN {
        print "#include <sys/videoio.h>"
        print "#include <scsi/scsi_all.h>"
        print "#include <dev/biovar.h>"
+       print "#include <dev/efi/efiio.h>"
        print "#include <dev/ipmi.h>"
        print "#include <dev/pci/drm/include/uapi/drm/i915_drm.h>"
        print "#include <dev/pv/pvvar.h>"
@@ -99,7 +100,7 @@ BEGIN {
        print ""
 }
 
-/^[    ]*#[    ]*define[       ]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|IPMICTL|TIO|FIO|KIO|MEMRANGE|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PIPEX|PPPIOC|PPPOE|PVBUSIOC|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|UDLIO|USB|VIDIOC|VNDIOC|VSCSI|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[       ]+(DRM)?_IO/ {
+/^[    ]*#[    ]*define[       ]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|EFI|GPIO|IPMICTL|TIO|FIO|KIO|MEMRANGE|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PIPEX|PPPIOC|PPPOE|PVBUSIOC|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|UDLIO|USB|VIDIOC|VNDIOC|VSCSI|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[   ]+(DRM)?_IO/ {
 
        # find where the name starts
        for (i = 1; i <= NF; i++)