patch-2.3.13 linux/include/linux/parport_pc.h

• Lines: 29
• Date: Mon Aug 9 12:42:16 1999
• Orig file: v2.3.12/linux/include/linux/parport_pc.h
• Orig date: Thu Jul 8 15:42:21 1999

diff -u --recursive --new-file v2.3.12/linux/include/linux/parport_pc.h linux/include/linux/parport_pc.h
@@ -53,12 +53,16 @@
 						unsigned char mask,
 						unsigned char val)
 {
+	const unsigned char wm = (PARPORT_CONTROL_STROBE |
+				  PARPORT_CONTROL_AUTOFD |
+				  PARPORT_CONTROL_INIT |
+				  PARPORT_CONTROL_SELECT);
 	struct parport_pc_private *priv = p->physport->private_data;
 	unsigned char ctr = priv->ctr;
 	ctr = (ctr & ~mask) ^ val;
 	ctr &= priv->ctr_writable; /* only write writable bits. */
 	outb (ctr, CONTROL (p));
-	return priv->ctr = ctr; /* update soft copy */
+	return priv->ctr = ctr & wm; /* update soft copy */
 }
 
 extern __inline__ void parport_pc_data_reverse (struct parport *p)
@@ -146,5 +150,10 @@
 extern void parport_pc_inc_use_count(void);
 
 extern void parport_pc_dec_use_count(void);
+
+/* PCMCIA code will want to get us to look at a port.  Provide a mechanism. */
+extern struct parport *parport_pc_probe_port (unsigned long base,
+					      unsigned long base_hi,
+					      int irq, int dma);
 
 #endif