From a1b17be6818320986328e4ac39abd82e2a894104 Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 24 Mar 2013 17:29:07 +0700 Subject: [PATCH] add class flags change keyboard_info_pool to keyboard_data --- demos/host/keyboard_app.c | 7 +++++ tests/test/host/test_hidh_keyboard.c | 16 +++++------ tinyusb/class/hid_host.c | 10 +++---- tinyusb/class/hid_host.h | 6 ++-- tinyusb/core/tusb_types.h | 41 ++++++++++++++++++++++------ tinyusb/host/usbh.h | 9 ++++-- tinyusb/host/usbh_hcd.h | 1 + 7 files changed, 62 insertions(+), 28 deletions(-) diff --git a/demos/host/keyboard_app.c b/demos/host/keyboard_app.c index 20e6c64e..7acb5289 100644 --- a/demos/host/keyboard_app.c +++ b/demos/host/keyboard_app.c @@ -55,4 +55,11 @@ void keyboard_app_task(void) { + for (uint8_t dev_addr = 1; dev_addr <= TUSB_CFG_HOST_DEVICE_MAX; dev_addr++) + { + if ( tusbh_device_is_configured(dev_addr) ) + { + + } + } } diff --git a/tests/test/host/test_hidh_keyboard.c b/tests/test/host/test_hidh_keyboard.c index e5460a44..a47b5b70 100644 --- a/tests/test/host/test_hidh_keyboard.c +++ b/tests/test/host/test_hidh_keyboard.c @@ -41,7 +41,7 @@ #include "mock_osal.h" #include "mock_usbh.h" -extern class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX]; +extern class_hid_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; tusb_keyboard_report_t sample_key[2] = { @@ -66,9 +66,9 @@ void setUp(void) instance_num = 0; memset(&report, 0, sizeof(tusb_keyboard_report_t)); - keyboard_info_pool[0].instance_count = 0; - keyboard_info_pool[0].instance[0].pipe_in = (pipe_handle_t) { .dev_addr = 1, .xfer_type = TUSB_XFER_INTERRUPT, .index = 1}; - keyboard_info_pool[0].instance[0].report_size = sizeof(tusb_keyboard_report_t); + keyboard_data[0].instance_count = 0; + keyboard_data[0].instance[0].pipe_in = (pipe_handle_t) { .dev_addr = 1, .xfer_type = TUSB_XFER_INTERRUPT, .index = 1}; + keyboard_data[0].instance[0].report_size = sizeof(tusb_keyboard_report_t); kbd_descriptor = ((tusb_descriptor_interface_t) { @@ -115,7 +115,7 @@ void test_keyboard_init(void) hidh_keyboard_init(); - TEST_ASSERT_EQUAL_MEMORY(keyboard_info_zero, keyboard_info_pool, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX); + TEST_ASSERT_EQUAL_MEMORY(keyboard_info_zero, keyboard_data, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX); } //--------------------------------------------------------------------+ @@ -126,7 +126,7 @@ pipe_status_t pipe_status_get_stub(pipe_handle_t pipe_hdl, int num_call) switch (num_call) { case 0: - memcpy(keyboard_info_pool[0].instance[0].buffer, &sample_key[0], sizeof(tusb_keyboard_report_t)); + memcpy(keyboard_data[0].instance[0].buffer, &sample_key[0], sizeof(tusb_keyboard_report_t)); return PIPE_STATUS_COMPLETE; break; @@ -139,7 +139,7 @@ pipe_status_t pipe_status_get_stub(pipe_handle_t pipe_hdl, int num_call) break; case 3: - memcpy(keyboard_info_pool[0].instance[0].buffer, &sample_key[1], sizeof(tusb_keyboard_report_t)); + memcpy(keyboard_data[0].instance[0].buffer, &sample_key[1], sizeof(tusb_keyboard_report_t)); return PIPE_STATUS_COMPLETE; break; @@ -163,7 +163,7 @@ void test_keyboard_get_invalid_para() void test_keyboard_get_class_not_supported() { tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED); - keyboard_info_pool[dev_addr].instance[0].pipe_in = (pipe_handle_t) { 0 }; + keyboard_data[dev_addr].instance[0].pipe_in = (pipe_handle_t) { 0 }; TEST_ASSERT_EQUAL(TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT, tusbh_hid_keyboard_get(dev_addr, instance_num, &report)); } diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index 01d0e05d..c3a29048 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -55,7 +55,7 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -STATIC_ class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX]; +STATIC_ class_hid_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; //--------------------------------------------------------------------+ @@ -69,7 +69,7 @@ tusb_error_t tusbh_hid_keyboard_get(uint8_t const dev_addr, uint8_t instance_num ASSERT_PTR(report, TUSB_ERROR_INVALID_PARA); ASSERT(instance_num < TUSB_CFG_HOST_HID_KEYBOARD_NO_INSTANCES_PER_DEVICE, TUSB_ERROR_INVALID_PARA); - p_kbd = &keyboard_info_pool[dev_addr].instance[instance_num]; + p_kbd = &keyboard_data[dev_addr].instance[instance_num]; ASSERT(0 != p_kbd->pipe_in.dev_addr, TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT); @@ -84,7 +84,7 @@ uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr) { ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr), 0); - return keyboard_info_pool[dev_addr].instance_count; + return keyboard_data[dev_addr].instance_count; } //--------------------------------------------------------------------+ @@ -99,12 +99,12 @@ void hidh_init(void) void hidh_keyboard_init(void) { - memclr_(&keyboard_info_pool, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX); + memclr_(&keyboard_data, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX); } tusb_error_t hidh_keyboard_install(uint8_t const dev_addr, uint8_t const *descriptor) { - keyboard_info_pool[dev_addr].instance_count++; + keyboard_data[dev_addr].instance_count++; return TUSB_ERROR_NONE; } diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h index 669e962d..9d138ecc 100644 --- a/tinyusb/class/hid_host.h +++ b/tinyusb/class/hid_host.h @@ -62,9 +62,9 @@ //--------------------------------------------------------------------+ // APPLICATION API //--------------------------------------------------------------------+ -uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr) ATTR_WARN_UNUSED_RESULT; -tusb_error_t tusbh_hid_keyboard_get(uint8_t const handle, uint8_t const instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; -pipe_status_t tusbh_hid_keyboard_pipe_status(uint8_t const handle, uint8_t const instance_num); +uint8_t tusbh_hid_keyboard_no_instances(uint8_t const dev_addr) ATTR_WARN_UNUSED_RESULT; +tusb_error_t tusbh_hid_keyboard_get(uint8_t const handle, uint8_t const instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT; +pipe_status_t tusbh_hid_keyboard_pipe_status(uint8_t const handle, uint8_t const instance_num) ATTR_WARN_UNUSED_RESULT; //--------------------------------------------------------------------+ // INTERNAL API diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h index 79cc5f06..7238063d 100644 --- a/tinyusb/core/tusb_types.h +++ b/tinyusb/core/tusb_types.h @@ -125,16 +125,16 @@ typedef enum { TUSB_CLASS_RESERVED_4 = 4 , ///< 4 TUSB_CLASS_PHYSICAL = 5 , ///< 5 TUSB_CLASS_IMAGE = 6 , ///< 6 - TUSB_CLASS_PRINTER = 7 , ///< 7 - TUSB_CLASS_MSC = 8 , ///< 8 - TUSB_CLASS_HUB = 9 , ///< 9 - TUSB_CLASS_CDC_DATA = 10 , ///< 10 - TUSB_CLASS_SMART_CARD = 11 , ///< 11 + TUSB_CLASS_PRINTER = 7 , ///< 7 + TUSB_CLASS_MSC = 8 , ///< 8 + TUSB_CLASS_HUB = 9 , ///< 9 + TUSB_CLASS_CDC_DATA = 10 , ///< 10 + TUSB_CLASS_SMART_CARD = 11 , ///< 11 TUSB_CLASS_RESERVED_12 = 12 , ///< 12 - TUSB_CLASS_CONTENT_SECURITY = 13 , ///< 13 - TUSB_CLASS_VIDEO = 14 , ///< 14 - TUSB_CLASS_PERSONAL_HEALTHCARE = 15 , ///< 15 - TUSB_CLASS_AUDIO_VIDEO = 16 , ///< 16 + TUSB_CLASS_CONTENT_SECURITY = 13 , ///< 13 + TUSB_CLASS_VIDEO = 14 , ///< 14 + TUSB_CLASS_PERSONAL_HEALTHCARE = 15 , ///< 15 + TUSB_CLASS_AUDIO_VIDEO = 16 , ///< 16 TUSB_CLASS_MAX_CONSEC_NUMBER = 17 , // TODO compact & minimize this number @@ -145,6 +145,29 @@ typedef enum { TUSB_CLASS_VENDOR_SPECIFIC = 0xFF }tusb_std_class_code_t; +typedef enum tusb_std_class_flag_{ + TUSB_CLASS_FLAG_AUDIO = BIT_(TUSB_CLASS_AUDIO) , ///< 1 + TUSB_CLASS_FLAG_CDC = BIT_(TUSB_CLASS_CDC) , ///< 2 + TUSB_CLASS_FLAG_HID = BIT_(TUSB_CLASS_HID) , ///< 3 + TUSB_CLASS_FLAG_PHYSICAL = BIT_(TUSB_CLASS_PHYSICAL) , ///< 5 + TUSB_CLASS_FLAG_IMAGE = BIT_(TUSB_CLASS_IMAGE) , ///< 6 + TUSB_CLASS_FLAG_PRINTER = BIT_(TUSB_CLASS_PRINTER) , ///< 7 + TUSB_CLASS_FLAG_MSC = BIT_(TUSB_CLASS_MSC) , ///< 8 + TUSB_CLASS_FLAG_HUB = BIT_(TUSB_CLASS_HUB) , ///< 9 + TUSB_CLASS_FLAG_CDC_DATA = BIT_(TUSB_CLASS_CDC_DATA) , ///< 10 + TUSB_CLASS_FLAG_SMART_CARD = BIT_(TUSB_CLASS_SMART_CARD) , ///< 11 + TUSB_CLASS_FLAG_CONTENT_SECURITY = BIT_(TUSB_CLASS_CONTENT_SECURITY) , ///< 13 + TUSB_CLASS_FLAG_VIDEO = BIT_(TUSB_CLASS_VIDEO) , ///< 14 + TUSB_CLASS_FLAG_PERSONAL_HEALTHCARE = BIT_(TUSB_CLASS_PERSONAL_HEALTHCARE) , ///< 15 + TUSB_CLASS_FLAG_AUDIO_VIDEO = BIT_(TUSB_CLASS_AUDIO_VIDEO) , ///< 16 + + TUSB_CLASS_FLAG_DIAGNOSTIC = BIT_(27) , + TUSB_CLASS_FLAG_WIRELESS_CONTROLLER = BIT_(28) , + TUSB_CLASS_FLAG_MISC = BIT_(29) , + TUSB_CLASS_FLAG_APPLICATION_SPECIFIC = BIT_(30) , + TUSB_CLASS_FLAG_VENDOR_SPECIFIC = BIT_(31) +} tusb_std_class_flag_t; + enum { TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP = BIT_(5), TUSB_DESC_CONFIG_ATT_SELF_POWER = BIT_(6), diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h index aaac174b..2ecd8506 100644 --- a/tinyusb/host/usbh.h +++ b/tinyusb/host/usbh.h @@ -70,8 +70,6 @@ typedef enum pipe_status_{ PIPE_STATUS_ERROR } pipe_status_t; -typedef uint32_t tusbh_flag_class_t; - typedef struct { void (* const init) (void); tusb_error_t (* const open_subtask)(uint8_t, uint8_t const *, uint16_t*); @@ -86,7 +84,12 @@ typedef struct { // APPLICATION API //--------------------------------------------------------------------+ tusb_error_t tusbh_configuration_set (uint8_t dev_addr, uint8_t configure_number) ATTR_WARN_UNUSED_RESULT; -tusb_device_state_t tusbh_device_get_state (uint8_t const dev_addr) ATTR_WARN_UNUSED_RESULT; +tusb_device_state_t tusbh_device_get_state (uint8_t const dev_addr) ATTR_WARN_UNUSED_RESULT ATTR_PURE; +static inline bool tusbh_device_is_configured(uint8_t const dev_addr) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_PURE; +static inline bool tusbh_device_is_configured(uint8_t const dev_addr) +{ + return tusbh_device_get_state(dev_addr) == TUSB_DEVICE_STATE_CONFIGURED; +} //--------------------------------------------------------------------+ // APPLICATION CALLBACK diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h index 9349c64e..79f82ceb 100644 --- a/tinyusb/host/usbh_hcd.h +++ b/tinyusb/host/usbh_hcd.h @@ -103,6 +103,7 @@ typedef struct { // TODO internal structure, re-order members extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address +//------------- callback from HCD ISR-------------// void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_bus_event_t event); void usbh_device_plugged_isr(uint8_t hostid, tusb_speed_t speed); void usbh_device_unplugged_isr(uint8_t hostid);