Re: 2.4.8-pre1 compile problems

[Seth Mos <knuffie@xxxxxxxxx>]

At 14:00 28-7-2001 +0200, Sipos Ferenc wrote:
> Hi!
>
> Does anybody have the same compile problems? During module compilation, 
> the process stops by parport_pc, with dual definition or similar message, 
> I know it's not xfs related.
Remove the definitions from the c source code.
Patch below, I hope it is still ok after copy and paste.

Cheers
Seth

diff -u --recursive --new-file v2.4.7/linux/drivers/parport/parport_pc.c 
linux/drivers/parport/parport_pc.c
--- v2.4.7/linux/drivers/parport/parport_pc.c   Wed Jul 11 01:07:46 2001
+++ linux/drivers/parport/parport_pc.c  Fri Jul 27 09:24:50 2001
@@ -253,94 +253,6 @@
        parport_generic_irq(irq, (struct parport *) dev_id, regs);
 }

-void parport_pc_write_data(struct parport *p, unsigned char d)
-{
-       outb (d, DATA (p));
-}
-
-unsigned char parport_pc_read_data(struct parport *p)
-{
-       return inb (DATA (p));
-}
-
-void parport_pc_write_control(struct parport *p, unsigned char d)
-{
-       const unsigned char wm = (PARPORT_CONTROL_STROBE |
-                                 PARPORT_CONTROL_AUTOFD |
-                                 PARPORT_CONTROL_INIT |
-                                 PARPORT_CONTROL_SELECT);
-
-       /* Take this out when drivers have adapted to the newer interface. */
-       if (d & 0x20) {
-               printk (KERN_DEBUG "%s (%s): use data_reverse for this!\n",
-                       p->name, p->cad->name);
-               parport_pc_data_reverse (p);
-       }
-
-       __parport_pc_frob_control (p, wm, d & wm);
-}
-
-unsigned char parport_pc_read_control(struct parport *p)
-{
-       const unsigned char wm = (PARPORT_CONTROL_STROBE |
-                                 PARPORT_CONTROL_AUTOFD |
-                                 PARPORT_CONTROL_INIT |
-                                 PARPORT_CONTROL_SELECT);
-       const struct parport_pc_private *priv = p->physport->private_data;
-       return priv->ctr & wm; /* Use soft copy */
-}
-
-unsigned char parport_pc_frob_control (struct parport *p, unsigned char mask,
-                                      unsigned char val)
-{
-       const unsigned char wm = (PARPORT_CONTROL_STROBE |
-                                 PARPORT_CONTROL_AUTOFD |
-                                 PARPORT_CONTROL_INIT |
-                                 PARPORT_CONTROL_SELECT);
-
-       /* Take this out when drivers have adapted to the newer interface. */
-       if (mask & 0x20) {
-               printk (KERN_DEBUG "%s (%s): use data_%s for this!\n",
-                       p->name, p->cad->name,
-                       (val & 0x20) ? "reverse" : "forward");
-               if (val & 0x20)
-                       parport_pc_data_reverse (p);
-               else
-                       parport_pc_data_forward (p);
-       }
-
-       /* Restrict mask and val to control lines. */
-       mask &= wm;
-       val &= wm;
-
-       return __parport_pc_frob_control (p, mask, val);
-}
-
-unsigned char parport_pc_read_status(struct parport *p)
-{
-       return inb (STATUS (p));
-}
-
-void parport_pc_disable_irq(struct parport *p)
-{
-       __parport_pc_frob_control (p, 0x10, 0);
-}
-
-void parport_pc_enable_irq(struct parport *p)
-{
-       __parport_pc_frob_control (p, 0x10, 0x10);
-}
-
-void parport_pc_data_forward (struct parport *p)
-{
-       __parport_pc_frob_control (p, 0x20, 0);
-}
-
-void parport_pc_data_reverse (struct parport *p)
-{
-       __parport_pc_frob_control (p, 0x20, 0x20);
-}
-
 void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
 {
        s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);



--
Seth
Every program has two purposes one for which
it was written and another for which it wasn't
I use the last kind.