summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/controller/atmegadci.c
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2013-01-30 15:46:26 +0000
committerhselasky <hselasky@FreeBSD.org>2013-01-30 15:46:26 +0000
commit34829d74e1222ffb99ba5a0dc56d3a62c7813ca5 (patch)
tree7deb6aabb1fced511305bb7585dcf39efe030c3e /sys/dev/usb/controller/atmegadci.c
parent0fbe1630154e5d48b97c66259002053ea2c04768 (diff)
downloadFreeBSD-src-34829d74e1222ffb99ba5a0dc56d3a62c7813ca5.zip
FreeBSD-src-34829d74e1222ffb99ba5a0dc56d3a62c7813ca5.tar.gz
Provide one global language string descriptor for
american english instead of giving each module its own. Submitted by: Christoph Mallon
Diffstat (limited to 'sys/dev/usb/controller/atmegadci.c')
-rw-r--r--sys/dev/usb/controller/atmegadci.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index 70d34a3..426073e 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -1565,9 +1565,6 @@ static const struct usb_hub_descriptor_min atmegadci_hubd = {
.DeviceRemovable = {0}, /* port is removable */
};
-#define STRING_LANG \
- 0x09, 0x04, /* American English */
-
#define STRING_VENDOR \
'A', 0, 'T', 0, 'M', 0, 'E', 0, 'G', 0, 'A', 0
@@ -1576,7 +1573,6 @@ static const struct usb_hub_descriptor_min atmegadci_hubd = {
'o', 0, 'o', 0, 't', 0, ' ', 0, 'H', 0, \
'U', 0, 'B', 0,
-USB_MAKE_STRING_DESC(STRING_LANG, atmegadci_langtab);
USB_MAKE_STRING_DESC(STRING_VENDOR, atmegadci_vendor);
USB_MAKE_STRING_DESC(STRING_PRODUCT, atmegadci_product);
@@ -1779,8 +1775,8 @@ tr_handle_get_descriptor:
case UDESC_STRING:
switch (value & 0xff) {
case 0: /* Language table */
- len = sizeof(atmegadci_langtab);
- ptr = (const void *)&atmegadci_langtab;
+ len = sizeof(usb_string_lang_en);
+ ptr = (const void *)&usb_string_lang_en;
goto tr_valid;
case 1: /* Vendor */
OpenPOWER on IntegriCloud