[src/trunk]: src/sys/dev/ppbus drop #ifdef _KERNEL (these are kernel-only hea...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d13b21884cec
branches:  trunk
changeset: 558088:d13b21884cec
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Jan 28 17:11:48 2004 +0000

description:
drop #ifdef _KERNEL (these are kernel-only headers)
add some comments for the multiple inclusion protection #endif's

diffstat:

 sys/dev/ppbus/lptreg.h       |  4 ++--
 sys/dev/ppbus/lptvar.h       |  7 ++-----
 sys/dev/ppbus/ppbus_1284.h   |  6 +-----
 sys/dev/ppbus/ppbus_conf.h   |  4 ++--
 sys/dev/ppbus/ppbus_device.h |  4 ++--
 sys/dev/ppbus/ppbus_io.h     |  6 +-----
 sys/dev/ppbus/ppbus_msq.h    |  6 +-----
 sys/dev/ppbus/ppbus_var.h    |  4 ++--
 8 files changed, 13 insertions(+), 28 deletions(-)

diffs (160 lines):

diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/lptreg.h
--- a/sys/dev/ppbus/lptreg.h    Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/lptreg.h    Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lptreg.h,v 1.3 2004/01/25 00:28:01 bjh21 Exp $ */
+/* $NetBSD: lptreg.h,v 1.4 2004/01/28 17:11:48 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -75,4 +75,4 @@
 #define LPS_MASK        (LPS_NBSY | LPS_NACK | LPS_OUT | LPS_SEL | LPS_NERR)
 #define NOT_READY(ppbus) ((ppbus_rstr(ppbus)^LPS_INVERT)&LPS_MASK)
 
-#endif
+#endif /* __DEV_PPBUS_LPTREG_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/lptvar.h
--- a/sys/dev/ppbus/lptvar.h    Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/lptvar.h    Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lptvar.h,v 1.2 2004/01/21 00:33:37 bjh21 Exp $ */
+/* $NetBSD: lptvar.h,v 1.3 2004/01/28 17:11:48 jdolecek Exp $ */
 
 #ifndef __DEV_PPBUS_LPTVAR_H
 #define __DEV_PPBUS_LPTVAR_H
@@ -70,8 +70,6 @@
 #define MAX_SLEEP       (hz*5)  /* Timeout while waiting for device ready */
 #define MAX_SPIN        20      /* Max delay for device ready in usecs */
 
-#ifdef _KERNEL
-
 #ifdef LPT_DEBUG
 static volatile int lptdebug = 1;
 #ifndef LPT_DPRINTF
@@ -96,5 +94,4 @@
 #define LPT_VPRINTF(arg)
 #endif /* LPT_VERBOSE */
 
-#endif /* _KERNEL */
-#endif
+#endif /* __DEV_PPBUS_LPTVAR_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/ppbus_1284.h
--- a/sys/dev/ppbus/ppbus_1284.h        Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/ppbus_1284.h        Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_1284.h,v 1.4 2004/01/25 00:41:02 bjh21 Exp $ */
+/* $NetBSD: ppbus_1284.h,v 1.5 2004/01/28 17:11:48 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1997 Nicolas Souchu
@@ -110,8 +110,6 @@
 #define PPBUS_PERIPHERAL_TRANSFER              13
 #define PPBUS_PERIPHERAL_TERMINATION   14
 
-#ifdef _KERNEL
-
 /* Function prototypes */
 
 /* Host functions */
@@ -126,6 +124,4 @@
 int ppbus_peripheral_negotiate(struct device *, int, int);
 int byte_peripheral_write(struct device *, char *, int, int *);
 
-#endif /*_KERNEL*/
-
 #endif /* __PPBUS_1284_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/ppbus_conf.h
--- a/sys/dev/ppbus/ppbus_conf.h        Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/ppbus_conf.h        Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_conf.h,v 1.3 2004/01/25 00:41:02 bjh21 Exp $ */
+/* $NetBSD: ppbus_conf.h,v 1.4 2004/01/28 17:11:48 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -132,4 +132,4 @@
        PARPORT_REMOVE_HANDLER_T ppbus_remove_handler;
 };
 
-#endif
+#endif /* __PPBUS_CONF_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/ppbus_device.h
--- a/sys/dev/ppbus/ppbus_device.h      Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/ppbus_device.h      Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_device.h,v 1.2 2004/01/21 00:33:37 bjh21 Exp $ */
+/* $NetBSD: ppbus_device.h,v 1.3 2004/01/28 17:11:48 jdolecek Exp $ */
 
 #ifndef __PPBUS_DEVICE_H
 #define __PPBUS_DEVICE_H
@@ -48,4 +48,4 @@
        u_int16_t flags;*/
 };
 
-#endif
+#endif /* __PPBUS_DEVICE_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/ppbus_io.h
--- a/sys/dev/ppbus/ppbus_io.h  Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/ppbus_io.h  Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_io.h,v 1.3 2004/01/25 00:28:01 bjh21 Exp $ */
+/* $NetBSD: ppbus_io.h,v 1.4 2004/01/28 17:11:48 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1999 Nicolas Souchu
@@ -55,8 +55,6 @@
 #define PPBUS_WFIFO     20
 
 
-#ifdef _KERNEL
-
 /*
  * Set of ppbus i/o routines callable from ppbus device drivers
  */
@@ -121,6 +119,4 @@
 #define ppbus_wctr(dev,byte) \
                ppbus_io((dev), PPBUS_WCTR, NULL, 0, (byte))
                        
-#endif /* _KERNEL */
-
 #endif /* __PPBUS_IO_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/ppbus_msq.h
--- a/sys/dev/ppbus/ppbus_msq.h Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/ppbus_msq.h Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_msq.h,v 1.3 2004/01/25 00:28:01 bjh21 Exp $ */
+/* $NetBSD: ppbus_msq.h,v 1.4 2004/01/28 17:11:48 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1998 Nicolas Souchu
@@ -183,8 +183,6 @@
 #define MS_SUBRET(code)        { MS_OP_SUBRET, {{ code }}}
 #define MS_RET(code)   { MS_OP_RET, {{ code }}}
 
-#ifdef _KERNEL
-
 /*
  * Function abstraction level
  */
@@ -234,6 +232,4 @@
                int *                           /* returned value */
                );
 
-#endif /* _KERNEL */
-
 #endif /* __PPBUS_MSQ_H */
diff -r f1b94afac4f8 -r d13b21884cec sys/dev/ppbus/ppbus_var.h
--- a/sys/dev/ppbus/ppbus_var.h Wed Jan 28 17:07:21 2004 +0000
+++ b/sys/dev/ppbus/ppbus_var.h Wed Jan 28 17:11:48 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_var.h,v 1.2 2004/01/21 00:33:37 bjh21 Exp $ */
+/* $NetBSD: ppbus_var.h,v 1.3 2004/01/28 17:11:48 jdolecek Exp $ */
 
 #ifndef __PPBUS_VAR_H
 #define __PPBUS_VAR_H
@@ -51,4 +51,4 @@
 /* Parallel Port Bus sleep/wakeup queue. */
 #define PPBUSPRI               (PZERO+8)
 
-#endif
+#endif /* __PPBUS_VAR_H */