From 58427721a48e4cc5ffea2532b3e647af4259aea9 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Wed, 8 Oct 1997 21:53:34 +0000 Subject: switch to using pccom; add PCIVERBOSE/EISEVERBOSE --- sys/arch/i386/conf/BABY | 18 +++++++++--------- sys/arch/i386/conf/GENERIC | 21 ++++++++++++--------- sys/arch/i386/conf/RAMDISK | 21 ++++++++++++--------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY index 64400da22b1..1cdb4ed9970 100644 --- a/sys/arch/i386/conf/BABY +++ b/sys/arch/i386/conf/BABY @@ -1,4 +1,4 @@ -# $OpenBSD: BABY,v 1.24 1997/10/07 05:53:52 mickey Exp $ +# $OpenBSD: BABY,v 1.25 1997/10/08 21:53:30 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -105,17 +105,17 @@ isadma0 at isa? #pc0 at isa? port 0x60 irq 1 # generic PC console device vt0 at isa? port 0x60 irq 1 -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 +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 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? slave ? +#pccom* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? slave ? +#pccom* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? slave ? -com3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards +#pccom* at rtfps? slave ? +pccom3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards #cy0 at isa? ... diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index de7e9444655..f81be663ef9 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.50 1997/09/29 03:42:23 mickey Exp $ +# $OpenBSD: GENERIC,v 1.51 1997/10/08 21:53:32 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -42,6 +42,9 @@ isa0 at mainbus0 eisa0 at mainbus0 pci0 at mainbus0 bus ? +option PCIVERBOSE +option EISAVERBOSE + ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? @@ -61,18 +64,18 @@ isadma0 at isa? #pc0 at isa? port 0x60 irq 1 # generic PC console device vt0 at isa? port 0x60 irq 1 -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) +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) 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 -com* at ast? slave ? +pccom* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? slave ? +#pccom* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? slave ? -com3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards +#pccom* at rtfps? slave ? +pccom3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards # 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 2000461b8c4..b2bec67fcfb 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.17 1997/10/07 05:53:53 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.18 1997/10/08 21:53:33 deraadt Exp $ # from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp # # Install kernels no longer support X. @@ -58,6 +58,9 @@ isa0 at mainbus0 eisa0 at mainbus0 pci0 at mainbus0 +option PCIVERBOSE +option EISAVERBOSE + ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? @@ -76,17 +79,17 @@ isadma0 at isa? #pc0 at isa? port 0x60 irq 1 # generic PC console device vt0 at isa? port 0x60 irq 1 -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 +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 #ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards -#com* at ast? slave ? +#pccom* at ast? slave ? #boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards -#com* at boca? slave ? +#pccom* at boca? slave ? #rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards -#com* at rtfps? slave ? -com3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards +#pccom* at rtfps? slave ? +pccom3 at pcmcia? port 0x2e8 size 8 irq 3 slot ? # PCMCIA modem cards # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines -- cgit v1.2.3