Add PCI-Cardbus bridges and the most popular pcmcia and cardbus drivers. In

my tree for a very long while, no reason not to allow people with such
devices to have fun (and maybe experience new bugs) with them on sgi.

Also, clean up some comments and explicitely mention which `option' lines are
actually mandatory (ARCBIOS, TGT_xxx, etc).

6 files changed, 113 insertions, 50 deletions

diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index 86dcc8ceea1..9df8c719f33 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP27,v 1.39 2010/11/26 20:13:55 miod Exp $
+#	$OpenBSD: GENERIC-IP27,v 1.40 2011/05/02 19:51:05 miod Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 #
@@ -18,19 +18,16 @@ maxusers	32		# Estimated number of users
 # Make options
 makeoption	LINK_ADDRESS="0xa800000000040000"
 
-# MD options
-option		ARCBIOS		# We use arcbios for FW communication.
-
 option		PCIVERBOSE
 option		USER_PCICONF	# User-space PCI configuration
 option		USBVERBOSE
 
 # Define what targets to support
 option		TGT_ORIGIN	# IP27/IP35
-option		TGT_COHERENT
+option		TGT_COHERENT	# mandatory
+option		ARCBIOS		# mandatory
 option		CPU_R10000	# R10000/R12000/R14000/R16000 support
 
-# Specify storage configuration (it's a joke..)
 config		bsd	swap generic
 
 #
@@ -63,7 +60,7 @@ iec*		at ioc?
 iockbc*		at ioc?
 
 onewire*	at ioc?
-option ONEWIREVERBOSE
+option		ONEWIREVERBOSE
 owmac*		at onewire?
 owserial*	at onewire?
 
@@ -88,10 +85,19 @@ scsibus*	at isp?
 scsibus*	at mpi?
 scsibus*	at siop?
 
+# CardBus bus support
+cbb*		at pci?
+cardslot*	at cbb?
+cardbus*	at cardslot?
+pcmcia*		at cardslot?
+
 # USB Controllers
-ohci*		at pci?	# Open Host Controller
-uhci*		at pci?	# Universal Host Controller
-ehci*		at pci?	# Enhanced Host Controller
+ohci*		at pci?		# Open Host Controller
+ohci*		at cardbus?
+uhci*		at pci?		# Universal Host Controller
+uhci*		at cardbus?
+ehci*		at pci?		# Enhanced Host Controller
+ehci*		at cardbus?
 
 # USB bus support
 usb*		at ohci?
@@ -107,7 +113,7 @@ uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
 ucom*		at uvscom?
 ubsa*		at uhub?	# Belkin serial adapter
 ucom*		at ubsa?
-uaudio*	at uhub?	# USB Audio
+uaudio*		at uhub?	# USB Audio
 audio*		at uaudio?
 ulpt*		at uhub?	# USB Printers	
 umass*		at uhub?	# USB Mass Storage devices
@@ -160,18 +166,25 @@ pcn*		at pci?		# AMD PCnet-PCI Ethernet
 epic*		at pci?		# SMC EPIC/100 ethernet
 de*		at pci?		# DC21X4X-based ethernet
 dc*		at pci?		# 21143, "tulip" clone ethernet
+dc*		at cardbus?
 sf*		at pci?		# Adaptec AIC-6915 ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
 ep*		at pci?		# 3Com 3c59x
+ep*		at pcmcia?
 fxp*		at pci?		# EtherExpress 10/100B ethernet
+fxp*		at cardbus?
 mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
 ne*		at pci?		# NE2000-compatible Ethernet
+ne*		at pcmcia?
 ti*		at pci?		# Alteon ACEnic gigabit Ethernet
 stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+xl*		at cardbus?
 re*		at pci?		# Realtek 8169/8169S/8110S
+re*		at cardbus?
 rl*		at pci?		# Realtek 81[23]9 ethernet
+rl*		at cardbus?
 hme*		at pci?		# Sun Happy Meal
 gem*		at pci?		# Sun 'gem' ethernet
 cas*		at pci?		# Sun Cassini 100/Gigabit
@@ -182,6 +195,7 @@ msk*		at mskc?	#  each port of above
 bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 vge*		at pci?		# VIA VT612x
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
+sis*		at pci?		# SiS 900/7016 ethernet
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -213,7 +227,11 @@ gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### Wireless
-wi*		at pci?
+acx*		at pci?		# TI ACX100/ACX111 (802.11b/g)
+acx*		at cardbus?
+malo*		at pci?		# Marvell Libertas
+wi*		at pci?		# WaveLAN IEEE 802.11DS
+wi*		at pcmcia?
 
 #### Audio
 cmpci*		at pci?		# C-Media CMI8338/8738
@@ -250,9 +268,12 @@ hifn*		at pci?		# Hifn7751/7811/7951
 ubsec*		at pci?		# Broadcom 58xx
 
 # PCI "universal" communication device
-puc*	at pci?
-com*	at puc?
-#lpt*	at puc?
+puc*		at pci?
+com*		at puc?
+#lpt*		at puc?
+
+com*		at pcmcia?
+com*		at cardbus?
 
 pseudo-device	crypto	1
 pseudo-device	hotplug	1		# devices hot plugging
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index bccc4449ef3..072c341fba8 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP30,v 1.33 2010/11/26 20:13:55 miod Exp $
+#	$OpenBSD: GENERIC-IP30,v 1.34 2011/05/02 19:51:05 miod Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 #
@@ -18,19 +18,16 @@ maxusers	32		# Estimated number of users
 # Make options
 makeoption	LINK_ADDRESS="0xa800000020020000"
 
-# MD options
-option		ARCBIOS		# We use arcbios for FW communication.
-
 option		PCIVERBOSE
 option		USER_PCICONF	# User-space PCI configuration
 option		USBVERBOSE
 
 # Define what targets to support
 option		TGT_OCTANE	# Octane, Octane 2
-option		TGT_COHERENT
+option		TGT_COHERENT	# mandatory
+option		ARCBIOS		# mandatory
 option		CPU_R10000	# R10000/R12000/R14000/R16000 support
 
-# Specify storage configuration (it's a joke..)
 config		bsd	swap generic
 
 #
@@ -80,10 +77,19 @@ scsibus*	at isp?
 scsibus*	at mpi?
 scsibus*	at siop?
 
+# CardBus bus support
+cbb*		at pci?
+cardslot*	at cbb?
+cardbus*	at cardslot?
+pcmcia*		at cardslot?
+
 # USB Controllers
-ohci*		at pci?	# Open Host Controller
-uhci*		at pci?	# Universal Host Controller
-ehci*		at pci?	# Enhanced Host Controller
+ohci*		at pci?		# Open Host Controller
+ohci*		at cardbus?
+uhci*		at pci?		# Universal Host Controller
+uhci*		at cardbus?
+ehci*		at pci?		# Enhanced Host Controller
+ehci*		at cardbus?
 
 # USB bus support
 usb*		at ohci?
@@ -152,18 +158,25 @@ pcn*		at pci?		# AMD PCnet-PCI Ethernet
 epic*		at pci?		# SMC EPIC/100 ethernet
 de*		at pci?		# DC21X4X-based ethernet
 dc*		at pci?		# 21143, "tulip" clone ethernet
+dc*		at cardbus?
 sf*		at pci?		# Adaptec AIC-6915 ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
 ep*		at pci?		# 3Com 3c59x
+ep*		at pcmcia?
 fxp*		at pci?		# EtherExpress 10/100B ethernet
+fxp*		at cardbus?
 mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
 ne*		at pci?		# NE2000-compatible Ethernet
+ne*		at pcmcia?
 ti*		at pci?		# Alteon ACEnic gigabit Ethernet
 stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+xl*		at cardbus?
 re*		at pci?		# Realtek 8169/8169S/8110S
+re*		at cardbus?
 rl*		at pci?		# Realtek 81[23]9 ethernet
+rl*		at cardbus?
 hme*		at pci?		# Sun Happy Meal
 gem*		at pci?		# Sun 'gem' ethernet
 cas*		at pci?		# Sun Cassini 100/Gigabit
@@ -174,6 +187,7 @@ msk*		at mskc?	#  each port of above
 bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 vge*		at pci?		# VIA VT612x
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
+sis*		at pci?		# SiS 900/7016 ethernet
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -205,7 +219,11 @@ gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### Wireless
-wi*		at pci?
+acx*		at pci?		# TI ACX100/ACX111 (802.11b/g)
+acx*		at cardbus?
+malo*		at pci?		# Marvell Libertas
+wi*		at pci?		# WaveLAN IEEE 802.11DS
+wi*		at pcmcia?
 
 #### Audio
 cmpci*		at pci?		# C-Media CMI8338/8738
@@ -242,9 +260,12 @@ hifn*		at pci?		# Hifn7751/7811/7951
 ubsec*		at pci?		# Broadcom 58xx
 
 # PCI "universal" communication device
-puc*	at pci?
-com*	at puc?
-#lpt*	at puc?
+puc*		at pci?
+com*		at puc?
+#lpt*		at puc?
+
+com*		at pcmcia?
+com*		at cardbus?
 
 pseudo-device	crypto	1
 pseudo-device	hotplug	1		# devices hot plugging
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index ce0086c6b48..105082060e5 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP32,v 1.24 2010/11/26 20:13:55 miod Exp $
+#	$OpenBSD: GENERIC-IP32,v 1.25 2011/05/02 19:51:05 miod Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 #
@@ -18,9 +18,6 @@ maxusers	32		# Estimated number of users
 # Make options
 makeoption	LINK_ADDRESS="0xffffffff80100000"
 
-# MD options
-option		ARCBIOS		# We use arcbios for FW communication.
-
 option	WSDISPLAY_COMPAT_RAWKBD	# Provide raw scancodes; needed for X11
 
 option		PCIVERBOSE
@@ -28,11 +25,11 @@ option		USER_PCICONF	# User-space PCI configuration
 
 # Define what targets to support
 option		TGT_O2		# O2, O2+
+option		ARCBIOS		# mandatory
 option		CPU_R5000	# R5000/RM5200 support
 option		CPU_RM7000	# RM7000 support
 option		CPU_R10000	# R10000/R12000/R14000/R16000 support
 
-# Specify storage configuration (it's a joke..)
 config		bsd	swap generic
 
 #
@@ -72,10 +69,19 @@ scsibus*	at isp?
 scsibus*	at mpi?
 scsibus*	at siop?
 
+# CardBus bus support
+cbb*		at pci?
+cardslot*	at cbb?
+cardbus*	at cardslot?
+pcmcia*		at cardslot?
+
 # USB Controllers
-ohci*		at pci?	# Open Host Controller
-uhci*		at pci?	# Universal Host Controller
-ehci*		at pci?	# Enhanced Host Controller
+ohci*		at pci?		# Open Host Controller
+ohci*		at cardbus?
+uhci*		at pci?		# Universal Host Controller
+uhci*		at cardbus?
+ehci*		at pci?		# Enhanced Host Controller
+ehci*		at cardbus?
 
 # USB bus support
 usb*		at ohci?
@@ -91,7 +97,7 @@ uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
 ucom*		at uvscom?
 ubsa*		at uhub?	# Belkin serial adapter
 ucom*		at ubsa?
-uaudio*	at uhub?	# USB Audio
+uaudio*		at uhub?	# USB Audio
 audio*		at uaudio?
 ulpt*		at uhub?	# USB Printers	
 umass*		at uhub?	# USB Mass Storage devices
@@ -144,18 +150,25 @@ pcn*		at pci?		# AMD PCnet-PCI Ethernet
 epic*		at pci?		# SMC EPIC/100 ethernet
 de*		at pci?		# DC21X4X-based ethernet
 dc*		at pci?		# 21143, "tulip" clone ethernet
+dc*		at cardbus?
 sf*		at pci?		# Adaptec AIC-6915 ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
 ep*		at pci?		# 3Com 3c59x
+ep*		at pcmcia?
 fxp*		at pci?		# EtherExpress 10/100B ethernet
+fxp*		at cardbus?
 mtd*		at pci?		# Myson MTD803 3-in-1 Ethernet
 ne*		at pci?		# NE2000-compatible Ethernet
+ne*		at pcmcia?
 ti*		at pci?		# Alteon ACEnic gigabit Ethernet
 stge*		at pci?		# Sundance TC9021 GigE
 vr*		at pci?		# VIA Rhine Fast Ethernet
 xl*		at pci?		# 3C9xx ethernet
+xl*		at cardbus?
 re*		at pci?		# Realtek 8169/8169S/8110S
+re*		at cardbus?
 rl*		at pci?		# Realtek 81[23]9 ethernet
+rl*		at cardbus?
 hme*		at pci?		# Sun Happy Meal
 gem*		at pci?		# Sun 'gem' ethernet
 cas*		at pci?		# Sun Cassini 100/Gigabit
@@ -166,6 +179,7 @@ msk*		at mskc?	#  each port of above
 bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 vge*		at pci?		# VIA VT612x
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
+sis*		at pci?		# SiS 900/7016 ethernet
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
@@ -197,7 +211,11 @@ gentbi*		at mii?		# Generic 1000BASE-X ten-bit PHY
 ukphy*		at mii?		# "unknown" PHYs
 
 #### Wireless
-wi*		at pci?
+acx*		at pci?		# TI ACX100/ACX111 (802.11b/g)
+acx*		at cardbus?
+malo*		at pci?
+wi*		at pci?		# WaveLAN IEEE 802.11DS
+wi*		at pcmcia?
 
 #### Audio
 cmpci*		at pci?		# C-Media CMI8338/8738
@@ -238,9 +256,12 @@ hifn*		at pci?		# Hifn7751/7811/7951
 ubsec*		at pci?		# Broadcom 58xx
 
 # PCI "universal" communication device
-puc*	at pci?
-com*	at puc?
-#lpt*	at puc?
+puc*		at pci?
+com*		at puc?
+#lpt*		at puc?
+
+com*		at pcmcia?
+com*		at cardbus?
 
 pseudo-device	crypto	1
 pseudo-device	hotplug	1	# devices hot plugging
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 9b7c3287e6c..e6ef8fe73cd 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.23 2010/07/03 03:59:17 krw Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.24 2011/05/02 19:51:05 miod Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
@@ -11,8 +11,6 @@ option		DST=0		# use daylight savings rules
 # Make options
 makeoption	LINK_ADDRESS="0xa800000000040000"
 
-option		ARCBIOS		# Systems uses ARC firmware.
-
 option		PCIVERBOSE
 option		USBVERBOSE
 
@@ -36,6 +34,7 @@ option		RAMDISK_HOOKS
 # Define what targets to support
 option		TGT_ORIGIN	# IP27/IP35
 option		TGT_COHERENT
+option		ARCBIOS	
 option		CPU_R10000	# R10000/R12000/R14000/R16000 support
 
 # Specify storage configuration using ramdisk
@@ -170,6 +169,7 @@ msk*		at mskc?	#  each port of above
 bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 vge*		at pci?		# VIA VT612x
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
+sis*		at pci?		# SiS 900/7016 ethernet
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 70d68fe6724..28ccfeb879c 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.19 2010/07/03 03:59:17 krw Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.20 2011/05/02 19:51:05 miod Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
@@ -11,8 +11,6 @@ option		DST=0		# use daylight savings rules
 # Make options
 makeoption	LINK_ADDRESS="0xa800000020020000"
 
-option		ARCBIOS		# Systems uses ARC firmware.
-
 option		PCIVERBOSE
 option		USBVERBOSE
 
@@ -36,6 +34,7 @@ option		RAMDISK_HOOKS
 # Define what targets to support
 option		TGT_OCTANE	# Octane, Octane 2
 option		TGT_COHERENT
+option		ARCBIOS
 option		CPU_R10000	# R10000/R12000/R14000/R16000 support
 
 # Specify storage configuration using ramdisk
@@ -163,6 +162,7 @@ msk*		at mskc?	#  each port of above
 bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 vge*		at pci?		# VIA VT612x
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
+sis*		at pci?		# SiS 900/7016 ethernet
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs
diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32
index 47973d5abc3..4ed300a96e2 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP32
+++ b/sys/arch/sgi/conf/RAMDISK-IP32
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP32,v 1.15 2010/07/03 03:59:17 krw Exp $
+#	$OpenBSD: RAMDISK-IP32,v 1.16 2011/05/02 19:51:05 miod Exp $
 #
 # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
 
@@ -11,8 +11,6 @@ option		DST=0		# use daylight savings rules
 # Make options
 makeoption	LINK_ADDRESS="0xffffffff80100000"
 
-option		ARCBIOS		# Systems uses ARC firmware.
-
 option		PCIVERBOSE
 option		USBVERBOSE
 
@@ -35,6 +33,7 @@ option		RAMDISK_HOOKS
 
 # Define what targets to support
 option		TGT_O2		# O2, O2+
+option		ARCBIOS
 option		CPU_R5000	# R5000/RM5200 support
 option		CPU_RM7000	# RM7000 support
 option		CPU_R10000	# R10000/R12000/R14000/R16000 support
@@ -153,6 +152,7 @@ msk*		at mskc?	#  each port of above
 bge*		at pci?		# Broadcom BCM570x (aka Tigon3)
 vge*		at pci?		# VIA VT612x
 bnx*		at pci?		# Broadcom BCM5706/5708 GigE
+sis*		at pci?		# SiS 900/7016 ethernet
 
 ##### Media Independent Interface (mii) drivers
 exphy*		at mii?		# 3Com internal PHYs