Jelajahi Sumber

Fix the callback api in usbd_hid.c

Chen Leeren 2 tahun lalu
induk
melakukan
45ea9928bc
2 mengubah file dengan 18 tambahan dan 18 penghapusan
  1. 12 12
      class/hid/usbd_hid.c
  2. 6 6
      class/hid/usbd_hid.h

+ 12 - 12
class/hid/usbd_hid.c

@@ -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)
 {
 {
 }
 }

+ 6 - 6
class/hid/usbd_hid.h

@@ -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);
-uint8_t usbh_hid_get_idle(uint8_t intf, uint8_t report_id);
-uint8_t usbh_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 usbh_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_get_report(uint8_t intf, uint8_t report_id, uint8_t report_type, uint8_t **data, uint32_t *len);
+uint8_t usbd_hid_get_idle(uint8_t intf, uint8_t report_id);
+uint8_t usbd_hid_get_protocol(uint8_t intf);
+void usbd_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_idle(uint8_t intf, uint8_t report_id, uint8_t duration);
+void usbd_hid_set_protocol(uint8_t intf, uint8_t protocol);
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus
 }
 }