diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /include/asm-alpha | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/parport.h | 51 |
1 files changed, 4 insertions, 47 deletions
diff --git a/include/asm-alpha/parport.h b/include/asm-alpha/parport.h index d1099fd8c..c5ee7cbb2 100644 --- a/include/asm-alpha/parport.h +++ b/include/asm-alpha/parport.h @@ -1,7 +1,7 @@ /* * parport.h: platform-specific PC-style parport initialisation * - * Copyright (C) 1999 Tim Waugh <tim@cyberelk.demon.co.uk> + * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> * * This file should only be included by drivers/parport/parport_pc.c. */ @@ -9,53 +9,10 @@ #ifndef _ASM_AXP_PARPORT_H #define _ASM_AXP_PARPORT_H 1 -#include <linux/config.h> - -/* Maximum number of ports to support. It is useless to set this greater - 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 __maybe_init parport_pc_init_pci(int irq, int dma); - -static int user_specified __maybe_initdata = 0; -int __init -parport_pc_init(int *io, int *io_hi, int *irq, int *dma) +static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); +static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) { - int count = 0, i = 0; - - if (io && *io) { - /* Only probe the ports we were given. */ - user_specified = 1; - do { - if (!*io_hi) *io_hi = 0x400 + *io; - if (parport_pc_probe_port(*(io++), *(io_hi++), - *(irq++), *(dma++), NULL)) - count++; - } while (*io && (++i < PARPORT_PC_MAX_PORTS)); - } else { - count += parport_pc_init_superio (); - - /* Probe all the likely ports. */ - 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++; - count += parport_pc_init_pci (irq[0], dma[0]); - } - - return count; + return parport_pc_find_isa_ports (autoirq, autodma); } #endif /* !(_ASM_AXP_PARPORT_H) */ |