yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the callback api in usbd_hid.c

Browse Source
This commit is contained in:
Chen Leeren
2023-07-21 12:12:59 +08:00
committed by sakumisu
parent 64e2b8d480
commit 45ea9928bc
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
class/hid/usbd_hid.c
View File

@@ -17,27 +17,27 @@ static int hid_class_interface_request_handler(struct usb_setup_packet *setup, u
switch (setup->bRequest) { switch (setup->bRequest) {
case HID_REQUEST_GET_REPORT: case HID_REQUEST_GET_REPORT:
/* report id ,report type */ /* report id ,report type */
usbh_hid_get_report(intf_num, LO_BYTE(setup->wValue), HI_BYTE(setup->wValue), data, len); usbd_hid_get_report(intf_num, LO_BYTE(setup->wValue), HI_BYTE(setup->wValue), data, len);
break; break;
case HID_REQUEST_GET_IDLE: case HID_REQUEST_GET_IDLE:
(*data)[0] = usbh_hid_get_idle(intf_num, LO_BYTE(setup->wValue)); (*data)[0] = usbd_hid_get_idle(intf_num, LO_BYTE(setup->wValue));
*len = 1; *len = 1;
break; break;
case HID_REQUEST_GET_PROTOCOL: case HID_REQUEST_GET_PROTOCOL:
(*data)[0] = usbh_hid_get_protocol(intf_num); (*data)[0] = usbd_hid_get_protocol(intf_num);
*len = 1; *len = 1;
break; break;
case HID_REQUEST_SET_REPORT: case HID_REQUEST_SET_REPORT:
/* report id ,report type, report, report len */ /* report id ,report type, report, report len */
usbh_hid_set_report(intf_num, LO_BYTE(setup->wValue), HI_BYTE(setup->wValue), *data, *len); usbd_hid_set_report(intf_num, LO_BYTE(setup->wValue), HI_BYTE(setup->wValue), *data, *len);
break; break;
case HID_REQUEST_SET_IDLE: case HID_REQUEST_SET_IDLE:
/* report id, duration */ /* report id, duration */
usbh_hid_set_idle(intf_num, LO_BYTE(setup->wValue), HI_BYTE(setup->wValue)); usbd_hid_set_idle(intf_num, LO_BYTE(setup->wValue), HI_BYTE(setup->wValue));
break; break;
case HID_REQUEST_SET_PROTOCOL: case HID_REQUEST_SET_PROTOCOL:
/* protocol */ /* protocol */
usbh_hid_set_protocol(intf_num, LO_BYTE(setup->wValue)); usbd_hid_set_protocol(intf_num, LO_BYTE(setup->wValue));
break; break;
default: default:
@@ -60,30 +60,30 @@ struct usbd_interface *usbd_hid_init_intf(struct usbd_interface *intf, const uin
return intf; return intf;
} }
__WEAK void usbh_hid_get_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t **data, uint32_t *len) __WEAK void usbd_hid_get_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t **data, uint32_t *len)
{ {
(*data[0]) = 0; (*data[0]) = 0;
*len = 1; *len = 1;
} }
__WEAK uint8_t usbh_hid_get_idle(uint8_t intf, uint8_t report_id) __WEAK uint8_t usbd_hid_get_idle(uint8_t intf, uint8_t report_id)
{ {
return 0; return 0;
} }
__WEAK uint8_t usbh_hid_get_protocol(uint8_t intf) __WEAK uint8_t usbd_hid_get_protocol(uint8_t intf)
{ {
return 0; return 0;
} }
__WEAK void usbh_hid_set_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t *report, uint32_t report_len) __WEAK void usbd_hid_set_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t *report, uint32_t report_len)
{ {
} }
__WEAK void usbh_hid_set_idle(uint8_t intf, uint8_t report_id, uint8_t duration) __WEAK void usbd_hid_set_idle(uint8_t intf, uint8_t report_id, uint8_t duration)
{ {
} }
__WEAK void usbh_hid_set_protocol(uint8_t intf, uint8_t protocol) __WEAK void usbd_hid_set_protocol(uint8_t intf, uint8_t protocol)
{ {
} }

12
class/hid/usbd_hid.h
View File

@@ -20,12 +20,12 @@ void usbd_hid_descriptor_register(uint8_t intf_num, const uint8_t *desc);
void usbd_hid_report_descriptor_register(uint8_t intf_num, const uint8_t *desc, uint32_t desc_len); void usbd_hid_report_descriptor_register(uint8_t intf_num, const uint8_t *desc, uint32_t desc_len);
/* Setup request command callback api */ /* Setup request command callback api */
void usbh_hid_get_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t **data, uint32_t *len); void usbd_hid_get_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t **data, uint32_t *len);
uint8_t usbh_hid_get_idle(uint8_t intf, uint8_t report_id); uint8_t usbd_hid_get_idle(uint8_t intf, uint8_t report_id);
uint8_t usbh_hid_get_protocol(uint8_t intf); uint8_t usbd_hid_get_protocol(uint8_t intf);
void usbh_hid_set_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t *report, uint32_t report_len); void usbd_hid_set_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t *report, uint32_t report_len);
void usbh_hid_set_idle(uint8_t intf, uint8_t report_id, uint8_t duration); void usbd_hid_set_idle(uint8_t intf, uint8_t report_id, uint8_t duration);
void usbh_hid_set_protocol(uint8_t intf, uint8_t protocol); void usbd_hid_set_protocol(uint8_t intf, uint8_t protocol);
#ifdef __cplusplus #ifdef __cplusplus
} }