Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 238 insertions, 0 deletions

diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
new file mode 100644
index 000000000000..7825c76cbd00
--- /dev/null
+++ b/include/linux/parport_pc.h
@@ -0,0 +1,238 @@
+#ifndef __LINUX_PARPORT_PC_H
+#define __LINUX_PARPORT_PC_H
+
+#include <asm/io.h>
+
+/* --- register definitions ------------------------------- */
+
+#define ECONTROL(p) ((p)->base_hi + 0x2)
+#define CONFIGB(p)  ((p)->base_hi + 0x1)
+#define CONFIGA(p)  ((p)->base_hi + 0x0)
+#define FIFO(p)     ((p)->base_hi + 0x0)
+#define EPPDATA(p)  ((p)->base    + 0x4)
+#define EPPADDR(p)  ((p)->base    + 0x3)
+#define CONTROL(p)  ((p)->base    + 0x2)
+#define STATUS(p)   ((p)->base    + 0x1)
+#define DATA(p)     ((p)->base    + 0x0)
+
+struct parport_pc_private {
+        /* Contents of CTR. */
+        unsigned char ctr;
+
+        /* Bitmask of writable CTR bits. */
+        unsigned char ctr_writable;
+
+        /* Whether or not there's an ECR. */
+        int ecr;
+
+        /* Number of PWords that FIFO will hold. */
+        int fifo_depth;
+
+        /* Number of bytes per portword. */
+        int pword;
+
+        /* Not used yet. */
+        int readIntrThreshold;
+        int writeIntrThreshold;
+
+        /* buffer suitable for DMA, if DMA enabled */
+        char *dma_buf;
+        dma_addr_t dma_handle;
+        struct pci_dev *dev;
+        struct list_head list;
+        struct parport *port;
+};
+
+struct parport_pc_via_data
+{
+        /* ISA PnP IRQ routing register 1 */
+        u8 via_pci_parport_irq_reg;
+        /* ISA PnP DMA request routing register */
+        u8 via_pci_parport_dma_reg;
+        /* Register and value to enable SuperIO configuration access */
+        u8 via_pci_superio_config_reg;
+        u8 via_pci_superio_config_data;
+        /* SuperIO function register number */
+        u8 viacfg_function;
+        /* parallel port control register number */
+        u8 viacfg_parport_control;
+        /* Parallel port base address register */
+        u8 viacfg_parport_base;
+};
+
+static __inline__ void parport_pc_write_data(struct parport *p, unsigned char d)
+{
+#ifdef DEBUG_PARPORT
+        printk (KERN_DEBUG "parport_pc_write_data(%p,0x%02x)\n", p, d);
+#endif
+        outb(d, DATA(p));
+}
+
+static __inline__ unsigned char parport_pc_read_data(struct parport *p)
+{
+        unsigned char val = inb (DATA (p));
+#ifdef DEBUG_PARPORT
+        printk (KERN_DEBUG "parport_pc_read_data(%p) = 0x%02x\n",
+                p, val);
+#endif
+        return val;
+}
+
+#ifdef DEBUG_PARPORT
+extern __inline__ void dump_parport_state (char *str, struct parport *p)
+{
+        /* here's hoping that reading these ports won't side-effect anything underneath */
+        unsigned char ecr = inb (ECONTROL (p));
+        unsigned char dcr = inb (CONTROL (p));
+        unsigned char dsr = inb (STATUS (p));
+        static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
+        const struct parport_pc_private *priv = (parport_pc_private *)p->physport->private_data;
+        int i;
+
+        printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]);
+        if (ecr & 0x10) printk (",nErrIntrEn");
+        if (ecr & 0x08) printk (",dmaEn");
+        if (ecr & 0x04) printk (",serviceIntr");
+        if (ecr & 0x02) printk (",f_full");
+        if (ecr & 0x01) printk (",f_empty");
+        for (i=0; i<2; i++) {
+                printk ("]  dcr(%s)=[", i ? "soft" : "hard");
+                dcr = i ? priv->ctr : inb (CONTROL (p));
+        
+                if (dcr & 0x20) {
+                        printk ("rev");
+                } else {
+                        printk ("fwd");
+                }
+                if (dcr & 0x10) printk (",ackIntEn");
+                if (!(dcr & 0x08)) printk (",N-SELECT-IN");
+                if (dcr & 0x04) printk (",N-INIT");
+                if (!(dcr & 0x02)) printk (",N-AUTOFD");
+                if (!(dcr & 0x01)) printk (",N-STROBE");
+        }
+        printk ("]  dsr=[");
+        if (!(dsr & 0x80)) printk ("BUSY");
+        if (dsr & 0x40) printk (",N-ACK");
+        if (dsr & 0x20) printk (",PERROR");
+        if (dsr & 0x10) printk (",SELECT");
+        if (dsr & 0x08) printk (",N-FAULT");
+        printk ("]\n");
+        return;
+}
+#else   /* !DEBUG_PARPORT */
+#define dump_parport_state(args...)
+#endif  /* !DEBUG_PARPORT */
+
+/* __parport_pc_frob_control differs from parport_pc_frob_control in that
+ * it doesn't do any extra masking. */
+static __inline__ unsigned char __parport_pc_frob_control (struct parport *p,
+                                                           unsigned char mask,
+                                                           unsigned char val)
+{
+        struct parport_pc_private *priv = p->physport->private_data;
+        unsigned char ctr = priv->ctr;
+#ifdef DEBUG_PARPORT
+        printk (KERN_DEBUG
+                "__parport_pc_frob_control(%02x,%02x): %02x -> %02x\n",
+                mask, val, ctr, ((ctr & ~mask) ^ val) & priv->ctr_writable);
+#endif
+        ctr = (ctr & ~mask) ^ val;
+        ctr &= priv->ctr_writable; /* only write writable bits. */
+        outb (ctr, CONTROL (p));
+        priv->ctr = ctr;        /* Update soft copy */
+        return ctr;
+}
+
+static __inline__ void parport_pc_data_reverse (struct parport *p)
+{
+        __parport_pc_frob_control (p, 0x20, 0x20);
+}
+
+static __inline__ void parport_pc_data_forward (struct parport *p)
+{
+        __parport_pc_frob_control (p, 0x20, 0x00);
+}
+
+static __inline__ 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 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);
+}
+
+static __inline__ unsigned char parport_pc_read_control(struct parport *p)
+{
+        const unsigned char rm = (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 & rm; /* Use soft copy */
+}
+
+static __inline__ 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 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);
+}
+
+static __inline__ unsigned char parport_pc_read_status(struct parport *p)
+{
+        return inb(STATUS(p));
+}
+
+
+static __inline__ void parport_pc_disable_irq(struct parport *p)
+{
+        __parport_pc_frob_control (p, 0x10, 0x00);
+}
+
+static __inline__ void parport_pc_enable_irq(struct parport *p)
+{
+        __parport_pc_frob_control (p, 0x10, 0x10);
+}
+
+extern void parport_pc_release_resources(struct parport *p);
+
+extern int parport_pc_claim_resources(struct parport *p);
+
+/* 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,
+                                              struct pci_dev *dev);
+extern void parport_pc_unregister_port (struct parport *p);
+
+#endif