2 files changed, 35 insertions, 3 deletions
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h
index 11018b422..cfc203034 100644
--- a/tinyusb/class/hid.h
+++ b/tinyusb/class/hid.h
@@ -90,12 +90,12 @@ typedef ATTR_PREPACKED struct ATTR_PACKED {
  *
  *  Type define for a standard Boot Protocol Mouse report
  */
-typedef ATTR_PREPACKED struct
+typedef ATTR_PACKED_STRUCT(struct)
 {
   uint8_t buttons; /**< buttons mask for currently pressed buttons in the mouse. */
   int8_t  x; /**< Current delta x movement of the mouse. */
   int8_t  y; /**< Current delta y movement on the mouse. */
-} ATTR_PACKED tusb_mouse_report_t;
+} tusb_mouse_report_t;
 
 /**
  *  \brief Standard HID Boot Protocol Keyboard Report.
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index 61e184db6..e9e12c71b 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -94,7 +94,15 @@ tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_nu
 
 tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num)
 {
-  return tusbh_device_get_state(dev_addr) ? keyboard_data[dev_addr-1].status : TUSB_INTERFACE_STATUS_INVALID_PARA;
+  switch( tusbh_device_get_state(dev_addr) )
+  {
+    case TUSB_DEVICE_STATE_UNPLUG:
+    case TUSB_DEVICE_STATE_INVALID_PARAMETER:
+      return TUSB_INTERFACE_STATUS_INVALID_PARA;
+
+    default:
+      return keyboard_data[dev_addr-1].status;
+  }
 }
 //------------- Internal API -------------//
 static inline tusb_error_t hidh_keyboard_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const *p_endpoint_desc) ATTR_ALWAYS_INLINE;
@@ -130,6 +138,30 @@ static inline void hidh_keyboard_close(uint8_t dev_addr)
 
 STATIC_ hidh_interface_info_t mouse_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
 
+//------------- Public API -------------//
+bool tusbh_hid_mouse_is_supported(uint8_t dev_addr)
+{
+  return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(mouse_data[dev_addr-1].pipe_hdl);
+}
+
+tusb_error_t tusbh_hid_mouse_get_report(uint8_t dev_addr, uint8_t instance_num, uint8_t * const report)
+{
+  return TUSB_ERROR_NONE;
+}
+
+tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr, uint8_t instance_num)
+{
+ /* switch( tusbh_device_get_state(dev_addr) )
+  {
+    case TUSB_DEVICE_STATE_UNPLUG:
+    case TUSB_DEVICE_STATE_INVALID_PARAMETER:
+      return TUSB_INTERFACE_STATUS_INVALID_PARA;
+
+    default:
+      return mouse_data[dev_addr-1].status;
+  }*/
+}
+
 //------------- Internal API -------------//
 static inline tusb_error_t hidh_mouse_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const *p_endpoint_desc) ATTR_ALWAYS_INLINE;
 static inline tusb_error_t hidh_mouse_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const *p_endpoint_desc)