diff options
| author | hathach <[email protected]> | 2013-06-26 18:00:05 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-06-26 18:00:05 +0700 |
| commit | ea2e63a332a0d46971f32bd84c84851c2246fe8c (patch) | |
| tree | 16dddc010f48df6e770a0ee5abdba2029ea8b61d /demos/host/src | |
| parent | c7f7bc9808715c2be40b2b54f27b4ddab71f0279 (diff) | |
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
Diffstat (limited to 'demos/host/src')
| -rw-r--r-- | demos/host/src/keyboard_app.c | 11 | ||||
| -rw-r--r-- | demos/host/src/mouse_app.c | 12 |
2 files changed, 15 insertions, 8 deletions
diff --git a/demos/host/src/keyboard_app.c b/demos/host/src/keyboard_app.c index 34c0c07a2..7475eb91c 100644 --- a/demos/host/src/keyboard_app.c +++ b/demos/host/src/keyboard_app.c @@ -40,7 +40,10 @@ // INCLUDE //--------------------------------------------------------------------+ #include "keyboard_app.h" + +#if TUSB_CFG_OS != TUSB_OS_NONE #include "app_os_prio.h" +#endif #if TUSB_CFG_HOST_HID_KEYBOARD @@ -64,13 +67,13 @@ static inline void process_kbd_report(tusb_keyboard_report_t const * report); //--------------------------------------------------------------------+ // tinyusb callback (ISR context) //--------------------------------------------------------------------+ -void tusbh_hid_keyboard_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t event) +void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) { switch(event) { case TUSB_EVENT_INTERFACE_OPEN: // application set-up osal_queue_flush(queue_kbd_hdl); - tusbh_hid_keyboard_get_report(dev_addr, instance_num, (uint8_t*) &usb_keyboard_report); // first report + tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // first report break; case TUSB_EVENT_INTERFACE_CLOSE: // application tear-down @@ -79,11 +82,11 @@ void tusbh_hid_keyboard_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t case TUSB_EVENT_XFER_COMPLETE: osal_queue_send(queue_kbd_hdl, &usb_keyboard_report); - tusbh_hid_keyboard_get_report(dev_addr, instance_num, (uint8_t*) &usb_keyboard_report); + tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); break; case TUSB_EVENT_XFER_ERROR: - tusbh_hid_keyboard_get_report(dev_addr, instance_num, (uint8_t*) &usb_keyboard_report); // ignore & continue + tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // ignore & continue break; default : diff --git a/demos/host/src/mouse_app.c b/demos/host/src/mouse_app.c index b5a48119d..432004c2c 100644 --- a/demos/host/src/mouse_app.c +++ b/demos/host/src/mouse_app.c @@ -40,7 +40,11 @@ // INCLUDE //--------------------------------------------------------------------+ #include "mouse_app.h" + +#if TUSB_CFG_OS != TUSB_OS_NONE #include "app_os_prio.h" +#endif + #if TUSB_CFG_HOST_HID_MOUSE @@ -63,13 +67,13 @@ static inline void process_mouse_report(tusb_mouse_report_t const * p_report); //--------------------------------------------------------------------+ // tinyusb callback (ISR context) //--------------------------------------------------------------------+ -void tusbh_hid_mouse_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t event) +void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) { switch(event) { case TUSB_EVENT_INTERFACE_OPEN: // application set-up osal_queue_flush(queue_mouse_hdl); - tusbh_hid_mouse_get_report(dev_addr, instance_num, (uint8_t*) &usb_mouse_report); // first report + tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // first report break; case TUSB_EVENT_INTERFACE_CLOSE: // application tear-down @@ -78,11 +82,11 @@ void tusbh_hid_mouse_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t ev case TUSB_EVENT_XFER_COMPLETE: osal_queue_send(queue_mouse_hdl, &usb_mouse_report); - tusbh_hid_mouse_get_report(dev_addr, instance_num, (uint8_t*) &usb_mouse_report); + tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); break; case TUSB_EVENT_XFER_ERROR: - tusbh_hid_mouse_get_report(dev_addr, instance_num, (uint8_t*) &usb_mouse_report); // ignore & continue + tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // ignore & continue break; default : |
