diff options
| author | Ha Thach <[email protected]> | 2019-12-24 21:36:42 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-24 21:36:42 +0700 |
| commit | 8c674d9c11f93ace7cf99f0e9bd5b6f28e945f21 (patch) | |
| tree | a72b5cab962e97a19ffbcd3011ba153afe45a00d /src/device | |
| parent | 21cc8237e1130c489bc4ef3b7dea1c41eef25d56 (diff) | |
| parent | 605129eb6600ffb50ea2d239e0ad78a9636df8e1 (diff) | |
Merge pull request #244 from hathach/develop
invoke scsi complete callback before queue for csw status
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/device/usbd.h b/src/device/usbd.h index 9d39af13a..e685686ad 100644 --- a/src/device/usbd.h +++ b/src/device/usbd.h @@ -212,7 +212,7 @@ TU_ATTR_WEAK bool tud_vendor_control_complete_cb(uint8_t rhport, tusb_control_re // Interface number, string index, protocol, report descriptor len, EP In address, size & polling interval
#define TUD_HID_DESCRIPTOR(_itfnum, _stridx, _boot_protocol, _report_desc_len, _epin, _epsize, _ep_interval) \
/* Interface */\
- 9, TUSB_DESC_INTERFACE, _itfnum, 0, 1, TUSB_CLASS_HID, (_boot_protocol) ? HID_SUBCLASS_BOOT : 0, _boot_protocol, _stridx,\
+ 9, TUSB_DESC_INTERFACE, _itfnum, 0, 1, TUSB_CLASS_HID, (uint8_t)((_boot_protocol) ? HID_SUBCLASS_BOOT : 0), _boot_protocol, _stridx,\
/* HID descriptor */\
9, HID_DESC_TYPE_HID, U16_TO_U8S_LE(0x0111), 0, 1, HID_DESC_TYPE_REPORT, U16_TO_U8S_LE(_report_desc_len),\
/* Endpoint In */\
@@ -225,7 +225,7 @@ TU_ATTR_WEAK bool tud_vendor_control_complete_cb(uint8_t rhport, tusb_control_re // Interface number, string index, protocol, report descriptor len, EP OUT & IN address, size & polling interval
#define TUD_HID_INOUT_DESCRIPTOR(_itfnum, _stridx, _boot_protocol, _report_desc_len, _epout, _epin, _epsize, _ep_interval) \
/* Interface */\
- 9, TUSB_DESC_INTERFACE, _itfnum, 0, 2, TUSB_CLASS_HID, (_boot_protocol) ? HID_SUBCLASS_BOOT : 0, _boot_protocol, _stridx,\
+ 9, TUSB_DESC_INTERFACE, _itfnum, 0, 2, TUSB_CLASS_HID, (uint8_t)((_boot_protocol) ? HID_SUBCLASS_BOOT : 0), _boot_protocol, _stridx,\
/* HID descriptor */\
9, HID_DESC_TYPE_HID, U16_TO_U8S_LE(0x0111), 0, 1, HID_DESC_TYPE_REPORT, U16_TO_U8S_LE(_report_desc_len),\
/* Endpoint Out */\
|