From owner-p4-projects@FreeBSD.ORG Sat May 20 19:01:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D9D016A421; Sat, 20 May 2006 19:01:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECCE016A41F for ; Sat, 20 May 2006 19:01:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FD6543D45 for ; Sat, 20 May 2006 19:01:04 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4KJ0UEq085039 for ; Sat, 20 May 2006 19:00:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4KJ0TW7085036 for perforce@freebsd.org; Sat, 20 May 2006 19:00:29 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 May 2006 19:00:29 GMT Message-Id: <200605201900.k4KJ0TW7085036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 97526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 May 2006 19:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=97526 Change 97526 by kmacy@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