Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / parport_pc.h

diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index 2b5ad1b..1cc0f6b 100644 (file)
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -43,6 +43,23 @@ struct parport_pc_private {
        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
@@ -62,14 +79,14 @@ static __inline__ unsigned char parport_pc_read_data(struct parport *p)
 }
 
 #ifdef DEBUG_PARPORT
-extern __inline__ void dump_parport_state (char *str, struct parport *p)
+static 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;
+       static const char *const ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
+       const struct parport_pc_private *priv = p->physport->private_data;
        int i;
 
        printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]);
@@ -211,12 +228,6 @@ extern void parport_pc_release_resources(struct parport *p);
 
 extern int parport_pc_claim_resources(struct parport *p);
 
-extern void parport_pc_init_state(struct pardevice *, struct parport_state *s);
-
-extern void parport_pc_save_state(struct parport *p, struct parport_state *s);
-
-extern void parport_pc_restore_state(struct parport *p, struct parport_state *s);
-
 /* 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,