From owner-p4-projects@FreeBSD.ORG  Wed Dec 23 01:09:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4838D106568B; Wed, 23 Dec 2009 01:09:14 +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 031CC1065676
	for <perforce@freebsd.org>; Wed, 23 Dec 2009 01:09:14 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E510C8FC13
	for <perforce@freebsd.org>; Wed, 23 Dec 2009 01:09:13 +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 nBN19Dkc013873
	for <perforce@freebsd.org>; Wed, 23 Dec 2009 01:09:13 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBN19DfR013870
	for perforce@freebsd.org; Wed, 23 Dec 2009 01:09:13 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 23 Dec 2009 01:09:13 GMT
Message-Id: <200912230109.nBN19DfR013870@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172122 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2009 01:09:15 -0000

http://p4web.freebsd.org/chv.cgi?CH=172122

Change 172122 by thompsa@thompsa_pea on 2009/12/23 01:08:46

	Shorten quirk names.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#7 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#42 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#7 (text+ko) ====

@@ -67,15 +67,15 @@
 	UQ_MSC_NO_GETMAXLUN,
 	UQ_MSC_NO_INQUIRY,
 	UQ_MSC_NO_INQUIRY_EVPD,
-	UQ_MSC_NO_SYNCHRONIZE_CACHE,
+	UQ_MSC_NO_SYNC_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_READ_CAP_OFFBY1,
+	UQ_MSC_FORCE_SHORT_INQ,
 	UQ_MSC_FORCE_WIRE_BBB,
 	UQ_MSC_FORCE_WIRE_CBI,
 	UQ_MSC_FORCE_WIRE_CBI_I,

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#42 (text+ko) ====

@@ -837,7 +837,7 @@
 		quirks |= NO_INQUIRY;
 	if (usb_test_quirk(uaa, UQ_MSC_NO_INQUIRY_EVPD))
 		quirks |= NO_INQUIRY_EVPD;
-	if (usb_test_quirk(uaa, UQ_MSC_NO_SYNCHRONIZE_CACHE))
+	if (usb_test_quirk(uaa, UQ_MSC_NO_SYNC_CACHE))
 		quirks |= NO_SYNCHRONIZE_CACHE;
 	if (usb_test_quirk(uaa, UQ_MSC_SHUTTLE_INIT))
 		quirks |= SHUTTLE_INIT;
@@ -851,9 +851,9 @@
 		quirks |= WRONG_CSWSIG;
 	if (usb_test_quirk(uaa, UQ_MSC_RBC_PAD_TO_12))
 		quirks |= RBC_PAD_TO_12;
-	if (usb_test_quirk(uaa, UQ_MSC_READ_CAPACITY_OFFBY1))
+	if (usb_test_quirk(uaa, UQ_MSC_READ_CAP_OFFBY1))
 		quirks |= READ_CAPACITY_OFFBY1;
-	if (usb_test_quirk(uaa, UQ_MSC_FORCE_SHORT_INQUIRY))
+	if (usb_test_quirk(uaa, UQ_MSC_FORCE_SHORT_INQ))
 		quirks |= FORCE_SHORT_INQUIRY;
 
 done: