Initial check-in for support of 32-bit CardBus PC Cards; from NetBSD. On many

machines, this code needs the new PCIBIOS* options enabled in the kernel config
file to work, but your mileage may vary. Included is a working 3c575 driver for
3Com 10/100 CardBus PC Card NICs (tested only with the 'C' revision). The 3c575
is the pccard version of the PCI EtherLink XL cards, and thus the xl driver has
been split into /sys/dev/ic.

2 files changed, 16 insertions, 3 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8e2b6c63234..d1d635cbfa4 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.174 2000/04/07 22:25:43 aaron Exp $
+#	$OpenBSD: GENERIC,v 1.175 2000/04/08 05:50:49 aaron Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -64,6 +64,12 @@ pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
+# CardBus bus support
+#cardbus*	at cardslot?
+#pcmcia*		at cardslot?
+#cbb*		at pci? dev ? function ?
+#cardslot*	at cbb?
+
 # PCI USB Controllers
 #uhci*	at pci?				# Universal Host Controller (Intel)
 #ohci*	at pci?				# Open Host Controller
@@ -260,6 +266,7 @@ sm*	at pcmcia? function ?			# PCMCIA based sm ethernet
 xe*	at pcmcia? function ?			# Xircom ethernet
 fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI
 xl*	at pci? dev ? function ?		# 3c9xx ethernet
+#xl*	at cardbus? dev ? function ?		# 3c575 ethernet
 rl*	at pci? dev ? function ?		# RealTek 81[23]9 ethernet
 tx*	at pci? dev ? function ?		# SMC 83C170 EPIC ethernet
 tl*	at pci? dev ? function ?		# Compaq Thunderlan ethernet
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 809930770b0..778c72658c1 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.63 2000/03/26 22:38:32 mickey Exp $
+#	$OpenBSD: files.i386,v 1.64 2000/04/08 05:50:49 aaron Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -255,6 +255,12 @@ file	arch/i386/i386/apmcall.S	apm
 
 file	arch/i386/i386/bios32.c		bios32
 
+#
+# CARDBUS
+#
+include	"dev/cardbus/files.cardbus"
+file	arch/i386/i386/rbus_machdep.c	cardbus
+
 # XXXX pcic here because it needs to be late.  The catch: pcic needs
 # to be late, so devices which attach to it are attached late.  But it
 # needs to be before its isa and pci attachments.  This answer is
@@ -264,7 +270,7 @@ file	arch/i386/i386/bios32.c		bios32
 # XXX this needs to be done very late, so it's done here.  This feels
 # like a kludge, but it might be for the best.
 
-device	pcic {[controller = -1], [socket = -1]}
+device	pcic: pcmciabus
 file	dev/ic/i82365.c			pcic
 
 # PCIC pcmcia controller on ISA bus.