start merge hidh_keyboard back to hidh

1 files changed, 68 insertions, 2 deletions

diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index a01c57963..00ef1848c 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -54,6 +54,13 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
+STATIC_ hidh_keyboard_info_t keyboard_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
+
+static inline hidh_keyboard_info_t* get_kbd_data(uint8_t dev_addr) ATTR_PURE ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+static inline hidh_keyboard_info_t* get_kbd_data(uint8_t dev_addr)
+{
+  return &keyboard_data[dev_addr-1];
+}
 
 //--------------------------------------------------------------------+
 // CLASS-USBD API (don't require to verify parameters)
@@ -61,7 +68,7 @@
 void hidh_init(void)
 {
 #if TUSB_CFG_HOST_HID_KEYBOARD
-  hidh_keyboard_init();
+  memclr_(&keyboard_data, sizeof(hidh_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 #endif
 
 #if TUSB_CFG_HOST_HID_MOUSE
@@ -73,6 +80,36 @@ void hidh_init(void)
 #endif
 }
 
+
+tusb_error_t hidh_keyboard_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length)
+{
+  hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr);
+  uint8_t const *p_desc = descriptor;
+
+  p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // skip interface
+  (*p_length) = p_desc - descriptor; // set ASAP, in case of error, p_length has to be not zero to prevent infinite re-open
+
+  //------------- HID descriptor -------------//
+  tusb_hid_descriptor_hid_t* const p_desc_hid = (tusb_hid_descriptor_hid_t* const) p_desc;
+  ASSERT_INT(HID_DESC_HID, p_desc_hid->bDescriptorType, TUSB_ERROR_INVALID_PARA);
+
+  p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // TODO skip HID, only support std keyboard
+  (*p_length) = p_desc - descriptor;
+
+  //------------- Endpoint Descriptor -------------//
+  ASSERT_INT(TUSB_DESC_ENDPOINT, p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_INVALID_PARA);
+
+  p_keyboard->pipe_hdl    = hcd_pipe_open(dev_addr, (tusb_descriptor_endpoint_t*) p_desc, TUSB_CLASS_HID);
+  p_keyboard->report_size = ( ((tusb_descriptor_endpoint_t*) p_desc)->wMaxPacketSize & (BIT_(12)-1) );
+
+  p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // advance endpoint descriptor
+  (*p_length) = p_desc - descriptor;
+
+  ASSERT (pipehandle_is_valid(p_keyboard->pipe_hdl), TUSB_ERROR_HCD_FAILED);
+
+  return TUSB_ERROR_NONE;
+}
+
 tusb_error_t hidh_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length)
 {
   tusb_descriptor_interface_t* p_interface = (tusb_descriptor_interface_t*) descriptor;
@@ -82,6 +119,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint
     {
       #if TUSB_CFG_HOST_HID_KEYBOARD
       case HID_PROTOCOL_KEYBOARD:
+
         return hidh_keyboard_open_subtask(dev_addr, descriptor, p_length);
       break;
       #endif
@@ -112,7 +150,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_bus_event_t event)
 void hidh_close(uint8_t dev_addr)
 {
 #if TUSB_CFG_HOST_HID_KEYBOARD
-  hidh_keyboard_close(dev_addr);
+//  hidh_keyboard_close(dev_addr);
 #endif
 
 #if TUSB_CFG_HOST_HID_MOUSE
@@ -124,4 +162,32 @@ void hidh_close(uint8_t dev_addr)
 #endif
 }
 
+//--------------------------------------------------------------------+
+// KEYBOARD PUBLIC API (parameter validation required)
+//--------------------------------------------------------------------+
+#if TUSB_CFG_HOST_HID_KEYBOARD
+
+bool  tusbh_hid_keyboard_is_supported(uint8_t dev_addr)
+{
+  return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboard_data[dev_addr-1].pipe_hdl);
+}
+
+tusb_error_t tusbh_hid_keyboard_get_report(uint8_t 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);
+
+  (void) instance_num;
+
+  hidh_keyboard_info_t *p_keyboard = get_kbd_data(dev_addr);
+
+  // TODO abstract to use hidh service
+  ASSERT_STATUS( hcd_pipe_xfer(p_keyboard->pipe_hdl, (uint8_t*) report, p_keyboard->report_size, true) ) ;
+
+  return TUSB_ERROR_NONE;
+}
+
+#endif
+
 #endif