uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify USB_DeviceGetStringDescriptor() as much as possible.

Browse Source
This commit is contained in:
László Monda
2016-02-25 17:11:04 +01:00
parent 075338f398
commit 7e89132fd8
1 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/usb_device_descriptor.c
+8 -32
View File
@@ -202,19 +202,6 @@ uint8_t *UsbStringDescriptors[USB_STRING_DESCRIPTOR_COUNT] = {
UsbKeyboardString, UsbKeyboardString,
}; };
usb_language_t g_UsbDeviceLanguage[USB_DEVICE_LANGUAGE_COUNT] = {{
UsbStringDescriptors,
UsbStringDescriptorLengths,
(uint16_t)USB_LANGUAGE_ID_UNITED_STATES,
}};
usb_language_list_t UsbLanguageList = {
UsbLanguageListStringDescriptor,
sizeof(UsbLanguageListStringDescriptor),
g_UsbDeviceLanguage,
USB_DEVICE_LANGUAGE_COUNT,
};
usb_status_t USB_DeviceGetDeviceDescriptor( usb_status_t USB_DeviceGetDeviceDescriptor(
usb_device_handle handle, usb_device_get_device_descriptor_struct_t *deviceDescriptor) usb_device_handle handle, usb_device_get_device_descriptor_struct_t *deviceDescriptor)
{ {
@@ -238,26 +225,15 @@ usb_status_t USB_DeviceGetStringDescriptor(
usb_device_handle handle, usb_device_get_string_descriptor_struct_t *stringDescriptor) usb_device_handle handle, usb_device_get_string_descriptor_struct_t *stringDescriptor)
{ {
if (stringDescriptor->stringIndex == 0U) { if (stringDescriptor->stringIndex == 0U) {
stringDescriptor->buffer = (uint8_t *)UsbLanguageList.languageString; stringDescriptor->buffer = UsbLanguageListStringDescriptor;
stringDescriptor->length = UsbLanguageList.stringLength; stringDescriptor->length = sizeof(UsbLanguageListStringDescriptor);
} else if (stringDescriptor->languageId == USB_LANGUAGE_ID_UNITED_STATES &&
stringDescriptor->stringIndex < USB_STRING_DESCRIPTOR_COUNT)
{
stringDescriptor->buffer = UsbStringDescriptors[stringDescriptor->stringIndex];
stringDescriptor->length = UsbStringDescriptorLengths[stringDescriptor->stringIndex];
} else { } else {
uint8_t languageId = 0U; return kStatus_USB_InvalidRequest;
uint8_t languageIndex = USB_STRING_DESCRIPTOR_COUNT;
for (; languageId < USB_STRING_DESCRIPTOR_COUNT; languageId++) {
if (stringDescriptor->languageId == UsbLanguageList.languageList[languageId].languageId) {
if (stringDescriptor->stringIndex < USB_STRING_DESCRIPTOR_COUNT) {
languageIndex = stringDescriptor->stringIndex;
}
break;
}
}
if (USB_STRING_DESCRIPTOR_COUNT == languageIndex) {
return kStatus_USB_InvalidRequest;
}
stringDescriptor->buffer = (uint8_t *)UsbLanguageList.languageList[languageId].string[languageIndex];
stringDescriptor->length = UsbLanguageList.languageList[languageId].length[languageIndex];
} }
return kStatus_USB_Success; return kStatus_USB_Success;
} }