Skip to content

Commit 53f0d55

Browse files
author
Ben Avison
committed
Don't assume ints automatically convert to enums
IAR generates warning Pe188 'enumerated type mixed with another type'.
1 parent 65ba15c commit 53f0d55

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

examples/device/audio_4_channel_mic/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *
287287

288288
// Those are dummy values for now
289289
ret.bNrChannels = 1;
290-
ret.bmChannelConfig = 0;
290+
ret.bmChannelConfig = (audio_channel_config_t) 0;
291291
ret.iChannelNames = 0;
292292

293293
TU_LOG2(" Get terminal connector\r\n");

examples/device/audio_test/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ bool tud_audio_get_req_entity_cb(uint8_t rhport, tusb_control_request_t const *
288288

289289
// Those are dummy values for now
290290
ret.bNrChannels = 1;
291-
ret.bmChannelConfig = 0;
291+
ret.bmChannelConfig = (audio_channel_config_t) 0;
292292
ret.iChannelNames = 0;
293293

294294
TU_LOG2(" Get terminal connector\r\n");

src/class/cdc/cdc_host.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ bool cdch_set_config(uint8_t dev_addr, uint8_t itf_num)
245245
bool cdch_xfer_cb(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)
246246
{
247247
(void) ep_addr;
248-
tuh_cdc_xfer_isr( dev_addr, event, 0, xferred_bytes );
248+
tuh_cdc_xfer_isr( dev_addr, event, (cdc_pipeid_t) 0, xferred_bytes );
249249
return true;
250250
}
251251

src/host/usbh.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ void tuh_task_ext(uint32_t timeout_ms, bool in_isr)
449449
{
450450
// device 0 only has control endpoint
451451
TU_ASSERT(epnum == 0, );
452-
usbh_control_xfer_cb(event.dev_addr, ep_addr, event.xfer_complete.result, event.xfer_complete.len);
452+
usbh_control_xfer_cb(event.dev_addr, ep_addr, (xfer_result_t) event.xfer_complete.result, event.xfer_complete.len);
453453
}
454454
else
455455
{
@@ -461,14 +461,14 @@ void tuh_task_ext(uint32_t timeout_ms, bool in_isr)
461461

462462
if ( 0 == epnum )
463463
{
464-
usbh_control_xfer_cb(event.dev_addr, ep_addr, event.xfer_complete.result, event.xfer_complete.len);
464+
usbh_control_xfer_cb(event.dev_addr, ep_addr, (xfer_result_t) event.xfer_complete.result, event.xfer_complete.len);
465465
}else
466466
{
467467
uint8_t drv_id = dev->ep2drv[epnum][ep_dir];
468468
if(drv_id < USBH_CLASS_DRIVER_COUNT)
469469
{
470470
TU_LOG2("%s xfer callback\r\n", usbh_class_drivers[drv_id].name);
471-
usbh_class_drivers[drv_id].xfer_cb(event.dev_addr, ep_addr, event.xfer_complete.result, event.xfer_complete.len);
471+
usbh_class_drivers[drv_id].xfer_cb(event.dev_addr, ep_addr, (xfer_result_t) event.xfer_complete.result, event.xfer_complete.len);
472472
}
473473
else
474474
{

src/portable/raspberrypi/rp2040/dcd_rp2040.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static void __tusb_irq_path_func(hw_handle_buff_status)(void)
201201
usb_hw_clear->buf_status = bit;
202202

203203
// IN transfer for even i, OUT transfer for odd i
204-
struct hw_endpoint *ep = hw_endpoint_get_by_num(i >> 1u, !(i & 1u));
204+
struct hw_endpoint *ep = hw_endpoint_get_by_num(i >> 1u, !(i & 1u) ? TUSB_DIR_IN : TUSB_DIR_OUT);
205205

206206
// Continue xfer
207207
bool done = hw_endpoint_xfer_continue(ep);

0 commit comments

Comments
 (0)