PERFORCE change 172122 for review

[Andrew Thompson]

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

Change 172122 by thompsa at 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: