From 3742e50ea9434f8e936f2e22dc4fba9389a78d56 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Wed, 21 May 2008 18:49:48 +0000 Subject: Switch i386 from pccom to com. Welcomed by many. ok dlg@, jsing@, deraadt@ --- sys/arch/i386/conf/GENERIC | 30 +++++++++++++++--------------- sys/arch/i386/conf/RAMDISK | 20 ++++++++++---------- sys/arch/i386/conf/RAMDISKB | 20 ++++++++++---------- sys/arch/i386/conf/RAMDISKC | 20 ++++++++++---------- sys/arch/i386/conf/RAMDISK_CD | 20 ++++++++++---------- sys/arch/i386/conf/files.i386 | 19 +------------------ 6 files changed, 56 insertions(+), 73 deletions(-) (limited to 'sys/arch/i386/conf') 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 # -- cgit v1.2.3