aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/chio.h
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1996-09-21 14:59:43 +0000
committerBruce Evans <bde@FreeBSD.org>1996-09-21 14:59:43 +0000
commitebedb5ad97718c0a271659c2563834837607f03f (patch)
treee03f53db0e9dc53fdad8b0a593af598744be17da /sys/sys/chio.h
parent83f52dababadc2c364a5ad22dbef8ea4e197530c (diff)
downloadsrc-ebedb5ad97718c0a271659c2563834837607f03f.tar.gz
src-ebedb5ad97718c0a271659c2563834837607f03f.zip
Cleaned up all headers that include <sys/ioctl.h> or <sys/ioccom.h>:
- don't include <sys/ioctl.h> in any header. Include <sys/ioccom.h> instead. This was already done in 4.4Lite for the most important ioctl headers. Header spam currently increases kernel build times by 10-20%. There are more than 30000 #includes (not counting duplicates) for compiling LINT. - include <sys/types.h> if and only it is necessary to make the header almost self-sufficient (some ioctl headers still need structs from elsewhere). - uniformized idempotency ifdefs. Copied the style in the 4.4Lite ioctl headers.
Notes
Notes: svn path=/head/; revision=18444
Diffstat (limited to 'sys/sys/chio.h')
-rw-r--r--sys/sys/chio.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index a249ca1139ad..a8dceb0a28d8 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -1,7 +1,7 @@
/*
* 16 Feb 93 Julian Elischer ADDED for SCSI system
*
- * $Id: chio.h,v 1.5 1995/05/30 08:14:13 rgrimes Exp $
+ * $Id: chio.h,v 1.6 1996/01/30 23:00:27 mpp Exp $
*/
/* This is a "converted" mtio.h from 386BSD
@@ -11,8 +11,14 @@
/*
* Structures and definitions for changer io control commands
*/
-#ifndef _SYS_CHIO_H_
-#define _SYS_CHIO_H_
+
+#ifndef _SYS_CHIO_H_
+#define _SYS_CHIO_H_
+
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
#define CH_INVERT 0x10000
#define CH_ADDR_MASK 0xffff
@@ -89,4 +95,4 @@ struct chop {
/* Changer IO control command */
#define CHIOOP _IOWR('c', 1, struct chop) /* do a mag tape op */
-#endif /*_SYS_CHIO_H*/
+#endif /* !_SYS_CHIO_H_ */