diff options
| author | hathach <[email protected]> | 2018-04-20 13:42:06 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-20 13:42:06 +0700 |
| commit | ec28d0d0da2ca5426ac267fccfa2e13870cdc4c9 (patch) | |
| tree | aa95f1736fd46a3eeff52c26d9d3f81487b5d725 | |
| parent | ba223b2a05d88901f3255a218329b7ff4c7d6128 (diff) | |
clean up warnings
| -rw-r--r-- | tinyusb/class/msc/msc_device.c | 6 | ||||
| -rw-r--r-- | tinyusb/portable/nordic/nrf5x/hal_nrf5x.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index 8b0929fb2..8d9a4be63 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -138,12 +138,8 @@ tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t cons {
OSAL_SUBTASK_BEGIN
- tusb_error_t err;
-
TU_ASSERT(p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS, TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT);
- mscd_interface_t * p_msc = &_mscd_itf;
-
if(MSC_REQUEST_RESET == p_request->bRequest)
{
dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
@@ -341,7 +337,7 @@ static void proc_read10_write10(uint8_t rhport, mscd_interface_t* p_msc) dcd_edpt_stall(rhport, ep_data);
}else
{
- TU_ASSERT( dcd_edpt_xfer(rhport, ep_data, _mscd_buf, xfer_bytes) );
+ TU_ASSERT( dcd_edpt_xfer(rhport, ep_data, _mscd_buf, xfer_bytes), );
}
}
diff --git a/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c b/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c index 6f5317074..3e46a79d4 100644 --- a/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c +++ b/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c @@ -114,6 +114,8 @@ bool tusb_hal_init(void) .handler = (nrf_drv_power_usb_event_handler_t) power_usb_event_handler }; return ( NRF_SUCCESS == nrf_drv_power_usbevt_init(&config) ); +#else + return true; #endif } } |
