Add CardBus/PCMCIA support to AMD64.

ok deraadt@

2 files changed, 47 insertions, 31 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index f5cc85a1b19..af1f1cb0f9d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.81 2005/10/02 17:08:14 brad Exp $
+#	$OpenBSD: GENERIC,v 1.82 2005/10/05 21:48:34 tdeval Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -80,17 +80,17 @@ viaenv*	at pci?			# VIA VT82C686A hardware monitor
 #pcmcia*	at pcic?
 
 # CardBus bus support
-#cardbus*	at cardslot?
-#pcmcia*		at cardslot?
-#cbb*		at pci?
-#cardslot*	at cbb?
+cbb*		at pci?
+cardslot*	at cbb?
+cardbus*	at cardslot?
+pcmcia*		at cardslot?
 
 # USB Controllers
 ehci*	at pci?			# Enhanced Host Controller
-#ehci*	at cardbus?		# Enhanced Host Controller
+ehci*	at cardbus?		# Enhanced Host Controller
 uhci*	at pci?			# Universal Host Controller (Intel)
 ohci*	at pci?			# Open Host Controller
-#ohci*	at cardbus?		# Open Host Controller
+ohci*	at cardbus?		# Open Host Controller
 
 # USB bus support
 usb*	at ehci?
@@ -179,7 +179,7 @@ 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)
 
-#com*	at pcmcia?			# PCMCIA modems/serial ports
+com*	at pcmcia?			# PCMCIA modems/serial ports
 com*	at puc?
 
 # options CY_HW_RTS
@@ -217,8 +217,8 @@ scsibus* at ciss?
 #scsibus* at iha?
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
-#aic*	at pcmcia?			# PCMCIA Adaptec 152[02] SCSI
-#scsibus* at aic?
+aic*	at pcmcia?			# PCMCIA Adaptec 152[02] SCSI
+scsibus* at aic?
 #esp*	at pcmcia?			# PCMCIA based NCR 53C9X SCSI
 #scsibus* at esp?
 siop*	at pci?				# NCR 538XX SCSI controllers
@@ -248,14 +248,14 @@ fd*	at fdc? flags 0x00
 # IDE controllers
 pciide* at pci? flags 0x0000
 
-#wdc*	at pcmcia?
+wdc*	at pcmcia?
 
 # IDE hard drives
-#wd*	at wdc? flags 0x0000
+wd*	at wdc? flags 0x0000
 wd*	at pciide? flags 0x0000
 
 # ATAPI<->SCSI
-#atapiscsi* at wdc?
+atapiscsi* at wdc?
 atapiscsi* at pciide?
 scsibus* at atapiscsi?
 
@@ -264,18 +264,18 @@ scsibus* at atapiscsi?
 #le*	at pci?				# PCnet-PCI based ethernet
 #de*	at pci?				# DC21X4X-based ethernet
 fxp*	at pci?				# EtherExpress 10/100B ethernet
-#fxp*	at cardbus?			# Intel PRO/100 ethernet
+fxp*	at cardbus?			# Intel PRO/100 ethernet
 #ne*	at pci?				# NE2000-compat ethernet
 ep*	at pci?				# 3C59x ethernet
-#ne*	at pcmcia?			# PCMCIA based NE2000 ethernet
-#ep*	at pcmcia?			# PCMCIA based 3C5xx ethernet
-#sm*	at pcmcia?			# PCMCIA based sm ethernet
-#xe*	at pcmcia?			# Xircom ethernet
+ne*	at pcmcia?			# PCMCIA based NE2000 ethernet
+ep*	at pcmcia?			# PCMCIA based 3C5xx ethernet
+sm*	at pcmcia?			# PCMCIA based sm ethernet
+xe*	at pcmcia?			# Xircom ethernet
 #fpa*	at pci?				# DEC DEFPA FDDI
 xl*	at pci?				# 3C9xx ethernet
-#xl*	at cardbus?			# 3C575/3C656 ethernet
+xl*	at cardbus?			# 3C575/3C656 ethernet
 rl*	at pci?				# RealTek 81[23]9 ethernet
-#rl*	at cardbus?			# RealTek 81[23]9 ethernet
+rl*	at cardbus?			# RealTek 81[23]9 ethernet
 #mtd*	at pci?				# Myson MTD800/803/891
 epic*	at pci?				# SMC EPIC/100 ethernet
 #tl*	at pci?				# Compaq Thunderlan ethernet
@@ -285,7 +285,7 @@ vr*	at pci?				# VIA Rhine ethernet
 sis*	at pci?				# SiS 900/7016 ethernet
 #ste*	at pci?				# Sundance ST201 ethernet BORKED
 dc*	at pci?				# 21143, "tulip" clone ethernet
-#dc*	at cardbus?			# 21143, "tulip" clone ethernet
+dc*	at cardbus?			# 21143, "tulip" clone ethernet
 ti*	at pci?				# Alteon Tigon 1Gb ethernet
 skc*	at pci?				# SysKonnect GEnesis 984x
 sk*	at skc?				#  each port of above
@@ -300,21 +300,21 @@ hme*	at pci?				# Sun Happy Meal
 vge*	at pci?				# VIA VT612x
 
 # Wireless network cards
-#ath*	at pci?				# Atheros AR5k (802.11a/b/g)
-#ath*	at cardbus?			# Atheros AR5k (802.11a/b/g)
+ath*	at pci?				# Atheros AR5k (802.11a/b/g)
+ath*	at cardbus?			# Atheros AR5k (802.11a/b/g)
 atw*	at pci?				# ADMtek ADM8211 (802.11)
-#atw*	at cardbus?			# ADMtek ADM8211 (802.11)
+atw*	at cardbus?			# ADMtek ADM8211 (802.11)
 wi*	at pci?				# WaveLAN IEEE 802.11DS
-#wi*	at pcmcia?			# WaveLAN IEEE 802.11DS
+wi*	at pcmcia?			# WaveLAN IEEE 802.11DS
 #awi*	at pcmcia?			# Bay Networks IEEE 802.11FH
 #an*	at pci?				# Aironet IEEE 802.11DS
-#an*	at pcmcia?			# Aironet IEEE 802.11DS
-#cnw*	at pcmcia?			# Xircom Netwave
-#ray*	at pcmcia?			# Raylink Aviator2.4/Pro 802.11FH
+an*	at pcmcia?			# Aironet IEEE 802.11DS
+cnw*	at pcmcia?			# Xircom Netwave
+ray*	at pcmcia?			# Raylink Aviator2.4/Pro 802.11FH
 ral*	at pci?				# Ralink RT2500
-#ral*	at cardbus?			# Ralink RT2500
+ral*	at cardbus?			# Ralink RT2500
 rtw*	at pci?				# Realtek 8180
-#rtw*	at cardbus?			# Realtek 8180
+rtw*	at cardbus?			# Realtek 8180
 
 # Media Independent Interface (mii) drivers
 exphy*	at mii?				# 3Com internal PHYs
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index e084d68065d..439b8b1843c 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.13 2005/10/02 22:53:42 deraadt Exp $
+#	$OpenBSD: files.amd64,v 1.14 2005/10/05 21:48:34 tdeval Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -98,6 +98,22 @@ device	pchb: pcibus
 attach	pchb at pci
 file	arch/amd64/pci/pchb.c			pchb
 
+#
+# CARDBUS
+#
+include	"dev/cardbus/files.cardbus"
+file	arch/amd64/amd64/rbus_machdep.c		cardbus
+
+# PCIC pcmcia controller
+device	pcic: pcmciabus
+file	dev/ic/i82365.c				pcic
+
+# PCIC pcmcia controller on PCI bus.
+attach	pcic at pci with pcic_pci
+file	dev/pci/i82365_pci.c			pcic_pci
+
+include	"dev/pcmcia/files.pcmcia"
+
 # PCI-ISA bridges
 device	pcib: isabus
 attach	pcib at pci