patch-2.1.126 linux/include/linux/parport.h

• Lines: 68
• Date: Fri Oct 23 10:16:41 1998
• Orig file: v2.1.125/linux/include/linux/parport.h
• Orig date: Mon Oct 5 13:13:44 1998

diff -u --recursive --new-file v2.1.125/linux/include/linux/parport.h linux/include/linux/parport.h
@@ -123,7 +123,7 @@
 
 	void (*enable_irq)(struct parport *);
 	void (*disable_irq)(struct parport *);
-	int (*examine_irq)(struct parport *);
+	void (*interrupt)(int, void *, struct pt_regs *);
 
 	void (*inc_use_count)(void);
 	void (*dec_use_count)(void);
@@ -206,7 +206,9 @@
 	void *private_data;     /* for lowlevel driver */
 
 	int number;		/* port index - the `n' in `parportn' */
-	spinlock_t lock;
+	spinlock_t pardevice_lock;
+	spinlock_t waitlist_lock;
+	spinlock_t cad_lock;
 };
 
 /* parport_register_port registers a new parallel port at the given address (if
@@ -234,10 +236,9 @@
 
 /* parport_register_device declares that a device is connected to a port, and 
  * tells the kernel all it needs to know.  
- * pf is the preemption function (may be NULL for a transient driver)
- * kf is the wake-up function (may be NULL for a transient driver)
+ * pf is the preemption function (may be NULL for no callback)
+ * kf is the wake-up function (may be NULL for no callback)
  * irq_func is the interrupt handler (may be NULL for no interrupts)
- * Only one lurking driver can be used on a given port. 
  * handle is a user pointer that gets handed to callback functions. 
  */
 struct pardevice *parport_register_device(struct parport *port, 
@@ -294,11 +295,31 @@
 	return parport_claim_or_block(dev);
 }
 
+/*
+ * Lowlevel drivers _can_ call this support function to handle irqs.
+ */
+extern __inline__ void parport_generic_irq(int irq, struct parport *port,
+					   struct pt_regs *regs)
+{
+	read_lock(&port->cad_lock);
+	if (!port->cad)
+		goto out_unlock;
+	if (port->cad->irq_func)
+		port->cad->irq_func(irq, port->cad->private, regs);
+	else
+		printk(KERN_ERR "%s: irq%d happened with irq_func NULL "
+		       "with %s as cad!\n", port->name, irq, port->cad->name);
+ out_unlock:
+	read_unlock(&port->cad_lock);
+}
+
 /* Flags used to identify what a device does. */
-#define PARPORT_DEV_TRAN	        0x0000  /* We're transient. */
-#define PARPORT_DEV_LURK	        0x0001  /* We lurk. */
+#define PARPORT_DEV_TRAN		0	/* WARNING !! DEPRECATED !! */
+#define PARPORT_DEV_LURK		(1<<0)	/* WARNING !! DEPRECATED !! */
+#define PARPORT_DEV_EXCL		(1<<1)	/* Need exclusive access. */
 
-#define PARPORT_FLAG_COMA		1
+#define PARPORT_FLAG_COMA		(1<<0)
+#define PARPORT_FLAG_EXCL		(1<<1)	/* EXCL driver registered. */
 
 extern void parport_parse_irqs(int, const char *[], int irqval[]);
 extern int parport_ieee1284_nibble_mode_ok(struct parport *, unsigned char);