remove app_os_prio.h in os_none configure

remove instance_num in hidh API
temporarily pause device stack developement
should fix travis-ci build error

2 files changed, 19 insertions, 21 deletions

diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index 1caea01ee..98f0753c1 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -130,13 +130,12 @@ bool  tusbh_hid_keyboard_is_mounted(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, void* report)
+tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, void* report)
 {
-  (void) instance_num;
   return hidh_interface_get_report(dev_addr, report, &keyboard_data[dev_addr-1]);
 }
 
-tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num)
+tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr)
 {
   return hidh_interface_status(dev_addr, &keyboard_data[dev_addr-1]);
 }
@@ -156,13 +155,12 @@ bool tusbh_hid_mouse_is_mounted(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, void * report)
+tusb_error_t tusbh_hid_mouse_get_report(uint8_t dev_addr, void * report)
 {
-  (void) instance_num;
   return hidh_interface_get_report(dev_addr, report, &mouse_data[dev_addr-1]);
 }
 
-tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr, uint8_t instance_num)
+tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr)
 {
   return hidh_interface_status(dev_addr, &mouse_data[dev_addr-1]);
 }
@@ -221,7 +219,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
       ASSERT_STATUS ( hidh_interface_open(dev_addr, (tusb_descriptor_endpoint_t const *) p_desc, &keyboard_data[dev_addr-1]) );
       if ( tusbh_hid_keyboard_isr )
       {
-        tusbh_hid_keyboard_isr(dev_addr, 0, TUSB_EVENT_INTERFACE_OPEN);
+        tusbh_hid_keyboard_isr(dev_addr, TUSB_EVENT_INTERFACE_OPEN);
       }
     break;
     #endif
@@ -231,7 +229,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
       ASSERT_STATUS ( hidh_interface_open(dev_addr, (tusb_descriptor_endpoint_t const *) p_desc, &mouse_data[dev_addr-1]) );
       if (tusbh_hid_mouse_isr)
       {
-        tusbh_hid_mouse_isr(dev_addr, 0, TUSB_EVENT_INTERFACE_OPEN);
+        tusbh_hid_mouse_isr(dev_addr, TUSB_EVENT_INTERFACE_OPEN);
       }
     break;
     #endif
@@ -252,7 +250,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event)
     keyboard_data[pipe_hdl.dev_addr-1].status = (event == TUSB_EVENT_XFER_COMPLETE) ? TUSB_INTERFACE_STATUS_COMPLETE : TUSB_INTERFACE_STATUS_ERROR;
     if (tusbh_hid_keyboard_isr)
     {
-      tusbh_hid_keyboard_isr(pipe_hdl.dev_addr, 0, event);
+      tusbh_hid_keyboard_isr(pipe_hdl.dev_addr, event);
     }
     return;
   }
@@ -264,7 +262,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event)
     mouse_data[pipe_hdl.dev_addr-1].status = (event == TUSB_EVENT_XFER_COMPLETE) ? TUSB_INTERFACE_STATUS_COMPLETE : TUSB_INTERFACE_STATUS_ERROR;
     if (tusbh_hid_mouse_isr)
     {
-      tusbh_hid_mouse_isr(pipe_hdl.dev_addr, 0, event);
+      tusbh_hid_mouse_isr(pipe_hdl.dev_addr, event);
     }
 
     return;
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index bf13826af..547752ea3 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -60,30 +60,30 @@
 extern uint8_t const hid_keycode_to_ascii_tbl[2][128]; // TODO used weak attr if build failed without KEYBOARD enabled
 
 bool          tusbh_hid_keyboard_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, void * report) ATTR_WARN_UNUSED_RESULT;
-tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_hid_keyboard_get_report(uint8_t dev_addr, void * report) ATTR_WARN_UNUSED_RESULT;
+tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;
 //------------- Application Callback -------------//
-void tusbh_hid_keyboard_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t event) ATTR_WEAK;
+void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK;
 
 //--------------------------------------------------------------------+
 // MOUSE Application API
 //--------------------------------------------------------------------+
 bool          tusbh_hid_mouse_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_hid_mouse_get_report(uint8_t dev_addr, uint8_t instance_num, void* report) ATTR_WARN_UNUSED_RESULT;
-tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_hid_mouse_get_report(uint8_t dev_addr, void* report) ATTR_WARN_UNUSED_RESULT;
+tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;
 //------------- Application Callback -------------//
-void tusbh_hid_mouse_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t event) ATTR_WEAK;
+void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK;
 
 //--------------------------------------------------------------------+
 // GENERIC Application API
 //--------------------------------------------------------------------+
 bool          tusbh_hid_generic_is_mounted(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_hid_generic_get_report(uint8_t dev_addr, uint8_t instance_num, void* report, bool int_on_complete) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  tusbh_hid_generic_set_report(uint8_t dev_addr, uint8_t instance_num, void* report, bool int_on_complete) ATTR_WARN_UNUSED_RESULT;
-tusb_interface_status_t tusbh_hid_generic_get_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
-tusb_interface_status_t tusbh_hid_generic_set_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_hid_generic_get_report(uint8_t dev_addr, void* report, bool int_on_complete) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  tusbh_hid_generic_set_report(uint8_t dev_addr, void* report, bool int_on_complete) ATTR_WARN_UNUSED_RESULT;
+tusb_interface_status_t tusbh_hid_generic_get_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;
+tusb_interface_status_t tusbh_hid_generic_set_status(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;
 //------------- Application Callback -------------//
-void tusbh_hid_generic_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t event) ATTR_WEAK;
+void tusbh_hid_generic_isr(uint8_t dev_addr, tusb_event_t event) ATTR_WEAK;
 
 //--------------------------------------------------------------------+
 // USBH-CLASS DRIVER API