mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-19 06:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to use HID spec protocol value for get/set_protocol()

Browse Source
This commit is contained in:
hathach 2021-05-18 12:38:11 +07:00
parent e163f85ee0
commit 7e9e682e09
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/class/hid/hid.h
View File

@ -142,11 +142,11 @@ typedef enum
} hid_local_enum_t; } hid_local_enum_t;
// HID protocol value used by GetProtocol / SetProtocol // HID protocol value used by GetProtocol / SetProtocol
enum typedef enum
{ {
HID_PROTOCOL_BOOT = 0, HID_PROTOCOL_BOOT = 0,
HID_PROTOCOL_REPORT = 1 HID_PROTOCOL_REPORT = 1
}; } hid_protocol_mode_enum_t;
/** @} */ /** @} */

6
src/class/hid/hid_device.c
View File

@ -112,7 +112,7 @@ uint8_t tud_hid_n_interface_protocol(uint8_t instance)
bool tud_hid_n_get_protocol(uint8_t instance) bool tud_hid_n_get_protocol(uint8_t instance)
{ {
return _hidd_itf[instance].boot_mode; return _hidd_itf[instance].boot_mode ? HID_PROTOCOL_BOOT : HID_PROTOCOL_REPORT;
} }
bool tud_hid_n_keyboard_report(uint8_t instance, uint8_t report_id, uint8_t modifier, uint8_t keycode[6]) bool tud_hid_n_keyboard_report(uint8_t instance, uint8_t report_id, uint8_t modifier, uint8_t keycode[6])
@ -334,14 +334,14 @@ bool hidd_control_xfer_cb (uint8_t rhport, uint8_t stage, tusb_control_request_t
case HID_REQ_CONTROL_SET_PROTOCOL: case HID_REQ_CONTROL_SET_PROTOCOL:
if ( stage == CONTROL_STAGE_SETUP ) if ( stage == CONTROL_STAGE_SETUP )
{ {
p_hid->boot_mode = (request->wValue == HID_PROTOCOL_BOOT);
tud_control_status(rhport, request); tud_control_status(rhport, request);
} }
else if ( stage == CONTROL_STAGE_ACK ) else if ( stage == CONTROL_STAGE_ACK )
{ {
p_hid->boot_mode = (request->wValue == HID_PROTOCOL_BOOT);
if (tud_hid_set_protocol_cb) if (tud_hid_set_protocol_cb)
{ {
tud_hid_set_protocol_cb(hid_itf, p_hid->boot_mode); tud_hid_set_protocol_cb(hid_itf, (uint8_t) request->wValue);
} }
} }
break; break;

11
src/class/hid/hid_device.h
View File

@ -60,8 +60,8 @@ bool tud_hid_n_ready(uint8_t instance);
// Get interface supported protocol (bInterfaceProtocol) check out hid_interface_protocol_enum_t for possible value // Get interface supported protocol (bInterfaceProtocol) check out hid_interface_protocol_enum_t for possible value
uint8_t tud_hid_n_interface_protocol(uint8_t instance); uint8_t tud_hid_n_interface_protocol(uint8_t instance);
// Check if active protocol is Boot (true) or Report (false) // Get current active protocol: HID_PROTOCOL_BOOT (0) or HID_PROTOCOL_REPORT (1)
bool tud_hid_n_get_protocol(uint8_t instance); uint8_t tud_hid_n_get_protocol(uint8_t instance);
// Send report to host // Send report to host
bool tud_hid_n_report(uint8_t instance, uint8_t report_id, void const* report, uint8_t len); bool tud_hid_n_report(uint8_t instance, uint8_t report_id, void const* report, uint8_t len);
@ -83,7 +83,7 @@ bool tud_hid_n_gamepad_report(uint8_t instance, uint8_t report_id, int8_t x, int
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static inline bool tud_hid_ready(void); static inline bool tud_hid_ready(void);
static inline uint8_t tud_hid_interface_protocol(void); static inline uint8_t tud_hid_interface_protocol(void);
static inline bool tud_hid_get_protocol(void); static inline uint8_t tud_hid_get_protocol(void);
static inline bool tud_hid_report(uint8_t report_id, void const* report, uint8_t len); static inline bool tud_hid_report(uint8_t report_id, void const* report, uint8_t len);
static inline bool tud_hid_keyboard_report(uint8_t report_id, uint8_t modifier, uint8_t keycode[6]); static inline bool tud_hid_keyboard_report(uint8_t report_id, uint8_t modifier, uint8_t keycode[6]);
static inline bool tud_hid_mouse_report(uint8_t report_id, uint8_t buttons, int8_t x, int8_t y, int8_t vertical, int8_t horizontal); static inline bool tud_hid_mouse_report(uint8_t report_id, uint8_t buttons, int8_t x, int8_t y, int8_t vertical, int8_t horizontal);
@ -106,8 +106,9 @@ uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, hid_report_t
// received data on OUT endpoint ( Report ID = 0, Type = 0 ) // received data on OUT endpoint ( Report ID = 0, Type = 0 )
void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize); void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize);
// Invoked when received SET_PROTOCOL request ( mode switch Boot <-> Report ) // Invoked when received SET_PROTOCOL request
TU_ATTR_WEAK void tud_hid_set_protocol_cb(uint8_t instance, bool boot_mode); // protocol is either HID_PROTOCOL_BOOT (0) or HID_PROTOCOL_REPORT (1)
TU_ATTR_WEAK void tud_hid_set_protocol_cb(uint8_t instance, uint8_t protocol);
// Invoked when received SET_IDLE request. return false will stall the request // Invoked when received SET_IDLE request. return false will stall the request
// - Idle Rate = 0 : only send report if there is changes, i.e skip duplication // - Idle Rate = 0 : only send report if there is changes, i.e skip duplication