Author: thompsa
Date: Tue Feb 3 16:00:20 2009
New Revision: 188076
URL: http://svn.freebsd.org/changeset/base/188076
Log:
- Keep the same sorting on usb_errstr_table as the enum.
- Use c99 array initializers for usb_quirk_str so the indexing isnt critical.
Modified:
head/sys/dev/usb2/core/usb2_error.c
head/sys/dev/usb2/quirk/usb2_quirk.c
Modified: head/sys/dev/usb2/core/usb2_error.c
==============================================================================
--- head/sys/dev/usb2/core/usb2_error.c Tue Feb 3 15:27:29 2009
(r188075)
+++ head/sys/dev/usb2/core/usb2_error.c Tue Feb 3 16:00:20 2009
(r188076)
@@ -31,35 +31,36 @@
static const char* usb_errstr_table[USB_ERR_MAX] = {
[USB_ERR_NORMAL_COMPLETION] = "USB_ERR_NORMAL_COMPLETION",
+ [USB_ERR_PENDING_REQUESTS] = "USB_ERR_PENDING_REQUESTS",
+ [USB_ERR_NOT_STARTED] = "USB_ERR_NOT_STARTED",
+ [USB_ERR_INVAL] = "USB_ERR_INVAL",
+ [USB_ERR_NOMEM] = "USB_ERR_NOMEM",
+ [USB_ERR_CANCELLED] = "USB_ERR_CANCELLED",
[USB_ERR_BAD_ADDRESS] = "USB_ERR_BAD_ADDRESS",
[USB_ERR_BAD_BUFSIZE] = "USB_ERR_BAD_BUFSIZE",
- [USB_ERR_BAD_CONTEXT] = "USB_ERR_BAD_CONTEXT",
[USB_ERR_BAD_FLAG] = "USB_ERR_BAD_FLAG",
- [USB_ERR_CANCELLED] = "USB_ERR_CANCELLED",
- [USB_ERR_DMA_LOAD_FAILED] = "USB_ERR_DMA_LOAD_FAILED",
- [USB_ERR_INTERRUPTED] = "USB_ERR_INTERRUPTED",
- [USB_ERR_INVAL] = "USB_ERR_INVAL",
+ [USB_ERR_NO_CALLBACK] = "USB_ERR_NO_CALLBACK",
[USB_ERR_IN_USE] = "USB_ERR_IN_USE",
- [USB_ERR_IOERROR] = "USB_ERR_IOERROR",
- [USB_ERR_NOMEM] = "USB_ERR_NOMEM",
- [USB_ERR_NOT_CONFIGURED] = "USB_ERR_NOT_CONFIGURED",
- [USB_ERR_NOT_LOCKED] = "USB_ERR_NOT_LOCKED",
- [USB_ERR_NOT_STARTED] = "USB_ERR_NOT_STARTED",
[USB_ERR_NO_ADDR] = "USB_ERR_NO_ADDR",
- [USB_ERR_NO_CALLBACK] = "USB_ERR_NO_CALLBACK",
- [USB_ERR_NO_INTR_THREAD] = "USB_ERR_NO_INTR_THREAD",
[USB_ERR_NO_PIPE] = "USB_ERR_NO_PIPE",
- [USB_ERR_NO_POWER] = "USB_ERR_NO_POWER",
- [USB_ERR_NO_ROOT_HUB] = "USB_ERR_NO_ROOT_HUB",
- [USB_ERR_PENDING_REQUESTS] = "USB_ERR_PENDING_REQUESTS",
+ [USB_ERR_ZERO_NFRAMES] = "USB_ERR_ZERO_NFRAMES",
+ [USB_ERR_ZERO_MAXP] = "USB_ERR_ZERO_MAXP",
[USB_ERR_SET_ADDR_FAILED] = "USB_ERR_SET_ADDR_FAILED",
+ [USB_ERR_NO_POWER] = "USB_ERR_NO_POWER",
+ [USB_ERR_TOO_DEEP] = "USB_ERR_TOO_DEEP",
+ [USB_ERR_IOERROR] = "USB_ERR_IOERROR",
+ [USB_ERR_NOT_CONFIGURED] = "USB_ERR_NOT_CONFIGURED",
+ [USB_ERR_TIMEOUT] = "USB_ERR_TIMEOUT",
[USB_ERR_SHORT_XFER] = "USB_ERR_SHORT_XFER",
[USB_ERR_STALLED] = "USB_ERR_STALLED",
- [USB_ERR_TIMEOUT] = "USB_ERR_TIMEOUT",
- [USB_ERR_TOO_DEEP] = "USB_ERR_TOO_DEEP",
- [USB_ERR_ZERO_MAXP] = "USB_ERR_ZERO_MAXP",
- [USB_ERR_ZERO_NFRAMES] = "USB_ERR_ZERO_NFRAMES",
+ [USB_ERR_INTERRUPTED] = "USB_ERR_INTERRUPTED",
+ [USB_ERR_DMA_LOAD_FAILED] = "USB_ERR_DMA_LOAD_FAILED",
+ [USB_ERR_BAD_CONTEXT] = "USB_ERR_BAD_CONTEXT",
+ [USB_ERR_NO_ROOT_HUB] = "USB_ERR_NO_ROOT_HUB",
+ [USB_ERR_NO_INTR_THREAD] = "USB_ERR_NO_INTR_THREAD",
+ [USB_ERR_NOT_LOCKED] = "USB_ERR_NOT_LOCKED",
};
+
/*------------------------------------------------------------------------*
* usb2_errstr
*
Modified: head/sys/dev/usb2/quirk/usb2_quirk.c
==============================================================================
--- head/sys/dev/usb2/quirk/usb2_quirk.c Tue Feb 3 15:27:29 2009
(r188075)
+++ head/sys/dev/usb2/quirk/usb2_quirk.c Tue Feb 3 16:00:20 2009
(r188076)
@@ -113,30 +113,30 @@ static struct usb2_quirk_entry usb2_quir
};
static const char *usb_quirk_str[USB_QUIRK_MAX] = {
- "UQ_NONE",
- "UQ_AUDIO_SWAP_LR", /* left and right sound channels are swapped */
- "UQ_AU_INP_ASYNC", /* input is async despite claim of adaptive */
- "UQ_AU_NO_FRAC", /* don't adjust for fractional samples */
- "UQ_AU_NO_XU", /* audio device has broken extension unit */
- "UQ_BAD_ADC", /* bad audio spec version number */
- "UQ_BAD_AUDIO", /* device claims audio class, but isn't */
- "UQ_BROKEN_BIDIR", /* printer has broken bidir mode */
- "UQ_BUS_POWERED", /* device is bus powered, despite claim */
- "UQ_HID_IGNORE", /* device should be ignored by hid class */
- "UQ_KBD_IGNORE", /* device should be ignored by kbd class */
- "UQ_MS_BAD_CLASS", /* doesn't identify properly */
- "UQ_MS_LEADING_BYTE", /* mouse sends an unknown leading byte */
- "UQ_MS_REVZ", /* mouse has Z-axis reversed */
- "UQ_NO_STRINGS", /* string descriptors are broken */
- "UQ_OPEN_CLEARSTALL", /* device needs clear endpoint stall */
- "UQ_POWER_CLAIM", /* hub lies about power status */
- "UQ_SPUR_BUT_UP", /* spurious mouse button up events */
- "UQ_SWAP_UNICODE", /* has some Unicode strings swapped */
- "UQ_CFG_INDEX_1", /* select configuration index 1 by default */
- "UQ_CFG_INDEX_2", /* select configuration index 2 by default */
- "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 */
+ [UQ_NONE] = "UQ_NONE",
+ [UQ_AUDIO_SWAP_LR] = "UQ_AUDIO_SWAP_LR",
+ [UQ_AU_INP_ASYNC] = "UQ_AU_INP_ASYNC",
+ [UQ_AU_NO_FRAC] = "UQ_AU_NO_FRAC",
+ [UQ_AU_NO_XU] = "UQ_AU_NO_XU",
+ [UQ_BAD_ADC] = "UQ_BAD_ADC",
+ [UQ_BAD_AUDIO] = "UQ_BAD_AUDIO",
+ [UQ_BROKEN_BIDIR] = "UQ_BROKEN_BIDIR",
+ [UQ_BUS_POWERED] = "UQ_BUS_POWERED",
+ [UQ_HID_IGNORE] = "UQ_HID_IGNORE",
+ [UQ_KBD_IGNORE] = "UQ_KBD_IGNORE",
+ [UQ_MS_BAD_CLASS] = "UQ_MS_BAD_CLASS",
+ [UQ_MS_LEADING_BYTE] = "UQ_MS_LEADING_BYTE",
+ [UQ_MS_REVZ] = "UQ_MS_REVZ",
+ [UQ_NO_STRINGS] = "UQ_NO_STRINGS",
+ [UQ_OPEN_CLEARSTALL] = "UQ_OPEN_CLEARSTALL",
+ [UQ_POWER_CLAIM] = "UQ_POWER_CLAIM",
+ [UQ_SPUR_BUT_UP] = "UQ_SPUR_BUT_UP",
+ [UQ_SWAP_UNICODE] = "UQ_SWAP_UNICODE",
+ [UQ_CFG_INDEX_1] = "UQ_CFG_INDEX_1",
+ [UQ_CFG_INDEX_2] = "UQ_CFG_INDEX_2",
+ [UQ_CFG_INDEX_3] = "UQ_CFG_INDEX_3",
+ [UQ_CFG_INDEX_4] = "UQ_CFG_INDEX_4",
+ [UQ_CFG_INDEX_0] = "UQ_CFG_INDEX_0",
};
/*------------------------------------------------------------------------*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
