kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume ints automatically convert to enums 

IAR generates warning Pe188 'enumerated type mixed with another type'.
This commit is contained in:
Ben Avison 2022-09-01 12:34:25 +01:00
parent 65ba15c37d
commit 53f0d5538b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/audio_4_channel_mic/src/main.c
View File

@ -287,7 +287,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *
// Those are dummy values for now // Those are dummy values for now
ret.bNrChannels = 1; ret.bNrChannels = 1;
ret.bmChannelConfig = 0; ret.bmChannelConfig = (audio_channel_config_t) 0;
ret.iChannelNames = 0; ret.iChannelNames = 0;
TU_LOG2(" Get terminal connector\r\n"); TU_LOG2(" Get terminal connector\r\n");

2
examples/device/audio_test/src/main.c
View File

@ -288,7 +288,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *
// Those are dummy values for now // Those are dummy values for now
ret.bNrChannels = 1; ret.bNrChannels = 1;
ret.bmChannelConfig = 0; ret.bmChannelConfig = (audio_channel_config_t) 0;
ret.iChannelNames = 0; ret.iChannelNames = 0;
TU_LOG2(" Get terminal connector\r\n"); TU_LOG2(" Get terminal connector\r\n");

2
src/class/cdc/cdc_host.c
View File

@ -245,7 +245,7 @@ bool cdch_set_config(uint8_t dev_addr, uint8_t itf_num)
bool cdch_xfer_cb(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes) bool cdch_xfer_cb(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)
{ {
(void) ep_addr; (void) ep_addr;
tuh_cdc_xfer_isr( dev_addr, event, 0, xferred_bytes ); tuh_cdc_xfer_isr( dev_addr, event, (cdc_pipeid_t) 0, xferred_bytes );
return true; return true;
} }

6
src/host/usbh.c
View File

@ -449,7 +449,7 @@ void tuh_task_ext(uint32_t timeout_ms, bool in_isr)
{ {
// device 0 only has control endpoint // device 0 only has control endpoint
TU_ASSERT(epnum == 0, ); TU_ASSERT(epnum == 0, );
usbh_control_xfer_cb(event.dev_addr, ep_addr, event.xfer_complete.result, event.xfer_complete.len); usbh_control_xfer_cb(event.dev_addr, ep_addr, (xfer_result_t) event.xfer_complete.result, event.xfer_complete.len);
} }
else else
{ {
@ -461,14 +461,14 @@ void tuh_task_ext(uint32_t timeout_ms, bool in_isr)
if ( 0 == epnum ) if ( 0 == epnum )
{ {
usbh_control_xfer_cb(event.dev_addr, ep_addr, event.xfer_complete.result, event.xfer_complete.len); usbh_control_xfer_cb(event.dev_addr, ep_addr, (xfer_result_t) event.xfer_complete.result, event.xfer_complete.len);
}else }else
{ {
uint8_t drv_id = dev->ep2drv[epnum][ep_dir]; uint8_t drv_id = dev->ep2drv[epnum][ep_dir];
if(drv_id < USBH_CLASS_DRIVER_COUNT) if(drv_id < USBH_CLASS_DRIVER_COUNT)
{ {
TU_LOG2("%s xfer callback\r\n", usbh_class_drivers[drv_id].name); TU_LOG2("%s xfer callback\r\n", usbh_class_drivers[drv_id].name);
usbh_class_drivers[drv_id].xfer_cb(event.dev_addr, ep_addr, event.xfer_complete.result, event.xfer_complete.len); usbh_class_drivers[drv_id].xfer_cb(event.dev_addr, ep_addr, (xfer_result_t) event.xfer_complete.result, event.xfer_complete.len);
} }
else else
{ {

2
src/portable/raspberrypi/rp2040/dcd_rp2040.c
View File

@ -201,7 +201,7 @@ static void __tusb_irq_path_func(hw_handle_buff_status)(void)
usb_hw_clear->buf_status = bit; usb_hw_clear->buf_status = bit;
// IN transfer for even i, OUT transfer for odd i // IN transfer for even i, OUT transfer for odd i
struct hw_endpoint *ep = hw_endpoint_get_by_num(i >> 1u, !(i & 1u)); struct hw_endpoint *ep = hw_endpoint_get_by_num(i >> 1u, !(i & 1u) ? TUSB_DIR_IN : TUSB_DIR_OUT);
// Continue xfer // Continue xfer
bool done = hw_endpoint_xfer_continue(ep); bool done = hw_endpoint_xfer_continue(ep);