From 1760f1c71719af9c56d5af2bf79ca528c6835b6a Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Sat, 14 Sep 2013 14:43:53 +0200
Subject: [PATCH] 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
---
 include/sys/ioc_fbd.h | 6 +++---
 sys/sys/ioctl.h       | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/sys/ioc_fbd.h b/include/sys/ioc_fbd.h
index da7266798..1aea7481f 100644
--- 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 dc5666f33..ddd097926 100644
--- 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
-- 
2.44.0