PERFORCE change 97526 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=97526

Change 97526 by kmacy at kmacy_storage:sun4v_rwbuf on 2006/05/20 18:59:41

	add SCSI and USB
	disable SIMULATOR

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#11 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#11 (text+ko) ====

@@ -75,17 +75,18 @@
 
 # Standard busses
 device		pci
+#device		isa
 
 
 # Floppy drives
 #device		fdc
 
 # ATA and ATAPI devices
-device		ata
-device		atadisk		# ATA disk drives
-device		atapicd		# ATAPI CDROM drives
-device		atapifd		# ATAPI floppy drives
-device		atapist		# ATAPI tape drives
+#device		ata
+#device		atadisk		# ATA disk drives
+#device		atapicd		# ATAPI CDROM drives
+#device		atapifd		# ATAPI floppy drives
+#device		atapist		# ATAPI tape drives
 #	Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!,
 #	and you will not mount an ATA /.
 #options 	ATA_STATIC_ID	# Static device numbering
@@ -100,13 +101,13 @@
 #device		esp		# NCR53c9x (FEPS/FAS366)
 
 # SCSI peripherals
-#device		scbus		# SCSI bus (required for SCSI)
-#device		ch		# SCSI media changers
-#device		da		# Direct Access (disks)
-#device		sa		# Sequential Access (tape etc)
-#device		cd		# CD
-#device		pass		# Passthrough device (direct SCSI access)
-#device		ses		# SCSI Environmental Services (and SAF-TE)
+device		scbus		# SCSI bus (required for SCSI)
+device		ch		# SCSI media changers
+device		da		# Direct Access (disks)
+device		sa		# Sequential Access (tape etc)
+device		cd		# CD
+device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
 
 # RAID controllers
 #device		amr		# AMI MegaRAID
@@ -176,12 +177,12 @@
 device		ohci		# OHCI PCI->USB interface
 device		usb		# USB Bus (required)
 #device		udbp		# USB Double Bulk Pipe devices
-#device		ugen		# Generic
-#device		uhid		# "Human Interface Devices"
+device		ugen		# Generic
+device		uhid		# "Human Interface Devices"
 #device		ukbd		# Keyboard
-#device		ulpt		# Printer
+device		ulpt		# Printer
 #device		umass		# Disks/Mass storage - Requires scbus and da
-#device		ums		# Mouse
+device		ums		# Mouse
 #device		urio		# Diamond Rio 500 MP3 player
 #device		uscanner	# Scanners
 # USB Ethernet, requires mii
@@ -200,3 +201,7 @@
 #options		SIMULATOR	# compile for ISA simulator
 #options		KTR
 #options		KTR_MASK=(KTR_TRAP)
+#options			USB_DEBUG
+#options			USBVERBOSE
+#options			DEBUG_LOCKS
+#options			DEBUG_VFS_LOCKS