diff options
| author | hathach <[email protected]> | 2018-07-25 00:16:09 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-07-25 00:16:09 +0700 |
| commit | 71934228d2902079da0c0dc65d97cc78f1b1eaab (patch) | |
| tree | c580b64fe37dc70798a303dc20f915a3471604f4 /src/device | |
| parent | 67e52af936fe85c11300355293b34b5523439d55 (diff) | |
tested boot mouse working
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.c | 4 | ||||
| -rw-r--r-- | src/device/usbd_desc.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index 2b294cd3e..bd169bb6f 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -353,8 +353,6 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request error = TUSB_ERROR_NONE;
//------------- Standard Request e.g in enumeration -------------//
- /* Microsoft Windows will awkwardly get HID Report Descriptor with
- * Recipient = Device instead of Interface */
if( TUSB_REQ_RCPT_DEVICE == p_request->bmRequestType_bit.recipient &&
TUSB_REQ_TYPE_STANDARD == p_request->bmRequestType_bit.type )
{
@@ -398,7 +396,7 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request }
//------------- Class/Interface Specific Request -------------//
- else if ( TUSB_REQ_RCPT_INTERFACE == p_request->bmRequestType_bit.recipient)
+ else if ( TUSB_REQ_RCPT_INTERFACE == p_request->bmRequestType_bit.recipient )
{
if (_usbd_dev.itf2drv[ u16_low_u8(p_request->wIndex) ] < USBD_CLASS_DRIVER_COUNT)
{
diff --git a/src/device/usbd_desc.c b/src/device/usbd_desc.c index d065ed352..295eb166c 100644 --- a/src/device/usbd_desc.c +++ b/src/device/usbd_desc.c @@ -118,7 +118,7 @@ // Keyboard Report Descriptor //--------------------------------------------------------------------+ #if CFG_TUD_HID_KEYBOARD -ATTR_PACKED uint8_t const _desc_auto_hid_kbd_report[] = { +uint8_t const _desc_auto_hid_kbd_report[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ), HID_COLLECTION ( HID_COLLECTION_APPLICATION ), @@ -170,7 +170,7 @@ ATTR_PACKED uint8_t const _desc_auto_hid_kbd_report[] = { // Mouse Report Descriptor //--------------------------------------------------------------------+ #if CFG_TUD_HID_MOUSE -ATTR_PACKED uint8_t const _desc_auto_hid_mse_report[] = { +uint8_t const _desc_auto_hid_mse_report[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ), HID_COLLECTION ( HID_COLLECTION_APPLICATION ), @@ -179,18 +179,18 @@ ATTR_PACKED uint8_t const _desc_auto_hid_mse_report[] = { HID_COLLECTION ( HID_COLLECTION_PHYSICAL ), HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ), HID_USAGE_MIN ( 1 ), - HID_USAGE_MAX ( 5 ), + HID_USAGE_MAX ( 3 ), HID_LOGICAL_MIN ( 0 ), HID_LOGICAL_MAX ( 1 ), // Left, Right, Middle, Backward, Forward mouse buttons - HID_REPORT_COUNT ( 5 ), + HID_REPORT_COUNT ( 3 ), HID_REPORT_SIZE ( 1 ), HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ), // 3 bit padding HID_REPORT_COUNT ( 1 ), - HID_REPORT_SIZE ( 3 ), + HID_REPORT_SIZE ( 5 ), HID_INPUT ( HID_CONSTANT ), HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), |