andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename ASSERT_ERR to TU_ASSERT_ERR to prevent conflict with user code

Browse Source
This commit is contained in:
hathach
2018-04-12 17:55:15 +07:00
parent 6d8f4bca47
commit 752a9f45d7
12 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tinyusb/host/usbh.c
View File

@@ -144,7 +144,7 @@ tusb_error_t usbh_init(void)
{
memclr_(usbh_devices, sizeof(usbh_device_info_t)*(CFG_TUSB_HOST_DEVICE_MAX+1));
ASSERT_ERR( hcd_init() );
TU_ASSERT_ERR( hcd_init() );
//------------- Enumeration & Reporter Task init -------------//
enum_queue_hdl = osal_queue_create( ENUM_QUEUE_DEPTH, sizeof(uint32_t) );
@@ -223,7 +223,7 @@ tusb_error_t usbh_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
osal_semaphore_reset( usbh_devices[dev_addr].control.sem_hdl );
osal_mutex_reset( usbh_devices[dev_addr].control.mutex_hdl );
ASSERT_ERR( hcd_pipe_control_open(dev_addr, max_packet_size) );
TU_ASSERT_ERR( hcd_pipe_control_open(dev_addr, max_packet_size) );
return TUSB_ERROR_NONE;
}
@@ -231,7 +231,7 @@ tusb_error_t usbh_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
static inline tusb_error_t usbh_pipe_control_close(uint8_t dev_addr) ATTR_ALWAYS_INLINE;
static inline tusb_error_t usbh_pipe_control_close(uint8_t dev_addr)
{
ASSERT_ERR( hcd_pipe_control_close(dev_addr) );
TU_ASSERT_ERR( hcd_pipe_control_close(dev_addr) );
return TUSB_ERROR_NONE;
}