From 6ee14bdd23884854ce1b563fdc8789359e68f4e8 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 1 May 2015 19:11:25 +0700 Subject: simplify host API: tusbh_ to tuh_ for keyboard & mouse --- demos/host/src/keyboard_host_app.c | 12 ++++++------ demos/host/src/mouse_host_app.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'demos/host/src') diff --git a/demos/host/src/keyboard_host_app.c b/demos/host/src/keyboard_host_app.c index 600569737..4c85d5d3b 100644 --- a/demos/host/src/keyboard_host_app.c +++ b/demos/host/src/keyboard_host_app.c @@ -64,33 +64,33 @@ static inline void process_kbd_report(hid_keyboard_report_t const * report); //--------------------------------------------------------------------+ // tinyusb callbacks //--------------------------------------------------------------------+ -void tusbh_hid_keyboard_mounted_cb(uint8_t dev_addr) +void tuh_hid_keyboard_mounted_cb(uint8_t dev_addr) { // application set-up printf("\na Keyboard device (address %d) is mounted\n", dev_addr); osal_queue_flush(queue_kbd_hdl); - tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // first report + tuh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // first report } -void tusbh_hid_keyboard_unmounted_cb(uint8_t dev_addr) +void tuh_hid_keyboard_unmounted_cb(uint8_t dev_addr) { // application tear-down printf("\na Keyboard device (address %d) is unmounted\n", dev_addr); } // invoked ISR context -void tusbh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) +void tuh_hid_keyboard_isr(uint8_t dev_addr, tusb_event_t event) { switch(event) { case TUSB_EVENT_XFER_COMPLETE: (void) osal_queue_send(queue_kbd_hdl, &usb_keyboard_report); - tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); + tuh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); break; case TUSB_EVENT_XFER_ERROR: - tusbh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // ignore & continue + tuh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // ignore & continue break; default : diff --git a/demos/host/src/mouse_host_app.c b/demos/host/src/mouse_host_app.c index 510a77625..23a3e9b5c 100644 --- a/demos/host/src/mouse_host_app.c +++ b/demos/host/src/mouse_host_app.c @@ -63,33 +63,33 @@ static inline void process_mouse_report(hid_mouse_report_t const * p_report); //--------------------------------------------------------------------+ // tinyusb callbacks //--------------------------------------------------------------------+ -void tusbh_hid_mouse_mounted_cb(uint8_t dev_addr) +void tuh_hid_mouse_mounted_cb(uint8_t dev_addr) { // application set-up printf("\na Mouse device (address %d) is mounted\n", dev_addr); osal_queue_flush(queue_mouse_hdl); - (void) tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // first report + (void) tuh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // first report } -void tusbh_hid_mouse_unmounted_cb(uint8_t dev_addr) +void tuh_hid_mouse_unmounted_cb(uint8_t dev_addr) { // application tear-down printf("\na Mouse device (address %d) is unmounted\n", dev_addr); } // invoked ISR context -void tusbh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) +void tuh_hid_mouse_isr(uint8_t dev_addr, tusb_event_t event) { switch(event) { case TUSB_EVENT_XFER_COMPLETE: (void) osal_queue_send(queue_mouse_hdl, &usb_mouse_report); - (void) tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); + (void) tuh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); break; case TUSB_EVENT_XFER_ERROR: - (void) tusbh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // ignore & continue + (void) tuh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // ignore & continue break; default : -- cgit v1.3.1