Re: [PARPORT] Re: PARPORT_DEV_EXCL


Tim Waugh (tim@cyberelk.demon.co.uk)
Sat, 26 Sep 1998 11:14:25 +0100 (BST)


On Sat, 26 Sep 1998, Andrea Arcangeli wrote:

> Looking at the patch seems perfect. What about to remove also the lurking
> stuff just now (also from plip)?

I'm jumpy about removing it altogether, but how's this?

Incidentally, can someone who knows more about PLIP than me tell me if it
actually works when sharing with other things? Or should it be
PARPORT_DEV_EXCL too?

Tim.
*/

--- linux/drivers/misc/parport_share.c-old Sat Sep 26 10:56:23 1998
+++ linux/drivers/misc/parport_share.c Sat Sep 26 11:04:24 1998
@@ -205,6 +205,7 @@
         }
 
         if (flags & PARPORT_DEV_LURK) {
+ printk (KERN_WARN "%s: lurking is deprecated\n");
                 if (!pf || !kf) {
                         printk(KERN_INFO "%s: refused to register lurking device (%s) without callbacks\n", port->name, name);
                         return NULL;
--- linux/drivers/net/plip.c~ Thu Sep 17 21:19:42 1998
+++ linux/drivers/net/plip.c Sat Sep 26 11:04:27 1998
@@ -242,7 +242,7 @@
 
         pardev = parport_register_device(pb, dev->name, plip_preempt,
                                          plip_wakeup, plip_interrupt,
- PARPORT_DEV_LURK, dev);
+ 0, dev);
 
         printk(KERN_INFO "%s", version);
         printk(KERN_INFO "%s: Parallel port at %#3lx, using IRQ %d\n", dev->name,
--- linux/drivers/pnp/parport_probe.c~ Sun Sep 6 15:35:40 1998
+++ linux/drivers/pnp/parport_probe.c Sat Sep 26 11:11:55 1998
@@ -91,7 +91,10 @@
 
 int parport_probe(struct parport *port, char *buffer, int len)
 {
- struct pardevice *dev = parport_register_device(port, "IEEE 1284 probe", NULL, NULL, NULL, PARPORT_DEV_TRAN, &dev);
+ struct pardevice *dev = parport_register_device(port,
+ "IEEE 1284 probe",
+ NULL, NULL, NULL, 0,
+ &dev);
 
         int result = 0;
 
--- linux/drivers/scsi/imm.c~ Thu Sep 17 21:19:43 1998
+++ linux/drivers/scsi/imm.c Sat Sep 26 11:12:11 1998
@@ -173,7 +173,7 @@
 
         imm_hosts[i].dev =
             parport_register_device(pb, "imm", NULL, imm_wakeup,
- NULL, PARPORT_DEV_TRAN, (void *) &imm_hosts[i]);
+ NULL, 0, (void *) &imm_hosts[i]);
 
         /* Claim the bus so it remembers what we do to the control
          * registers. [ CTR and ECP ]
--- linux/drivers/scsi/ppa.c~ Thu Sep 17 21:19:43 1998
+++ linux/drivers/scsi/ppa.c Sat Sep 26 11:12:24 1998
@@ -133,7 +133,7 @@
 
         ppa_hosts[i].dev =
             parport_register_device(pb, "ppa", NULL, ppa_wakeup,
- NULL, PARPORT_DEV_TRAN, (void *) &ppa_hosts[i]);
+ NULL, 0, (void *) &ppa_hosts[i]);
 
         /* Claim the bus so it remembers what we do to the control
          * registers. [ CTR and ECP ]
--- linux/drivers/char/lp.c~ Thu Sep 10 18:20:02 1998
+++ linux/drivers/char/lp.c Sat Sep 26 11:12:30 1998
@@ -768,7 +768,7 @@
         lp_table[nr].dev = parport_register_device(port, "lp",
                                                    lp_preempt, NULL,
                                                    lp_interrupt,
- PARPORT_DEV_TRAN,
+ 0,
                                                    (void *) &lp_table[nr]);
         if (lp_table[nr].dev == NULL)
                 return 1;

-- To unsubscribe, send mail to: linux-parport-request@torque.net --
-- with the single word "unsubscribe" in the body of the message. --



This archive was generated by hypermail 2.0b3 on Wed 30 Dec 1998 - 10:18:24 EST