From: hvozda Date: Thu, 9 May 1996 19:07:11 +0000 (+0000) Subject: Add PCMCIA support X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=68e665ee2736f47d2dd87de2ccffcadf016e69d7;p=openbsd Add PCMCIA support --- diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 2f1eec40b89..259448b66fc 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 1996/05/04 09:21:15 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.11 1996/05/09 19:07:11 hvozda Exp $ # $NetBSD: GENERIC,v 1.44 1996/04/25 20:14:13 scottr Exp $ # # GENERIC -- everything that's currently supported @@ -93,6 +93,14 @@ pci0 at mainbus0 bus ? ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +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 @@ -108,6 +116,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? ... @@ -168,6 +177,7 @@ 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,6 +185,7 @@ 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 diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP index 88d61dfa980..8a8fb01d79f 100644 --- a/sys/arch/i386/conf/GENERICADP +++ b/sys/arch/i386/conf/GENERICADP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICADP,v 1.9 1996/05/06 11:49:15 deraadt Exp $ +# $OpenBSD: GENERICADP,v 1.10 1996/05/09 19:07:12 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,14 @@ pci0 at mainbus0 bus ? ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +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 @@ -109,6 +117,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? ... @@ -154,6 +163,7 @@ 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 @@ -161,6 +171,7 @@ 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 diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER index 5a643116d60..57f65da72d0 100644 --- a/sys/arch/i386/conf/GENERICOTHER +++ b/sys/arch/i386/conf/GENERICOTHER @@ -1,4 +1,4 @@ -# $OpenBSD: GENERICOTHER,v 1.7 1996/05/04 09:21:16 deraadt Exp $ +# $OpenBSD: GENERICOTHER,v 1.8 1996/05/09 19:07:13 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,14 @@ pci0 at mainbus0 ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? +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 @@ -109,6 +117,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? ... @@ -158,6 +167,7 @@ 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 @@ -165,6 +175,7 @@ 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