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

add class mounted callback for hid mouse/keyboard & refractor mouse/keyboard app

Browse Source
This commit is contained in:
hathach
2013-11-21 13:54:29 +07:00
parent c461c72ac2
commit c303154b7a
6 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tinyusb/class/hid_device.c
View File

@@ -78,7 +78,7 @@ bool tusbd_hid_keyboard_is_busy(uint8_t coreid)
tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_report)
{
//------------- verify data -------------//
ASSERT(tusbd_is_configured(coreid), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED);
hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[coreid];
@@ -104,7 +104,7 @@ bool tusbd_hid_mouse_is_busy(uint8_t coreid)
tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_report)
{
//------------- verify data -------------//
ASSERT(tusbd_is_configured(coreid), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED);
hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[coreid];
@@ -226,10 +226,19 @@ tusb_error_t hidd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int
ASSERT_PTR(p_hid, TUSB_ERROR_FAILED);
p_hid->interface_number = p_interface_desc->bInterfaceNumber;
p_hid->report_length = p_desc_hid->wReportLength;
p_hid->ept_handle = dcd_pipe_open(coreid, p_desc_endpoint, p_interface_desc->bInterfaceClass);
ASSERT( endpointhandle_is_valid(p_hid->ept_handle), TUSB_ERROR_DCD_FAILED);
p_hid->interface_number = p_interface_desc->bInterfaceNumber;
p_hid->report_length = p_desc_hid->wReportLength;
if (p_interface_desc->bInterfaceProtocol == HID_PROTOCOL_KEYBOARD)
{
tusbd_hid_keyboard_mounted_cb(coreid);
}else
{
tusbd_hid_mouse_mounted_cb(coreid);
}
}
break;

2
tinyusb/device/usbd.c
View File

@@ -163,7 +163,7 @@ tusb_error_t usbd_body_subtask(void)
{
if ( TUSB_REQUEST_GET_DESCRIPTOR == control_request.bRequest )
{
static uint8_t const * p_buffer = NULL;
static uint8_t* p_buffer = NULL;
static uint16_t length = 0;
error = get_descriptor_subtask(coreid, &control_request, &p_buffer, &length);

2
tinyusb/osal/osal_none.h
View File

@@ -105,7 +105,7 @@ static inline uint32_t osal_tick_get(void)
ATTR_UNUSED static uint32_t timeout = 0;\
static uint16_t state = 0;\
switch(state) {\
case 0:{\
case 0: { \
#define OSAL_TASK_LOOP_END \
default:\