From 604275341ecbb830e852a3522d7957ad66828dee Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Mar 2018 13:38:17 +0700 Subject: repo cleanup --- tinyusb/class/hid/hid_host.c | 6 +++--- tinyusb/class/msc/msc_device.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tinyusb/class') diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c index 3c32d120a..0d57a5577 100644 --- a/tinyusb/class/hid/hid_host.c +++ b/tinyusb/class/hid/hid_host.c @@ -76,9 +76,9 @@ tusb_error_t hidh_interface_get_report(uint8_t dev_addr, void * report, hidh_int { //------------- parameters validation -------------// // TODO change to use is configured function - ASSERT_INT (TUSB_DEVICE_STATE_CONFIGURED, tuh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY); - ASSERT_PTR (report, TUSB_ERROR_INVALID_PARA); - ASSERT_FALSE(hcd_pipe_is_busy(p_hid->pipe_hdl), TUSB_ERROR_INTERFACE_IS_BUSY); + ASSERT_INT (TUSB_DEVICE_STATE_CONFIGURED, tuh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY); + ASSERT_PTR (report, TUSB_ERROR_INVALID_PARA); + TU_ASSSERT (!hcd_pipe_is_busy(p_hid->pipe_hdl), TUSB_ERROR_INTERFACE_IS_BUSY); ASSERT_STATUS( hcd_pipe_xfer(p_hid->pipe_hdl, report, p_hid->report_size, true) ) ; diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index d01d39f55..cb1921090 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -203,7 +203,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u void const *p_buffer = NULL; // TODO SCSI data out transfer is not yet supported - ASSERT_FALSE( p_cbw->xfer_bytes > 0 && !BIT_TEST_(p_cbw->dir, 7), TUSB_ERROR_NOT_SUPPORTED_YET); + TU_ASSERT( !(p_cbw->xfer_bytes > 0 && !BIT_TEST_(p_cbw->dir, 7)), TUSB_ERROR_NOT_SUPPORTED_YET); p_csw->status = tud_msc_scsi_cb(rhport, p_cbw->lun, p_cbw->command, &p_buffer, &p_msc->data_len); -- cgit v1.3.1