From owner-p4-projects@FreeBSD.ORG Fri Dec 18 09:24:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D27BF1065679; Fri, 18 Dec 2009 09:24:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96C57106566C for ; Fri, 18 Dec 2009 09:24:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B8B68FC08 for ; Fri, 18 Dec 2009 09:24:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBI9OsVQ061931 for ; Fri, 18 Dec 2009 09:24:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBI9Os67061929 for perforce@freebsd.org; Fri, 18 Dec 2009 09:24:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Dec 2009 09:24:54 GMT Message-Id: <200912180924.nBI9Os67061929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 09:24:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=171908 Change 171908 by hselasky@hselasky_laptop001 on 2009/12/18 09:23:57 USB Quirks: - first step moving all USB Mass Storage Quirks into the USB quirk module. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#9 (text+ko) ==== @@ -152,6 +152,28 @@ [UQ_CFG_INDEX_3] = "UQ_CFG_INDEX_3", [UQ_CFG_INDEX_4] = "UQ_CFG_INDEX_4", [UQ_CFG_INDEX_0] = "UQ_CFG_INDEX_0", + [UQ_MSC_NO_TEST_UNIT_READY] = "UQ_MSC_NO_TEST_UNIT_READY", + [UQ_MSC_NO_RS_CLEAR_UA] = "UQ_MSC_NO_RS_CLEAR_UA", + [UQ_MSC_NO_START_STOP] = "UQ_MSC_NO_START_STOP", + [UQ_MSC_NO_GETMAXLUN] = "UQ_MSC_NO_GETMAXLUN", + [UQ_MSC_NO_INQUIRY] = "UQ_MSC_NO_INQUIRY", + [UQ_MSC_NO_SYNCHRONIZE_CACHE] = "UQ_MSC_NO_SYNCHRONIZE_CACHE", + [UQ_MSC_SHUTTLE_INIT] = "UQ_MSC_SHUTTLE_INIT", + [UQ_MSC_ALT_IFACE_1] = "UQ_MSC_ALT_IFACE_1", + [UQ_MSC_FLOPPY_SPEED] = "UQ_MSC_FLOPPY_SPEED", + [UQ_MSC_IGNORE_RESIDUE] = "UQ_MSC_IGNORE_RESIDUE", + [UQ_MSC_WRONG_CSWSIG] = "UQ_MSC_WRONG_CSWSIG", + [UQ_MSC_RBC_PAD_TO_12] = "UQ_MSC_RBC_PAD_TO_12", + [UQ_MSC_READ_CAPACITY_OFFBY1] = "UQ_MSC_READ_CAPACITY_OFFBY1", + [UQ_MSC_FORCE_SHORT_INQUIRY] = "UQ_MSC_FORCE_SHORT_INQUIRY", + [UQ_MSC_DEFAULT_WIRE_PROTO] = "UQ_MSC_DEFAULT_WIRE_PROTO", + [UQ_MSC_FORCE_WIRE_BBB] = "UQ_MSC_FORCE_WIRE_BBB", + [UQ_MSC_FORCE_WIRE_CBI] = "UQ_MSC_FORCE_WIRE_CBI", + [UQ_MSC_FORCE_WIRE_CBI_I] = "UQ_MSC_FORCE_WIRE_CBI_I", + [UQ_MSC_FORCE_PROTO_SCSI] = "UQ_MSC_FORCE_PROTO_SCSI", + [UQ_MSC_FORCE_PROTO_ATAPI] = "UQ_MSC_FORCE_PROTO_ATAPI", + [UQ_MSC_FORCE_PROTO_UFI] = "UQ_MSC_FORCE_PROTO_UFI", + [UQ_MSC_FORCE_PROTO_RBC] = "UQ_MSC_FORCE_PROTO_RBC", }; /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#4 (text+ko) ==== @@ -53,6 +53,32 @@ UQ_CFG_INDEX_3, /* select configuration index 3 by default */ UQ_CFG_INDEX_4, /* select configuration index 4 by default */ UQ_CFG_INDEX_0, /* select configuration index 0 by default */ + + /* USB Mass Storage Quirks. See "storage/umass.c" for a detailed description. */ + + UQ_MSC_NO_TEST_UNIT_READY, + UQ_MSC_NO_RS_CLEAR_UA, + UQ_MSC_NO_START_STOP, + UQ_MSC_NO_GETMAXLUN, + UQ_MSC_NO_INQUIRY, + UQ_MSC_NO_SYNCHRONIZE_CACHE, + UQ_MSC_SHUTTLE_INIT, + UQ_MSC_ALT_IFACE_1, + UQ_MSC_FLOPPY_SPEED, + UQ_MSC_IGNORE_RESIDUE, + UQ_MSC_WRONG_CSWSIG, + UQ_MSC_RBC_PAD_TO_12, + UQ_MSC_READ_CAPACITY_OFFBY1, + UQ_MSC_FORCE_SHORT_INQUIRY, + UQ_MSC_DEFAULT_WIRE_PROTO, + UQ_MSC_FORCE_WIRE_BBB, + UQ_MSC_FORCE_WIRE_CBI, + UQ_MSC_FORCE_WIRE_CBI_I, + UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_FORCE_PROTO_UFI, + UQ_MSC_FORCE_PROTO_RBC, + USB_QUIRK_MAX };