hathach 5 лет назад
Родитель
Сommit
d87f2a9691
2 измененных файлов с 0 добавлено и 10 удалено
  1. 0 7
      src/host/usbh.c
  2. 0 3
      src/host/usbh_hcd.h

+ 0 - 7
src/host/usbh.c

@@ -164,9 +164,6 @@ bool tuh_init(void)
     dev->control.sem_hdl = osal_semaphore_create(&dev->control.sem_def);
     TU_ASSERT(dev->control.sem_hdl != NULL);
 
-    dev->control.mutex_hdl = osal_mutex_create(&dev->control.mutex_def);
-    TU_ASSERT(dev->control.mutex_hdl != NULL);
-
     memset(dev->itf2drv, 0xff, sizeof(dev->itf2drv)); // invalid mapping
     memset(dev->ep2drv , 0xff, sizeof(dev->ep2drv )); // invalid mapping
   }
@@ -190,8 +187,6 @@ bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8
   usbh_device_t* dev = &_usbh_devices[dev_addr];
   const uint8_t rhport = dev->rhport;
 
-  TU_ASSERT(osal_mutex_lock(dev->control.mutex_hdl, OSAL_TIMEOUT_NORMAL));
-
   dev->control.request = *request;
   dev->control.pipe_status = 0;
 
@@ -210,8 +205,6 @@ bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8
   hcd_edpt_xfer(rhport, dev_addr, tu_edpt_addr(0, 1-request->bmRequestType_bit.direction), NULL, 0);
   TU_VERIFY(osal_semaphore_wait(dev->control.sem_hdl, OSAL_TIMEOUT_NORMAL));
 
-  osal_mutex_unlock(dev->control.mutex_hdl);
-
   if ( XFER_RESULT_STALLED == dev->control.pipe_status ) return false;
   if ( XFER_RESULT_FAILED == dev->control.pipe_status ) return false;
 

+ 0 - 3
src/host/usbh_hcd.h

@@ -69,9 +69,6 @@ typedef struct {
 
     osal_semaphore_def_t sem_def;
     osal_semaphore_t sem_hdl;  // used to synchronize with HCD when control xfer complete
-
-    osal_mutex_def_t mutex_def;
-    osal_mutex_t mutex_hdl;    // used to exclusively occupy control pipe
   } control;
 
   uint8_t itf2drv[16];  // map interface number to driver (0xff is invalid)