github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-05-03 14:59:36 +00:00
Code Releases Activity

HID: query only the LangIDs

Browse Source 
Retrobit gamepad breaks querying other strings
This commit is contained in:
Gyorgy Szombathelyi
2021-09-29 18:03:52 +02:00
parent 13ee0cb334
commit 196128c8c4
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
usb/hid.c
View File

@@ -311,8 +311,9 @@ static uint8_t usb_hid_init(usb_device_t *dev) {
} buf;
union {
usb_string0_descriptor_t str0_desc;
usb_string_descriptor_t str_desc;
uint8_t buf[256];
uint8_t buf[255];
} str;
uint8_t s[128+1];
@@ -333,36 +334,7 @@ static uint8_t usb_hid_init(usb_device_t *dev) {
return rcode;
usb_dump_device_descriptor(&buf.dev_desc);
iprintf("USB vendor ID: %04X, product ID: %04x\n", buf.dev_desc.idVendor, buf.dev_desc.idProduct);
// The Retroflag Classic USB Gamepad doesn't report movement until the string descriptors are read,
// so read all of them here (and show them on the console)
usb_get_string_descr(dev, sizeof(str), 0, 0, &str.str_desc); // supported languages descriptor
if (buf.dev_desc.iManufacturer &&
!usb_get_string_descr(dev, sizeof(str), buf.dev_desc.iManufacturer, 0, &str.str_desc)) {
for (i=0; i<((str.str_desc.bLength-2)/2); i++) {
s[i] = ff_uni2oem(str.str_desc.bString[i], FF_CODE_PAGE);
}
s[i] = 0;
iprintf("Manufacturer: %s\n", s);
}
if (buf.dev_desc.iProduct &&
!usb_get_string_descr(dev, sizeof(str), buf.dev_desc.iProduct, 0, &str.str_desc)) {
for (i=0; i<((str.str_desc.bLength-2)/2); i++) {
s[i] = ff_uni2oem(str.str_desc.bString[i], FF_CODE_PAGE);
}
s[i] = 0;
iprintf("Product: %s\n", s);
}
if (buf.dev_desc.iSerialNumber &&
!usb_get_string_descr(dev, sizeof(str), buf.dev_desc.iSerialNumber, 0, &str.str_desc)) {
for (i=0; i<((str.str_desc.bLength-2)/2); i++) {
s[i] = ff_uni2oem(str.str_desc.bString[i], FF_CODE_PAGE);
}
s[i] = 0;
iprintf("Serial no.: %s\n", s);
}
iprintf("USB vendor ID: %04X, product ID: %04X\n", buf.dev_desc.idVendor, buf.dev_desc.idProduct);
// save vid/pid for automatic hack later
vid = buf.dev_desc.idVendor;
@@ -386,6 +358,41 @@ static uint8_t usb_hid_init(usb_device_t *dev) {
return USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
}
// The Retroflag Classic USB Gamepad doesn't report movement until the string descriptors are read,
// so read all of them here (and show them on the console)
if (!usb_get_string_descr(dev, sizeof(str), 0, 0, &str.str_desc)) { // supported languages descriptor
uint16_t wLangId = str.str0_desc.wLANGID[0];
hid_debugf("wLangId: %04X", wLangId);
// Some gamepads (Retrobit) breaks if its strings are queried like below, so don't do it until it can be done safely.
#if 0
if (buf.dev_desc.iManufacturer &&
!usb_get_string_descr(dev, sizeof(str), buf.dev_desc.iManufacturer, wLangId, &str.str_desc)) {
for (i=0; i<((str.str_desc.bLength-2)/2); i++) {
s[i] = ff_uni2oem(str.str_desc.bString[i], FF_CODE_PAGE);
}
s[i] = 0;
iprintf("Manufacturer: %s\n", s);
}
if (buf.dev_desc.iProduct &&
!usb_get_string_descr(dev, sizeof(str), buf.dev_desc.iProduct, wLangId, &str.str_desc)) {
for (i=0; i<((str.str_desc.bLength-2)/2); i++) {
s[i] = ff_uni2oem(str.str_desc.bString[i], FF_CODE_PAGE);
}
s[i] = 0;
iprintf("Product: %s\n", s);
}
if (buf.dev_desc.iSerialNumber &&
!usb_get_string_descr(dev, sizeof(str), buf.dev_desc.iSerialNumber, wLangId, &str.str_desc)) {
for (i=0; i<((str.str_desc.bLength-2)/2); i++) {
s[i] = ff_uni2oem(str.str_desc.bString[i], FF_CODE_PAGE);
}
s[i] = 0;
iprintf("Serial no.: %s\n", s);
}
#endif
}
// Set Configuration Value
rcode = usb_set_conf(dev, buf.conf_desc.bConfigurationValue);
if (rcode) hid_debugf("hid_set_conf error: %d", rcode);

6
usb/usb.h
View File

@@ -207,9 +207,9 @@ typedef struct {
/* String index 0 descriptor structure */
typedef struct {
uint8_t bLength; // Length of this descriptor.
uint8_t bDescriptorType; // STRING descriptor type (USB_DESCRIPTOR_STRING).
uint8_t wLANGID[2]; // Supported language codes
uint8_t bLength; // Length of this descriptor.
uint8_t bDescriptorType; // STRING descriptor type (USB_DESCRIPTOR_STRING).
uint16_t wLANGID[]; // Supported language codes
} __attribute__((packed)) usb_string0_descriptor_t;
/* String descriptor structure */