From: hvozda Date: Thu, 9 May 1996 20:50:02 +0000 (+0000) Subject: Oops, we need pcicmaster0; also bring INSTOTHER up to date X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a4f101deeeeb3d1a8b31334a08e3d956f4a6dde6;p=openbsd Oops, we need pcicmaster0; also bring INSTOTHER up to date --- diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 259448b66fc..719639b6df8 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 1996/05/09 19:07:11 hvozda Exp $ +# $OpenBSD: GENERIC,v 1.12 1996/05/09 20:50:03 hvozda Exp $ # $NetBSD: GENERIC,v 1.44 1996/04/25 20:14:13 scottr Exp $ # # GENERIC -- everything that's currently supported @@ -93,6 +93,7 @@ pci0 at mainbus0 bus ? ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +pcicmaster0 at isa? port 0x3E0 size 2 pcic0 at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096 pcic1 at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096 pcicmaster1 at isa? port 0x3E2 size 2 @@ -177,7 +178,6 @@ wt0 at isa? port 0x300 irq 5 drq 1 # Archive and Wangtek QIC tape drives ed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 ed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards ed2 at isa? port 0x300 iomem 0xcc000 irq 10 -ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards @@ -185,10 +185,11 @@ ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA ep* at eisa? slot ? # 3C579 ethernet cards -ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards +ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards +ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP index 8a8fb01d79f..dd52daa24cf 100644 --- a/sys/arch/i386/conf/GENERICADP +++ b/sys/arch/i386/conf/GENERICADP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICADP,v 1.10 1996/05/09 19:07:12 hvozda Exp $ +# $OpenBSD: GENERICADP,v 1.11 1996/05/09 20:50:04 hvozda Exp $ # $NetBSD: GENERICADP,v 1.20 1996/04/25 20:14:16 scottr Exp $ # # GENERICADP -- everything that's currently supported, except non- @@ -94,6 +94,7 @@ pci0 at mainbus0 bus ? ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +pcicmaster0 at isa? port 0x3E0 size 2 pcic0 at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096 pcic1 at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096 pcicmaster1 at isa? port 0x3E2 size 2 @@ -163,7 +164,6 @@ wt0 at isa? port 0x300 irq 5 drq 1 # Archive and Wangtek QIC tape drives ed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 ed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards ed2 at isa? port 0x300 iomem 0xcc000 irq 10 -ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards @@ -171,10 +171,11 @@ ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA ep* at eisa? slot ? # 3C579 ethernet cards -ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards +ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards +ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER index 57f65da72d0..3eed6f65845 100644 --- a/sys/arch/i386/conf/GENERICOTHER +++ b/sys/arch/i386/conf/GENERICOTHER @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICOTHER,v 1.8 1996/05/09 19:07:13 hvozda Exp $ +# $OpenBSD: GENERICOTHER,v 1.9 1996/05/09 20:50:04 hvozda Exp $ # $NetBSD: GENERICOTHER,v 1.19 1996/04/25 20:14:21 scottr Exp $ # # GENERICOTHER -- everything that's currently supported, except @@ -94,6 +94,7 @@ pci0 at mainbus0 ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +pcicmaster0 at isa? port 0x3E0 size 2 pcic0 at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096 pcic1 at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096 pcicmaster1 at isa? port 0x3E2 size 2 @@ -167,7 +168,6 @@ wt0 at isa? port 0x300 irq 5 drq 1 # Archive and Wangtek QIC tape drives ed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 ed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards ed2 at isa? port 0x300 iomem 0xcc000 irq 10 -ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards #eg0 at isa? ... # 3C505 ethernet cards el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards @@ -175,10 +175,11 @@ ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 ie1 at isa? port 0x300 irq 10 # EtherExpress #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA ep* at eisa? slot ? # 3C579 ethernet cards -ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards +ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards +ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP index 40b94a666b6..e7b547b30ec 100644 --- a/sys/arch/i386/conf/INSTADP +++ b/sys/arch/i386/conf/INSTADP @@ -1,4 +1,4 @@ -# $OpenBSD: INSTADP,v 1.7 1996/05/04 09:21:17 deraadt Exp $ +# $OpenBSD: INSTADP,v 1.8 1996/05/09 20:50:03 hvozda Exp $ # $NetBSD: INSTADP,v 1.14 1996/04/25 20:14:23 scottr Exp $ # # INSTADP -- like GENERICADP. This supports only Adaptec SCSI @@ -62,6 +62,15 @@ pci0 at mainbus0 ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +pcicmaster0 at isa? port 0x3E0 size 2 +pcic0 at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096 +pcic1 at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096 +pcicmaster1 at isa? port 0x3E2 size 2 +pcic2 at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096 +pcic3 at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096 + +pcmcia* at pcic? + npx0 at isa? port 0xf0 irq 13 # math coprocessor pc0 at isa? port 0x60 irq 1 # generic PC console device @@ -77,6 +86,7 @@ com2 at isa? port 0x3e8 irq 5 #com* 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 #cy0 at isa? ... @@ -124,6 +134,8 @@ ep* at eisa? slot ? # 3C579 ethernet cards le* at pci? dev ? function ? # PCnet-PCI based ethernet cards de* at pci? dev ? function ? # DC21X4X-based ethernet cards ep* at pci? dev ? function ? # 3C590 ethernet cards +ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards +ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards pseudo-device loop 1 # network loopback pseudo-device sl 2 # CSLIP diff --git a/sys/arch/i386/conf/INSTOTHER b/sys/arch/i386/conf/INSTOTHER index 305229f3c13..fc28024dbb7 100644 --- a/sys/arch/i386/conf/INSTOTHER +++ b/sys/arch/i386/conf/INSTOTHER @@ -1,4 +1,4 @@ -# $OpenBSD: INSTOTHER,v 1.5 1996/05/04 09:21:18 deraadt Exp $ +# $OpenBSD: INSTOTHER,v 1.6 1996/05/09 20:50:02 hvozda Exp $ # $NetBSD: INSTOTHER,v 1.13 1996/04/25 20:14:26 scottr Exp $ # # INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI @@ -50,8 +50,23 @@ options INET # IP + ICMP + TCP + UDP config bsd swap generic options GENERIC -isa0 at root -pci0 at root +mainbus0 at root + +isa0 at mainbus0 +eisa0 at mainbus0 +pci0 at mainbus0 + +ppb* at pci? dev ? function ? # PCI-PCI bridges +pci* at ppb? bus ? + +pcicmaster0 at isa? port 0x3E0 size 2 +pcic0 at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096 +pcic1 at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096 +pcicmaster1 at isa? port 0x3E2 size 2 +pcic2 at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096 +pcic3 at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096 + +pcmcia* at pcic? npx0 at isa? port 0xf0 irq 13 # math coprocessor @@ -68,6 +83,7 @@ com2 at isa? port 0x3e8 irq 5 #com* 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 #cy0 at isa? ... @@ -79,7 +95,7 @@ bt0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers bt1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers bt2 at isa? port ? irq ? scsibus* at bt? -ncr* at pci? bus ? dev ? # NCR 538XX SCSI controllers +ncr* at pci? dev ? function ? # NCR 538XX SCSI controllers scsibus* at ncr? sea0 at isa? iomem 0xc8000 irq 5 scsibus* at sea? @@ -114,9 +130,12 @@ el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards ep0 at isa? port ? irq ? # 3C509 ethernet cards ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #le0 at isa? port 0x320 irq 10 drq 7 # IsoLan, NE2100, and DEPCA -le* at pci? bus ? dev ? # PCnet-PCI based ethernet cards -de* at pci? bus ? dev ? # DC21X4X-based ethernet cards -ep* at pci? bus ? dev ? # 3C590 ethernet cards +ep* at eisa? slot ? # 3C579 ethernet cards +le* at pci? dev ? function ? # PCnet-PCI based ethernet cards +de* at pci? dev ? function ? # DC21X4X-based ethernet cards +ep* at pci? dev ? function ? # 3C590 ethernet cards +ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards +ep* at pcmcia? port 0x300 size 0x10 irq 10 slot ? # PCMCIA based ep cards pseudo-device loop 1 # network loopback pseudo-device sl 2 # CSLIP