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

separate hidh_keyboard from hid_host

Browse Source 
move test hid related to its own folder
This commit is contained in:
hathach
2013-03-25 13:08:40 +07:00
parent 56cd8be75e
commit ddeec330fa
6 changed files with 234 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tinyusb/class/hid_host.c
View File

@@ -47,7 +47,6 @@
#include "common/common.h"
#include "hid_host.h"
#if TUSB_CFG_HOST_HID_KEYBOARD
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
@@ -55,37 +54,6 @@
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
STATIC_ hidh_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
//--------------------------------------------------------------------+
// PUBLIC API (Parameter Verification is required)
//--------------------------------------------------------------------+
tusb_error_t tusbh_hid_keyboard_get(uint8_t const dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report)
{
//------------- parameters validation -------------//
ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY);
ASSERT_PTR(report, TUSB_ERROR_INVALID_PARA);
ASSERT(instance_num < TUSB_CFG_HOST_HID_KEYBOARD_NO_INSTANCES_PER_DEVICE, TUSB_ERROR_INVALID_PARA);
keyboard_interface_t *p_kbd;
p_kbd = &keyboard_data[dev_addr-1].instance[instance_num];
// TODO abtract class support for device
ASSERT(0 != p_kbd->pipe_in.dev_addr, TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT);
// TODO abtract to use hidh service
ASSERT_STATUS( hcd_pipe_xfer(p_kbd->pipe_in, report, p_kbd->report_size, 1) ) ;
return TUSB_ERROR_NONE;
}
uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr)
{
ASSERT(tusbh_device_is_configured(dev_addr), 0);
return keyboard_data[dev_addr-1].instance_count;
}
//--------------------------------------------------------------------+
// CLASS-USBD API (don't require to verify parameters)
@@ -95,19 +63,29 @@ void hidh_init(void)
#if TUSB_CFG_HOST_HID_KEYBOARD
hidh_keyboard_init();
#endif
#if TUSB_CFG_HOST_HID_MOUSE
hidh_mouse_init();
#endif
#if TUSB_CFG_HOST_HID_GENERIC
hidh_generic_init();
#endif
}
void hidh_keyboard_init(void)
tusb_error_t hidh_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length)
{
memclr_(&keyboard_data, sizeof(hidh_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
}
tusb_error_t hidh_keyboard_install(uint8_t const dev_addr, uint8_t const *descriptor)
{
keyboard_data[dev_addr-1].instance_count++;
return TUSB_ERROR_NONE;
}
#endif
void hidh_isr(pipe_handle_t pipe_hdl, tusb_bus_event_t event)
{
}
void hidh_close(uint8_t dev_addr)
{
}
#endif