patch-2.3.22 linux/include/linux/lp.h

Next file: linux/include/linux/parport.h
Previous file: linux/include/linux/iobuf.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.21/linux/include/linux/lp.h linux/include/linux/lp.h
@@ -5,6 +5,7 @@
  * usr/include/linux/lp.h c.1991-1992 James Wiegand
  * many modifications copyright (C) 1992 Michael K. Johnson
  * Interrupt support added 1993 Nigel Gamble
+ * Removed 8255 status defines from inside __KERNEL__ Marcelo Tosatti 
  */
 
 /*
@@ -28,6 +29,17 @@
 #define LP_HAVE_PORT_BIT   12 /* (0x1000) Port is claimed. */
 #define LP_PORT_BUSY   (1<<13) /* Reading or writing. */
 
+/* 
+ * bit defines for 8255 status port
+ * base + 1
+ * accessed with LP_S(minor), which gets the byte...
+ */
+#define LP_PBUSY	0x80  /* inverted input, active high */
+#define LP_PACK		0x40  /* unchanged input, active low */
+#define LP_POUTPA	0x20  /* unchanged input, active high */
+#define LP_PSELECD	0x10  /* unchanged input, active high */
+#define LP_PERRORP	0x08  /* unchanged input, active low */
+
 /* timeout for each character.  This is relative to bus cycles -- it
  * is the count in a busy loop.  THIS IS THE VALUE TO CHANGE if you
  * have extremely slow printing, or if the machine seems to slow down
@@ -143,16 +155,6 @@
  * gets inverted, but it is also active low.
  */
 
-/* 
- * bit defines for 8255 status port
- * base + 1
- * accessed with LP_S(minor), which gets the byte...
- */
-#define LP_PBUSY	0x80  /* inverted input, active high */
-#define LP_PACK		0x40  /* unchanged input, active low */
-#define LP_POUTPA	0x20  /* unchanged input, active high */
-#define LP_PSELECD	0x10  /* unchanged input, active high */
-#define LP_PERRORP	0x08  /* unchanged input, active low */
 
 /* 
  * defines for 8255 control port

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)