hathach 8 лет назад
Родитель
Сommit
ec28d0d0da
2 измененных файлов с 3 добавлено и 5 удалено
  1. 1 5
      tinyusb/class/msc/msc_device.c
  2. 2 0
      tinyusb/portable/nordic/nrf5x/hal_nrf5x.c

+ 1 - 5
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), );
   }
 }
 

+ 2 - 0
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
   }
 }