diff options
-rw-r--r-- | sys/arch/i386/conf/GENERIC | 30 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK | 20 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 20 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 20 | ||||
-rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 20 | ||||
-rw-r--r-- | sys/arch/i386/conf/files.i386 | 19 | ||||
-rw-r--r-- | sys/arch/i386/i386/apicvec.s | 6 | ||||
-rw-r--r-- | sys/arch/i386/i386/bios.c | 30 | ||||
-rw-r--r-- | sys/arch/i386/i386/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/i386/i386/machdep.c | 38 | ||||
-rw-r--r-- | sys/arch/i386/isa/icu.s | 10 | ||||
-rw-r--r-- | sys/dev/cardbus/com_cardbus.c | 17 | ||||
-rw-r--r-- | sys/dev/cardbus/files.cardbus | 4 | ||||
-rw-r--r-- | sys/dev/ic/com_subr.c | 9 | ||||
-rw-r--r-- | sys/dev/isa/files.isapnp | 6 | ||||
-rw-r--r-- | sys/dev/pcmcia/com_pcmcia.c | 17 | ||||
-rw-r--r-- | sys/dev/pcmcia/files.pcmcia | 4 | ||||
-rw-r--r-- | sys/dev/puc/com_puc.c | 18 | ||||
-rw-r--r-- | sys/dev/puc/files.puc | 4 |
19 files changed, 113 insertions, 182 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 22e9ac7948f..15bc3b46a9e 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.616 2008/05/07 02:31:01 krw Exp $ +# $OpenBSD: GENERIC,v 1.617 2008/05/21 18:49:47 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -21,7 +21,7 @@ option USER_LDT # user-settable LDT; see i386_set_ldt(2) option APERTURE # in-kernel aperture driver for XFree86 #option KGDB # Remote debugger support; exclusive of DDB -#option "KGDB_DEVNAME=\"pccom\"",KGDBADDR=0x2f8,KGDBRATE=9600 +#option "KGDB_DEVNAME=\"com\"",KGDBADDR=0x2f8,KGDBRATE=9600 option COMPAT_SVR4 # binary compatibility with SVR4 option COMPAT_IBCS2 # binary compatibility with SCO and ISC @@ -332,25 +332,25 @@ agp* at vga? # AGP bridges pcppi0 at isa? -pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports -pccom1 at isa? port 0x2f8 irq 3 -pccom2 at isa? port 0x3e8 irq 5 -#pccom3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards) +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards) ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial card #ast1 at isa? port 0x2a0 irq 6 # 2nd AST 4-port serial card -pccom* at ast? +com* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? +#com* at boca? #addcom0 at isa? port 0x108 irq 5 # Addonics FlexPort -#pccom* at addcom? +#com* at addcom? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? +#com* at rtfps? #hsq0 at isa? port 0x140 irq 10 # Hostess 4-port serial card -#pccom* at hsq? -pccom* at pcmcia? # PCMCIA modems/serial ports -pccom* at isapnp? -pccom* at puc? -pccom* at cardbus? +#com* at hsq? +com* at pcmcia? # PCMCIA modems/serial ports +com* at isapnp? +com* at puc? +com* at cardbus? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index f6115037cd1..517144ed349 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.160 2008/05/16 06:55:46 dlg Exp $ +# $OpenBSD: RAMDISK,v 1.161 2008/05/21 18:49:47 kettenis Exp $ machine i386 # architecture, used by config; REQUIRED @@ -98,18 +98,18 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports -pccom1 at isa? port 0x2f8 irq 3 -pccom2 at isa? port 0x3e8 irq 5 -#pccom3 at isa? port 0x2e8 irq 9 +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? +#com* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? +#com* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? -#pccom* at pcmcia? # PCMCIA modem cards -pccom* at isapnp? +#com* at rtfps? +#com* at pcmcia? # PCMCIA modem cards +com* at isapnp? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index e08f06b833f..cca4343a61e 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.104 2008/05/16 06:55:46 dlg Exp $ +# $OpenBSD: RAMDISKB,v 1.105 2008/05/21 18:49:47 kettenis Exp $ machine i386 # architecture, used by config; REQUIRED @@ -99,18 +99,18 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports -pccom1 at isa? port 0x2f8 irq 3 -pccom2 at isa? port 0x3e8 irq 5 -#pccom3 at isa? port 0x2e8 irq 9 +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? +#com* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? +#com* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? -#pccom* at pcmcia? # PCMCIA modem cards -#pccom* at isapnp? +#com* at rtfps? +#com* at pcmcia? # PCMCIA modem cards +#com* at isapnp? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index a67d80365ce..1c90ef8fc1b 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.85 2008/05/16 06:55:46 dlg Exp $ +# $OpenBSD: RAMDISKC,v 1.86 2008/05/21 18:49:47 kettenis Exp $ machine i386 # architecture, used by config; REQUIRED @@ -136,18 +136,18 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports -pccom1 at isa? port 0x2f8 irq 3 -pccom2 at isa? port 0x3e8 irq 5 -#pccom3 at isa? port 0x2e8 irq 9 +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? +#com* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? +#com* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? -#pccom* at pcmcia? # PCMCIA modem cards -#pccom* at isapnp? +#com* at rtfps? +#com* at pcmcia? # PCMCIA modem cards +#com* at isapnp? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 62728996ab0..6d1f29a87ab 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.151 2008/03/31 04:17:22 brad Exp $ +# $OpenBSD: RAMDISK_CD,v 1.152 2008/05/21 18:49:47 kettenis Exp $ machine i386 # architecture, used by config; REQUIRED @@ -158,18 +158,18 @@ pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? wsdisplay* at pcdisplay? -pccom0 at isa? port 0x3f8 irq 4 # standard PC serial ports -pccom1 at isa? port 0x2f8 irq 3 -pccom2 at isa? port 0x3e8 irq 5 -#pccom3 at isa? port 0x2e8 irq 9 +com0 at isa? port 0x3f8 irq 4 # standard PC serial ports +com1 at isa? port 0x2f8 irq 3 +com2 at isa? port 0x3e8 irq 5 +#com3 at isa? port 0x2e8 irq 9 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#pccom* at ast? +#com* at ast? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#pccom* at boca? +#com* at boca? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#pccom* at rtfps? -pccom* at pcmcia? # PCMCIA modem cards -pccom* at isapnp? +#com* at rtfps? +com* at pcmcia? # PCMCIA modem cards +com* at isapnp? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index b84bda356a3..21a6eff2330 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.178 2008/05/07 20:42:02 kettenis Exp $ +# $OpenBSD: files.i386,v 1.179 2008/05/21 18:49:47 kettenis Exp $ # # new style config file for i386 architecture # @@ -187,12 +187,6 @@ file arch/i386/isa/npx.c npx needs-flag # XXX should be a real device define pckbcport {[irq = -1], [port = -1]} -# 8250/16[45]50-based "com" ports, optimized for the i386 interrupt system -#device pccom: tty -attach pccom at isa with pccom_isa -attach pccom at commulti with pccom_commulti -file arch/i386/isa/pccom.c pccom & (pccom_isa | pccom_isapnp | pccom_commulti | pccom_pcmcia | pccom_cardbus | pccom_puc) needs-flag - # PC Mice; Logitech-style, Microsoft-style, and PS/2-style device lms: wsmousedev attach lms at isa @@ -244,8 +238,6 @@ file arch/i386/eisa/eisa_machdep.c eisa include "../../../dev/isa/files.isapnp" file arch/i386/isa/isapnp_machdep.c isapnp -attach pccom at isapnp with pccom_isapnp - # Game adapter (joystick) device joy file arch/i386/isa/joy.c joy needs-flag @@ -383,9 +375,6 @@ file dev/isa/tcic2_isa.c tcic_isa # include "dev/puc/files.puc" -# i386-specific PUC drivers -attach pccom at puc with pccom_puc - # PCMCIA wants to be probed as late as possible. # @@ -393,12 +382,6 @@ attach pccom at puc with pccom_puc # include "dev/pcmcia/files.pcmcia" -# i386-specific PCMCIA drivers -attach pccom at pcmcia with pccom_pcmcia - -# i386-specific Cardbus drivers -attach pccom at cardbus with pccom_cardbus - # # Machine-independent USB drivers # diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s index 8e827c19e2a..6b70a9b2627 100644 --- a/sys/arch/i386/i386/apicvec.s +++ b/sys/arch/i386/i386/apicvec.s @@ -1,4 +1,4 @@ -/* $OpenBSD: apicvec.s,v 1.14 2008/05/07 20:42:02 kettenis Exp $ */ +/* $OpenBSD: apicvec.s,v 1.15 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */ /*- @@ -230,7 +230,9 @@ XINTR(softtty): #ifdef MULTIPROCESSOR call _C_LABEL(i386_softintlock) #endif - call _C_LABEL(comsoft) + pushl $I386_SOFTINTR_SOFTTTY + call _C_LABEL(softintr_dispatch) + addl $4,%esp #ifdef MULTIPROCESSOR call _C_LABEL(i386_softintunlock) #endif diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index e566d26e6bd..2b26aa58589 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.79 2008/03/29 15:26:47 krw Exp $ */ +/* $OpenBSD: bios.c,v 1.80 2008/05/21 18:49:47 kettenis Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -67,6 +67,13 @@ #include "pcibios.h" #include "pci.h" +#include "com.h" +#if NCOM > 0 +#include <sys/tty.h> +#include <dev/ic/comvar.h> +#include <dev/ic/comreg.h> +#endif + struct bios_softc { struct device sc_dev; }; @@ -474,12 +481,21 @@ bios_getopt() break; #endif case BOOTARG_CONSDEV: - if (q->ba_size >= sizeof(bios_consdev_t)) - { - bios_consdev_t *cdp = (bios_consdev_t*)q->ba_arg; -#include "com.h" -#include "pccom.h" -#if NCOM + NPCCOM > 0 + if (q->ba_size >= sizeof(bios_consdev_t)) { + bios_consdev_t *cdp = + (bios_consdev_t*)q->ba_arg; +#if NCOM > 0 + static const int ports[] = + { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; + int unit = minor(cdp->consdev); + if (major(cdp->consdev) == 8 && unit >= 0 && + unit < (sizeof(ports)/sizeof(ports[0]))) { + comconsaddr = ports[unit]; + comconsrate = cdp->conspeed; + + /* Probe the serial port this time. */ + cninit(); + } extern int comconsrate; /* isa/pccom.c */ comconsrate = cdp->conspeed; #endif diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 67fc3068e68..816bbed733b 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.124 2008/05/14 20:49:48 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.125 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -120,7 +120,6 @@ cdev_decl(wd); #include "bio.h" #include "pty.h" #include "com.h" -#include "pccom.h" cdev_decl(com); cdev_decl(fd); #include "ss.h" diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index db5b042a6d9..a6963256d47 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.427 2008/05/07 20:42:02 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.428 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -163,17 +163,12 @@ extern struct proc *npxproc; #include "bios.h" #include "com.h" -#include "pccom.h" -#if (NCOM > 0 || NPCCOM > 0) +#if NCOM > 0 #include <sys/termios.h> #include <dev/ic/comreg.h> -#if NCOM > 0 #include <dev/ic/comvar.h> -#elif NPCCOM > 0 -#include <arch/i386/isa/pccomvar.h> -#endif -#endif /* NCOM > 0 || NPCCOM > 0 */ +#endif /* NCOM > 0 */ /* the following is used externally (sysctl_hw) */ char machine[] = MACHINE; @@ -290,14 +285,10 @@ int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *, #ifdef KGDB #ifndef KGDB_DEVNAME -#ifdef __i386__ -#define KGDB_DEVNAME "pccom" -#else #define KGDB_DEVNAME "com" -#endif #endif /* KGDB_DEVNAME */ char kgdb_devname[] = KGDB_DEVNAME; -#if (NCOM > 0 || NPCCOM > 0) +#if NCOM > 0 #ifndef KGDBADDR #define KGDBADDR 0x3f8 #endif @@ -310,7 +301,7 @@ int comkgdbrate = KGDBRATE; #define KGDBMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */ #endif int comkgdbmode = KGDBMODE; -#endif /* NCOM || NPCCOM */ +#endif /* NCOM > 0 */ void kgdb_port_init(void); #endif /* KGDB */ @@ -2912,8 +2903,10 @@ init386(paddr_t first_avail) isa_defaultirq(); #endif - consinit(); /* XXX SHOULD NOT BE DONE HERE */ - /* XXX here, until we can use bios for printfs */ + /* + * Attach the glass console early in case we need to display a panic. + */ + cninit(); /* * Saving SSE registers won't work if the save area isn't @@ -3159,18 +3152,11 @@ cpu_exec_aout_makecmds(struct proc *p, struct exec_package *epp) /* * consinit: * initialize the system console. - * XXX - shouldn't deal with this initted thing, but then, - * it shouldn't be called from init386 either. */ void consinit() { - static int initted; - - if (initted) - return; - initted = 1; - cninit(); + /* Already done in init386(). */ } #ifdef KGDB @@ -3178,8 +3164,8 @@ void kgdb_port_init() { -#if (NCOM > 0 || NPCCOM > 0) - if (!strcmp(kgdb_devname, "com") || !strcmp(kgdb_devname, "pccom")) { +#if NCOM > 0 + if (!strcmp(kgdb_devname, "com")) { bus_space_tag_t tag = I386_BUS_SPACE_IO; com_kgdb_attach(tag, comkgdbaddr, comkgdbrate, COM_FREQ, comkgdbmode); diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s index 02612a94cba..6fbffe7ead9 100644 --- a/sys/arch/i386/isa/icu.s +++ b/sys/arch/i386/isa/icu.s @@ -1,4 +1,4 @@ -/* $OpenBSD: icu.s,v 1.28 2008/05/07 20:42:02 kettenis Exp $ */ +/* $OpenBSD: icu.s,v 1.29 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $ */ /*- @@ -119,21 +119,19 @@ IDTVEC(doreti) * Soft interrupt handlers */ -#include "pccom.h" - IDTVEC(softtty) -#if NPCCOM > 0 movl $IPL_SOFTTTY,%eax movl %eax,CPL sti #ifdef MULTIPROCESSOR call _C_LABEL(i386_softintlock) #endif - call _C_LABEL(comsoft) + pushl $I386_SOFTINTR_SOFTTTY + call _C_LABEL(softintr_dispatch) + addl $4,%esp #ifdef MULTIPROCESSOR call _C_LABEL(i386_softintunlock) #endif -#endif jmp *%esi #define DONETISR(s, c) \ diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c index 6380fb73d6f..610dc9bf7a6 100644 --- a/sys/dev/cardbus/com_cardbus.c +++ b/sys/dev/cardbus/com_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_cardbus.c,v 1.31 2008/02/25 23:10:16 brad Exp $ */ +/* $OpenBSD: com_cardbus.c,v 1.32 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */ /* @@ -57,17 +57,9 @@ #include <dev/pcmcia/pcmciareg.h> #include "com.h" -#ifdef i386 -#include "pccom.h" -#endif #include <dev/ic/comreg.h> -#if NPCCOM > 0 -#include <i386/isa/pccomvar.h> -#endif -#if NCOM > 0 #include <dev/ic/comvar.h> -#endif #include <dev/ic/ns16550reg.h> #define com_lcr com_cfcr @@ -100,17 +92,10 @@ struct csdev *com_cardbus_find_csdev(struct cardbus_attach_args *); int com_cardbus_gofigure(struct cardbus_attach_args *, struct com_cardbus_softc *); -#if NCOM_CARDBUS struct cfattach com_cardbus_ca = { sizeof(struct com_cardbus_softc), com_cardbus_match, com_cardbus_attach, com_cardbus_detach, com_activate }; -#elif NPCCOM_CARDBUS -struct cfattach pccom_cardbus_ca = { - sizeof(struct com_cardbus_softc), com_cardbus_match, - com_cardbus_attach, com_cardbus_detach, com_activate -}; -#endif #define BUG_BROADCOM 0x01 diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus index 3d97e6bdf8c..f7283b40c00 100644 --- a/sys/dev/cardbus/files.cardbus +++ b/sys/dev/cardbus/files.cardbus @@ -1,4 +1,4 @@ -# $OpenBSD: files.cardbus,v 1.26 2007/09/12 12:59:55 mglocker Exp $ +# $OpenBSD: files.cardbus,v 1.27 2008/05/21 18:49:47 kettenis Exp $ # $NetBSD: files.cardbus,v 1.8 2000/01/26 06:37:24 thorpej Exp $ # # files.cardbus @@ -17,7 +17,7 @@ file dev/cardbus/rbus.c cardbus # Com ports attach com at cardbus with com_cardbus -file dev/cardbus/com_cardbus.c com_cardbus | pccom_cardbus +file dev/cardbus/com_cardbus.c com_cardbus # PCI "universal" communication device driver, for com, lpt, etc. ports attach puc at cardbus with puc_cardbus diff --git a/sys/dev/ic/com_subr.c b/sys/dev/ic/com_subr.c index 399772f76e0..85ec0fb5faf 100644 --- a/sys/dev/ic/com_subr.c +++ b/sys/dev/ic/com_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_subr.c,v 1.13 2008/04/26 17:35:03 kettenis Exp $ */ +/* $OpenBSD: com_subr.c,v 1.14 2008/05/21 18:49:47 kettenis Exp $ */ /* * Copyright (c) 1997 - 1999, Jason Downs. All rights reserved. @@ -68,11 +68,7 @@ #include <sys/tty.h> #include "com.h" -#ifdef i386 -#include "pccom.h" -#else #define NPCCOM 0 -#endif #include <machine/bus.h> #if !defined(__sparc__) || defined(__sparc64__) @@ -91,9 +87,6 @@ #if NCOM > 0 #include <dev/ic/comvar.h> #endif -#if NPCCOM > 0 -#include <i386/isa/pccomvar.h> -#endif #ifdef COM_PXA2X0 #define com_isr 8 diff --git a/sys/dev/isa/files.isapnp b/sys/dev/isa/files.isapnp index 1f6cafb5e7a..3821ca7860f 100644 --- a/sys/dev/isa/files.isapnp +++ b/sys/dev/isa/files.isapnp @@ -1,4 +1,4 @@ -# $OpenBSD: files.isapnp,v 1.28 2005/03/08 20:00:25 tdeval Exp $ +# $OpenBSD: files.isapnp,v 1.29 2008/05/21 18:49:47 kettenis Exp $ # $NetBSD: files.isapnp,v 1.7 1997/10/16 17:16:36 matt Exp $ # # Config file and device description for machine-independent ISAPnP code. @@ -20,8 +20,8 @@ file dev/isa/isapnpres.c isapnp attach mpu at isapnp with mpu_isapnp file dev/isa/mpu_isapnp.c mpu & midi -#attach com at isapnp with com_isapnp -#file dev/isa/com_isapnp.c com_isapnp +attach com at isapnp with com_isapnp +file dev/isa/com_isapnp.c com_isapnp attach wdc at isapnp with wdc_isapnp: isa_dma file dev/isa/wdc_isapnp.c wdc_isapnp diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 5337269bc36..cfaca73a91d 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.46 2006/05/28 16:49:46 fkr Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.47 2008/05/21 18:49:47 kettenis Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -118,17 +118,9 @@ #include <dev/pcmcia/pcmciadevs.h> #include "com.h" -#ifdef i386 -#include "pccom.h" -#endif #include <dev/ic/comreg.h> -#if NPCCOM > 0 -#include <i386/isa/pccomvar.h> -#endif -#if NCOM > 0 #include <dev/ic/comvar.h> -#endif #include <dev/ic/ns16550reg.h> #include <dev/isa/isareg.h> @@ -164,17 +156,10 @@ struct com_pcmcia_softc { void *sc_ih; /* interrupt handler */ }; -#if NCOM struct cfattach com_pcmcia_ca = { sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach, com_pcmcia_detach, com_pcmcia_activate }; -#elif NPCCOM -struct cfattach pccom_pcmcia_ca = { - sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach, - com_pcmcia_detach, com_pcmcia_activate -}; -#endif int com_pcmcia_match(parent, match, aux) diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia index 417a9143b0b..d512786aa62 100644 --- a/sys/dev/pcmcia/files.pcmcia +++ b/sys/dev/pcmcia/files.pcmcia @@ -1,4 +1,4 @@ -# $OpenBSD: files.pcmcia,v 1.42 2008/04/23 13:28:59 jsg Exp $ +# $OpenBSD: files.pcmcia,v 1.43 2008/05/21 18:49:47 kettenis Exp $ # $NetBSD: files.pcmcia,v 1.9 1998/06/21 18:45:41 christos Exp $ # # Config.new file and device description for machine-independent PCMCIA code. @@ -31,7 +31,7 @@ attach esp at pcmcia with esp_pcmcia file dev/pcmcia/esp_pcmcia.c esp_pcmcia attach com at pcmcia with com_pcmcia -file dev/pcmcia/com_pcmcia.c com_pcmcia | pccom_pcmcia +file dev/pcmcia/com_pcmcia.c com_pcmcia # PCMCIA IDE controller attach wdc at pcmcia with wdc_pcmcia diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c index 6c1db9e3b5e..8a11804423c 100644 --- a/sys/dev/puc/com_puc.c +++ b/sys/dev/puc/com_puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_puc.c,v 1.15 2007/12/04 21:49:35 kettenis Exp $ */ +/* $OpenBSD: com_puc.c,v 1.16 2008/05/21 18:49:47 kettenis Exp $ */ /* * Copyright (c) 1997 - 1999, Jason Downs. All rights reserved. @@ -48,17 +48,9 @@ #include <dev/pci/pucvar.h> #include "com.h" -#ifdef i386 -#include "pccom.h" -#endif #include <dev/ic/comreg.h> -#if NPCCOM > 0 -#include <i386/isa/pccomvar.h> -#endif -#if NCOM > 0 #include <dev/ic/comvar.h> -#endif #include <dev/ic/ns16550reg.h> #define com_lcr com_cfcr @@ -67,17 +59,9 @@ int com_puc_match(struct device *, void *, void *); void com_puc_attach(struct device *, struct device *, void *); int com_puc_detach(struct device *, int ); -#if NCOM > 0 struct cfattach com_puc_ca = { sizeof(struct com_softc), com_puc_match, com_puc_attach, com_puc_detach }; -#endif - -#if NPCCOM > 0 -struct cfattach pccom_puc_ca = { - sizeof(struct com_softc), com_puc_match, com_puc_attach, com_puc_detach -}; -#endif int com_puc_match(parent, match, aux) diff --git a/sys/dev/puc/files.puc b/sys/dev/puc/files.puc index 86b4ccaf580..093c34df6c3 100644 --- a/sys/dev/puc/files.puc +++ b/sys/dev/puc/files.puc @@ -1,9 +1,9 @@ -# $OpenBSD: files.puc,v 1.2 1999/11/28 11:52:06 downsj Exp $ +# $OpenBSD: files.puc,v 1.3 2008/05/21 18:49:47 kettenis Exp $ # # Config file and device description for machine-independent PUC drivers. # Requires PCI to be defined first. attach com at puc with com_puc -file dev/puc/com_puc.c com_puc | pccom_puc +file dev/puc/com_puc.c com_puc attach lpt at puc with lpt_puc file dev/puc/lpt_puc.c lpt_puc |