patch-2.3.48 linux/include/asm-i386/parport.h

• Lines: 41
• Date: Sat Feb 26 20:34:34 2000
• Orig file: v2.3.47/linux/include/asm-i386/parport.h
• Orig date: Fri Jan 28 15:09:09 2000

diff -u --recursive --new-file v2.3.47/linux/include/asm-i386/parport.h linux/include/asm-i386/parport.h
@@ -15,19 +15,10 @@
    than PARPORT_MAX (in <linux/parport.h>).  */
 #define PARPORT_PC_MAX_PORTS  8
 
-/* If parport_cs (PCMCIA) is managing ports for us, we'll need the
- * probing routines forever; otherwise we can lose them at boot time. */
-#ifdef CONFIG_PARPORT_PC_PCMCIA
-#define __maybe_initdata
-#define __maybe_init
-#else
-#define __maybe_initdata __initdata
-#define __maybe_init __init
-#endif
+static int parport_pc_init_pci(int irq, int dma);
+static int parport_pc_init_superio(void);
 
-static int __maybe_init parport_pc_init_pci(int irq, int dma);
-
-static int user_specified __maybe_initdata = 0;
+static int user_specified __devinitdata = 0;
 int __init
 parport_pc_init(int *io, int *io_hi, int *irq, int *dma)
 {
@@ -43,13 +34,16 @@
 				count++;
 		} while (*io && (++i < PARPORT_PC_MAX_PORTS));
 	} else {
-		/* Probe all the likely ports. */
+		count += parport_pc_init_superio ();
+
 		if (parport_pc_probe_port(0x3bc, 0x7bc, irq[0], dma[0], NULL))
 			count++;
 		if (parport_pc_probe_port(0x378, 0x778, irq[0], dma[0], NULL))
 			count++;
 		if (parport_pc_probe_port(0x278, 0x678, irq[0], dma[0], NULL))
 			count++;
+		
+		/* probe for other PCI parallel devices */
 		count += parport_pc_init_pci (irq[0], dma[0]);
 	}