diff options
| author | hathach <[email protected]> | 2018-12-13 15:28:04 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-12-13 15:28:04 +0700 |
| commit | 27208ad2fdbd7af5080531eafd9a1a20515cedc1 (patch) | |
| tree | 6869937edf3afe3182665c329343e6a55b99ba59 /src/common | |
| parent | b562fa741b5a8bb47d4e32c0a0f2600b72993b9a (diff) | |
| parent | edf885ca465e16d74833a4866951ca9aa7d4326c (diff) | |
Merge pull request #25 from hathach/devlocal
remove OSAL_TASK_DEF, osal_task_create
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tusb_error.h | 33 | ||||
| -rw-r--r-- | src/common/tusb_fifo.c | 4 |
2 files changed, 2 insertions, 35 deletions
diff --git a/src/common/tusb_error.h b/src/common/tusb_error.h index 677fc44e4..7e67dd0a0 100644 --- a/src/common/tusb_error.h +++ b/src/common/tusb_error.h @@ -57,44 +57,13 @@ ENTRY(TUSB_ERROR_INVALID_PARA )\
ENTRY(TUSB_ERROR_DEVICE_NOT_READY )\
ENTRY(TUSB_ERROR_INTERFACE_IS_BUSY )\
- ENTRY(TUSB_ERROR_HCD_FAILED )\
ENTRY(TUSB_ERROR_HCD_OPEN_PIPE_FAILED )\
- ENTRY(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND )\
- ENTRY(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG )\
- ENTRY(TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED )\
- ENTRY(TUSB_ERROR_USBH_XFER_STALLED )\
- ENTRY(TUSB_ERROR_USBH_XFER_FAILED )\
ENTRY(TUSB_ERROR_OSAL_TIMEOUT )\
- ENTRY(TUSB_ERROR_OSAL_WAITING ) /* only used by OSAL_NONE in the subtask */ \
- ENTRY(TUSB_ERROR_OSAL_TASK_FAILED )\
- ENTRY(TUSB_ERROR_OSAL_QUEUE_FAILED )\
- ENTRY(TUSB_ERROR_OSAL_SEMAPHORE_FAILED )\
- ENTRY(TUSB_ERROR_OSAL_MUTEX_FAILED )\
- ENTRY(TUSB_ERROR_EHCI_NOT_ENOUGH_QTD )\
- ENTRY(TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE )\
- ENTRY(TUSB_ERROR_HIDH_NOT_SUPPORTED_PROTOCOL )\
- ENTRY(TUSB_ERROR_HIDH_NOT_SUPPORTED_SUBCLASS )\
- ENTRY(TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS )\
- ENTRY(TUSB_ERROR_CDC_UNSUPPORTED_PROTOCOL )\
ENTRY(TUSB_ERROR_CDCH_DEVICE_NOT_MOUNTED )\
- ENTRY(TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL )\
- ENTRY(TUSB_ERROR_MSCH_UNKNOWN_SCSI_COMMAND )\
ENTRY(TUSB_ERROR_MSCH_DEVICE_NOT_MOUNTED )\
- ENTRY(TUSB_ERROR_HUB_FEATURE_NOT_SUPPORTED )\
- ENTRY(TUSB_ERROR_DESCRIPTOR_CORRUPTED )\
- ENTRY(TUSB_ERROR_DCD_FAILED )\
- ENTRY(TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT )\
- ENTRY(TUSB_ERROR_DCD_NOT_ENOUGH_QTD )\
- ENTRY(TUSB_ERROR_DCD_OPEN_PIPE_FAILED )\
- ENTRY(TUSB_ERROR_DCD_EDPT_XFER )\
- ENTRY(TUSB_ERROR_NOT_SUPPORTED_YET )\
- ENTRY(TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED )\
+ ENTRY(TUSB_ERROR_NOT_SUPPORTED )\
ENTRY(TUSB_ERROR_NOT_ENOUGH_MEMORY )\
ENTRY(TUSB_ERROR_FAILED )\
- \
- ENTRY(ERR_TUD_INVALID_DESCRIPTOR) \
- ENTRY(ERR_TUD_EDPT_OPEN_FAILED) \
-
/// \brief Error Code returned
typedef enum
diff --git a/src/common/tusb_fifo.c b/src/common/tusb_fifo.c index 2acd4b696..8902f5a4e 100644 --- a/src/common/tusb_fifo.c +++ b/src/common/tusb_fifo.c @@ -48,9 +48,7 @@ static void tu_fifo_lock(tu_fifo_t *f) {
if (f->mutex)
{
- uint32_t err;
- (void) err;
- osal_mutex_lock(f->mutex, OSAL_TIMEOUT_WAIT_FOREVER, &err);
+ osal_mutex_lock(f->mutex, OSAL_TIMEOUT_WAIT_FOREVER);
}
}
|