[src/trunk]: src/sys/arch/i386/conf Add CardBus support. If it breaks anythi...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c2de83e963c1
branches:  trunk
changeset: 481625:c2de83e963c1
user:      augustss <augustss%NetBSD.org@localhost>
date:      Wed Feb 02 20:17:13 2000 +0000

description:
Add CardBus support.  If it breaks anything, I'm sure we'll know soon. :)

diffstat:

 sys/arch/i386/conf/GENERIC |  22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diffs (63 lines):

diff -r cbebf8a35be3 -r c2de83e963c1 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Wed Feb 02 20:06:55 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC        Wed Feb 02 20:17:13 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.296 2000/02/02 19:48:18 augustss Exp $
+#      $NetBSD: GENERIC,v 1.297 2000/02/02 20:17:13 augustss Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.296 $"
+#ident                 "GENERIC-$Revision: 1.297 $"
 
 maxusers       32              # estimated number of users
 
@@ -247,6 +247,13 @@
 # ISA Plug-and-Play PCMCIA controllers
 pcic*  at isapnp?
 
+# CardBus bus support
+cbb*           at pci? dev ? function ?
+cardslot*      at cbb? 
+
+cardbus*       at cardslot?
+pcmcia*                at cardslot?
+
 # Coprocessor Support
 
 # Math Coprocessor support
@@ -375,6 +382,9 @@
 wds0   at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
 wds1   at isa? port 0x358 irq 11 drq 5
 
+# CardBus SCSI cards
+ahc*   at cardbus? dev ? function ?    # Adaptec ADP-1480
+
 # SCSI bus support
 scsibus* at adv?
 scsibus* at adw?
@@ -544,6 +554,11 @@
 we0    at isa? port 0x280 iomem 0xd0000 irq 9  # WD/SMC Ethernet
 we1    at isa? port 0x300 iomem 0xcc000 irq 10
 
+# CardBus network cards
+ex*    at cardbus? dev ? function ?    # 3Com 3C575TX
+fxp*   at cardbus? dev ? function ?    # Intel i8255x
+tlp*   at cardbus? dev ? function ?    # DECchip 21143
+
 # MII/PHY support
 exphy* at mii? phy ?                   # 3Com internal PHYs
 icsphy*        at mii? phy ?                   # Integrated Circuit Systems ICS1890
@@ -564,6 +579,9 @@
 uhci*  at pci? dev ? function ?        # Universal Host Controller (Intel)
 ohci*  at pci? dev ? function ?        # Open Host Controller
 
+# CardBus USB controllers
+ohci*  at cardbus? dev ? function ?    # Open Host Controller
+
 # USB bus support
 usb*   at uhci?
 usb*   at ohci?