andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

no big deal, only rename tusb_std_request_t to tusb_control_request_t

Browse Source
This commit is contained in:
hathach
2013-07-04 12:25:39 +07:00
parent 8c0bc38713
commit 391e132d6b
22 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tinyusb/class/cdc_host.h
View File

@@ -68,11 +68,21 @@ bool tusbh_cdc_rndis_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RES
tusb_error_t tusbh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t length, bool is_notify);
tusb_error_t tusbh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify);
//------------- Application Callback -------------//
//------------- CDC Application Callback -------------//
void tusbh_cdc_mounted_cb(uint8_t dev_addr) ATTR_WEAK;
void tusbh_cdc_unmounted_isr(uint8_t dev_addr) ATTR_WEAK;
void tusbh_cdc_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK;
void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes) ATTR_WEAK;
//------------- RNDIS Application Callback (overshadow CDC callbacks) -------------//
#if TUSB_CFG_HOST_CDC_RNDIS
void tusbh_cdc_rndis_mounted_cb(uint8_t dev_addr) ATTR_WEAK;
void tusbh_cdc_rndis_unmounted_isr(uint8_t dev_addr) ATTR_WEAK;
#endif
//--------------------------------------------------------------------+
// USBH-CLASS API
//--------------------------------------------------------------------+

2
tinyusb/class/hid_device.c
View File

@@ -67,7 +67,7 @@ STATIC_ hidd_interface_t keyboard_intf =
};
#endif
tusb_error_t hidd_control_request(uint8_t coreid, tusb_std_request_t const * p_request)
tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const * p_request)
{
#if TUSB_CFG_DEVICE_HID_KEYBOARD
if (p_request->bmRequestType.type == TUSB_REQUEST_TYPE_STANDARD) // standard request to hid

2
tinyusb/class/hid_device.h
View File

@@ -66,7 +66,7 @@ tusb_error_t tusbd_hid_mouse_send_report(tusb_mouse_report_t *p_mouse_report);
#ifdef _TINY_USB_SOURCE_FILE_
tusb_error_t hidd_init(uint8_t coreid, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);
tusb_error_t hidd_control_request(uint8_t coreid, tusb_std_request_t const * p_request);
tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const * p_request);
tusb_error_t hidd_configured(void);
#endif

4
tinyusb/class/hid_host.c
View File

@@ -221,7 +221,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
// OSAL_SUBTASK_INVOKED_AND_WAIT(
// usbh_control_xfer_subtask(
// dev_addr,
// &(tusb_std_request_t)
// &(tusb_control_request_t)
// {
// .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_CLASS, .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE },
// .bRequest = HID_REQUEST_CONTROL_SET_IDLE,
@@ -238,7 +238,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
// OSAL_SUBTASK_INVOKED_AND_WAIT(
// usbh_control_xfer_subtask(
// dev_addr,
// &(tusb_std_request_t)
// &(tusb_control_request_t)
// {
// .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE },
// .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,