Straighten ioctl.h

- include all ioctl subheaders, properly listing all letters;
- change FBD's ioctl calls to use 'B' instead of 'F', in
  preparation of the VND driver.

Change-Id: Ia718979568cc057f47cf505a89238d5b3b6695d4

diff --git a/include/sys/ioc_fbd.h b/include/sys/ioc_fbd.h
index da72667981a297205c6b67ae6db4d9b42a397b9d..1aea7481f3497b8fee0450e975bd38ab28f540dd 100644 (file)
--- a/include/sys/ioc_fbd.h
+++ b/include/sys/ioc_fbd.h
@@ -59,8 +59,8 @@ enum {
 };
 
 /* The I/O control requests. */
-#define FBDCADDRULE    _IOW('F', 1, struct fbd_rule)   /* add a rule */
-#define FBDCDELRULE    _IOW('F', 2, fbd_rulenum_t)     /* delete a rule */
-#define FBDCGETRULE    _IORW('F', 3, struct fbd_rule)  /* retrieve a rule */
+#define FBDCADDRULE    _IOW('B', 1, struct fbd_rule)   /* add a rule */
+#define FBDCDELRULE    _IOW('B', 2, fbd_rulenum_t)     /* delete a rule */
+#define FBDCGETRULE    _IORW('B', 3, struct fbd_rule)  /* retrieve a rule */
 
 #endif /* _S_I_FBD_H */

diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index dc5666f33243130957d661b8a8796c2bff9e5127..ddd0979263c9a0006aa0e4c2f787ca45d301db4c 100644 (file)
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -20,7 +20,9 @@
 #include <sys/ioc_memory.h>    /* 'm'                  */
 #include <sys/ioc_tape.h>      /* 'M'                  */
 #include <sys/ioc_sound.h>     /* 's'                  */
-#include <sys/ioc_fb.h>                /* 'F'                  */
+#include <sys/ioc_block.h>     /* 'b'                  */
+#include <sys/ioc_fbd.h>       /* 'B'                  */
+#include <sys/ioc_fb.h>                /* 'V'                  */
 
 #if defined(_NETBSD_SOURCE)
 #define                TIOCDRAIN       TCDRAIN