From f5260610d3ed56ae61401617f611ec4b94b4c5ee Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 11 Mar 2018 19:43:03 +0700 Subject: [PATCH] clean up example --- examples/obsolete/device/src/cdc_device_app.c | 6 +++--- examples/obsolete/device/src/keyboard_device_app.c | 2 +- examples/obsolete/device/src/mouse_device_app.c | 2 +- tinyusb/class/hid/hid_device.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/obsolete/device/src/cdc_device_app.c b/examples/obsolete/device/src/cdc_device_app.c index d65b695f8..1d77511c9 100644 --- a/examples/obsolete/device/src/cdc_device_app.c +++ b/examples/obsolete/device/src/cdc_device_app.c @@ -96,14 +96,14 @@ tusb_error_t cdc_serial_subtask(void) { OSAL_SUBTASK_BEGIN - if ( tud_mounted(0) && tud_cdc_available(0) ) + if ( tud_mounted() && tud_cdc_available() ) { uint8_t buf[64]; // read and echo back - uint32_t count = tud_cdc_read(0, buf, sizeof(buf)); + uint32_t count = tud_cdc_read(buf, sizeof(buf)); - tud_cdc_write(0, buf, count); + tud_cdc_write(buf, count); } OSAL_SUBTASK_END diff --git a/examples/obsolete/device/src/keyboard_device_app.c b/examples/obsolete/device/src/keyboard_device_app.c index edd3cb388..e1001da96 100644 --- a/examples/obsolete/device/src/keyboard_device_app.c +++ b/examples/obsolete/device/src/keyboard_device_app.c @@ -128,7 +128,7 @@ tusb_error_t keyboard_device_subtask(void) osal_task_delay(50); - if ( tud_mounted(0) && !tud_hid_keyboard_busy(0) ) + if ( tud_mounted() && !tud_hid_keyboard_busy(0) ) { static uint32_t button_mask = 0; uint32_t new_button_mask = board_buttons(); diff --git a/examples/obsolete/device/src/mouse_device_app.c b/examples/obsolete/device/src/mouse_device_app.c index 69c0f46e4..5212d10ce 100644 --- a/examples/obsolete/device/src/mouse_device_app.c +++ b/examples/obsolete/device/src/mouse_device_app.c @@ -114,7 +114,7 @@ void mouse_app_subtask(void) osal_task_delay(20); - if ( tud_mounted(0) && !tud_hid_mouse_is_busy(0) ) + if ( tud_mounted() && !tud_hid_mouse_is_busy(0) ) { static uint8_t prev_mouse_buttons = 0; diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c index b09d1a71e..716e65bc2 100644 --- a/tinyusb/class/hid/hid_device.c +++ b/tinyusb/class/hid/hid_device.c @@ -114,7 +114,7 @@ bool tud_hid_keyboard_busy(uint8_t port) tusb_error_t tud_hid_keyboard_send(uint8_t port, hid_keyboard_report_t const *p_report) { - ASSERT(tud_mounted(port), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED); + ASSERT(tud_mounted(), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED); hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[port]; @@ -137,7 +137,7 @@ bool tud_hid_mouse_is_busy(uint8_t port) tusb_error_t tud_hid_mouse_send(uint8_t port, hid_mouse_report_t const *p_report) { - ASSERT(tud_mounted(port), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED); + ASSERT(tud_mounted(), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED); hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[port];