- add the whole gang of USB devices; as prompted by deraadt@

- add section headers

ok otto@ miod@

2 files changed, 125 insertions, 35 deletions

diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 1bfbb35dcba..dfc989dc8e6 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.6 2010/02/08 19:42:32 miod Exp $
+#	$OpenBSD: GENERIC,v 1.7 2010/02/09 12:15:37 jasper Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -24,10 +24,14 @@ option		USBVERBOSE
 
 config	bsd	swap generic
 
+#
+# Definition of system
+#
 mainbus0	at root
 cpu0		at mainbus0
 clock0		at mainbus0
 
+# Main local buses
 bonito*		at mainbus0
 pci*		at bonito?
 glxpcib*	at pci?
@@ -44,45 +48,88 @@ pciide*		at pci?
 wd*		at pciide? flags 0x0000
 smfb*		at pci?
 wsdisplay*	at smfb?
+
+# USB Controllers
 ohci*		at pci?
 uhci*		at pci?
 ehci*		at pci?
 
-ral*		at pci?
-rl*		at pci?
-rlphy*		at mii?
-ukphy*		at mii?
-
+# USB bus support
 usb*		at ohci?
 usb*		at uhci?
 usb*		at ehci?
-uhub*		at usb?
-uhub*		at uhub?
-umodem*		at uhub?
+
+# USB devices
+uhub*		at usb?		# USB Hubs
+uhub*		at uhub?	# USB Hubs
+umodem*		at uhub?	# USB Modems/Serial
 ucom*		at umodem?
-uplcom*		at uhub?                # I/O DATA USB-RSAQ2 serial adapter
-ucom*		at uplcom?
 umsm*		at uhub?
 ucom*		at umsm?
-umass*		at uhub?
+uplcom*		at uhub?	# I/O DATA USB-RSAQ2 serial adapter
+ucom*		at uplcom?
+uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
+ucom*		at uvscom?
+ubsa*		at uhub?	# Belkin serial adapter
+ucom*		at ubsa?
+ulpt*		at uhub?	# USB Printers	
+umass*		at uhub?	# USB Mass Storage devices
 atapiscsi*	at umass?
 scsibus*	at atapiscsi?
 scsibus*	at umass?
-uhidev*		at uhub?
-uhid*		at uhidev?
-ums*		at uhidev?
+uhidev*		at uhub?	# Human Interface Devices
+ums*		at uhidev?	# USB mouse
 wsmouse*	at ums? mux 0
-ukbd*		at uhidev?
+ukbd*		at uhidev?	# USB keyboard
 wskbd*		at ukbd? mux 1
-urtw*		at uhub?
+uhid*		at uhidev?	# USB generic HID support
+atu*		at uhub?	# Atmel AT76c50x based 802.11b
+aue*		at uhub?	# ADMtek AN986 Pegasus Ethernet  
+axe*		at uhub?	# ASIX Electronics AX88172 USB Ethernet
+cdce*		at uhub?	# CDC Ethernet
+cue*		at uhub?	# CATC USB-EL1201A based Ethernet
+kue*		at uhub?	# Kawasaki KL5KUSB101B based Ethernet
+mos*		at uhub?	# MOSCHIP MCS7730/7830 10/100 Ethernet
+otus*		at uhub?	# Atheros AR9001U
+rum*		at uhub?	# Ralink RT2501USB/RT2601USB
+run*		at uhub?	# Ralink RT2700U/RT2800U/RT3000U
+uath*		at uhub?	# Atheros AR5005UG/AR5005UX
+udav*		at uhub?	# Davicom DM9601 based Ethernet
+upgt*		at uhub?	# Conexant/Intersil PrismGT SoftMAC USB
+upl*		at uhub?	# Prolific PL2301/PL2302 host-to-host `network'
+ural*		at uhub?	# Ralink RT2500USB
+url*		at uhub?	# Realtek RTL8150L based adapters
+urtw*		at uhub?	# RealTek 8187
+wi*		at uhub?	# WaveLAN IEEE 802.11DS
+zyd*		at uhub?	# Zydas ZD1211
+ugen*		at uhub?	# USB Generic driver
+uthum*		at uhidev?	# TEMPerHUM sensor
 
-url*		at uhub?
-urlphy*		at mii?
+# USB Audio
 uaudio*		at uhub?
 audio*		at uaudio?
+
+# USB Video
 uvideo*		at uhub?
 video*		at uvideo?
 
+udl*		at uhub?
+wsdisplay*	at udl?
+
+# NICs
+ral*		at pci?
+rl*		at pci?
+
+# Media Independent Interface (mii) drivers
+acphy*		at mii?		# Altima AC101 PHYs
+amphy*		at mii?		# AMD 79C873 PHYs
+bmtphy*		at mii?		# Broadcom 10/100 PHYs
+eephy*		at mii?		# Marvell 88E1000 series PHY
+rlphy*		at mii?		# RealTek 8139 internal PHYs
+urlphy*		at mii?		# Realtek RTL8150L internal PHY
+ukphy*		at mii?		# "unknown" PHYs
+
+# SCSI Bus devices
 sd*		at scsibus?
 st*		at scsibus?
 cd*		at scsibus?
diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK
index 05f77c13bd9..97f79aba1a3 100644
--- a/sys/arch/loongson/conf/RAMDISK
+++ b/sys/arch/loongson/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.3 2010/02/08 19:42:32 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.4 2010/02/09 12:15:37 jasper Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -19,6 +19,7 @@ makeoption	LINK_ADDRESS="0xffffffff80200000"
 option		PCIVERBOSE
 option		USBVERBOSE
 
+# Filesystem options
 option		FFS		# UFS
 option		FFS2		# UFS2
 option		NFSCLIENT	# Network File System client
@@ -34,10 +35,14 @@ option		RAMDISK_HOOKS
 
 config	bsd	root on rd0a swap on rd0b
 
+#
+# Definition of system
+#
 mainbus0	at root
 cpu0		at mainbus0
 clock0		at mainbus0
 
+# Main local buses
 bonito*		at mainbus0
 pci*		at bonito?
 glxpcib*	at pci?
@@ -54,34 +59,71 @@ pciide*		at pci?
 wd*		at pciide? flags 0x0000
 smfb*		at pci?
 wsdisplay*	at smfb?
+
+# USB Controllers
 ohci*		at pci?
 uhci*		at pci?
 ehci*		at pci?
 
-ral*		at pci?
-rl*		at pci?
-rlphy*		at mii?
-ukphy*		at mii?
-
+# USB bus support
 usb*		at ohci?
 usb*		at uhci?
 usb*		at ehci?
-uhub*		at usb?
-uhub*		at uhub?
-umass*		at uhub?
+
+# USB devices
+uhub*		at usb?		# USB Hubs
+uhub*		at uhub?	# USB Hubs
+umodem*		at uhub?	# USB Modems/Serial
+ucom*		at umodem?
+uvscom*		at uhub?	# SUNTAC Slipper U VS-10U serial
+ucom*		at uvscom?
+ubsa*		at uhub?	# Belkin serial adapter
+ucom*		at ubsa?
+uplcom*		at uhub?	# I/O DATA USB-RSAQ2 serial adapter
+ucom*		at uplcom?
+umass*		at uhub?	# USB Mass Storage devices
 atapiscsi*	at umass?
 scsibus*	at atapiscsi?
 scsibus*	at umass?
-uhidev*		at uhub?
-uhid*		at uhidev?
-ums*		at uhidev?
+uhidev*		at uhub?	# Human Interface Devices
+ums*		at uhidev?	# USB mouse
 wsmouse*	at ums? mux 0
-ukbd*		at uhidev?
+ukbd*		at uhidev?	# USB keyboard
 wskbd*		at ukbd? mux 1
-urtw*		at uhub?
+uhid*		at uhidev?	# USB generic HID support
+atu*		at uhub?	# Atmel AT76c50x based 802.11b
+aue*		at uhub?	# ADMtek AN986 Pegasus Ethernet  
+axe*		at uhub?	# ASIX Electronics AX88172 USB Ethernet
+cdce*		at uhub?	# CDC Ethernet
+cue*		at uhub?	# CATC USB-EL1201A based Ethernet
+kue*		at uhub?	# Kawasaki KL5KUSB101B based Ethernet
+mos*		at uhub?	# MOSCHIP MCS7730/7830 10/100 Ethernet
+otus*		at uhub?	# Atheros AR9001U
+rum*		at uhub?	# Ralink RT2501USB/RT2601USB
+run*		at uhub?	# Ralink RT2700U/RT2800U/RT3000U
+uath*		at uhub?	# Atheros AR5005UG/AR5005UX
+udav*		at uhub?	# Davicom DM9601 based Ethernet
+upgt*		at uhub?	# Conexant/Intersil PrismGT SoftMAC USB
+upl*		at uhub?	# Prolific PL2301/PL2302 host-to-host `network'
+ural*		at uhub?	# Ralink RT2500USB
+url*		at uhub?	# Realtek RTL8150L based adapters
+urtw*		at uhub?	# RealTek 8187
+wi*		at uhub?	# WaveLAN IEEE 802.11DS
+zyd*		at uhub?	# Zydas ZD1211
+ugen*		at uhub?	# USB Generic driver
+
+# NICs
+ral*		at pci?
+rl*		at pci?
 
-url*		at uhub?
-urlphy*		at mii?
+# Media Independent Interface (mii) drivers
+acphy*		at mii?		# Altima AC101 PHYs
+amphy*		at mii?		# AMD 79C873 PHYs
+bmtphy*		at mii?		# Broadcom 10/100 PHYs
+eephy*		at mii?		# Marvell 88E1000 series PHY
+rlphy*		at mii?		# RealTek 8139 internal PHYs
+urlphy*		at mii?		# Realtek RTL8150L internal PHY
+ukphy*		at mii?		# "unknown" PHYs
 
 sd*		at scsibus?
 #st*		at scsibus?
@@ -95,3 +137,4 @@ pseudo-device	bpfilter	1	# packet filter
 pseudo-device	rd		1	# ram disk
 
 option		BOOT_CONFIG	# boot-time kernel config
+