Skip to content

Commit a8be575

Browse files
committed
fix build warning with clang
1 parent 3ce037d commit a8be575

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

examples/device/cdc_msc_freertos/src/msc_disk.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,11 @@ int32_t tud_msc_write10_cb(uint8_t lun, uint32_t lba, uint32_t offset, uint8_t*
299299
return TUD_MSC_RET_ERROR;
300300
}
301301

302-
#ifdef CFG_EXAMPLE_MSC_READONLY
302+
#ifdef CFG_EXAMPLE_MSC_READONLY
303303
(void) lun;
304304
(void) buffer;
305305
return bufsize;
306-
#endif
307-
308-
#if CFG_EXAMPLE_MSC_ASYNC_IO
306+
#elif CFG_EXAMPLE_MSC_ASYNC_IO
309307
io_ops_t io_ops = {.is_read = false, .lun = lun, .lba = lba, .offset = offset, .buffer = buffer, .bufsize = bufsize};
310308

311309
// Send IO operation to IO task
@@ -318,7 +316,7 @@ int32_t tud_msc_write10_cb(uint8_t lun, uint32_t lba, uint32_t offset, uint8_t*
318316
tusb_time_delay_ms_api(CFG_EXAMPLE_MSC_IO_DELAY_MS);
319317

320318
return bufsize;
321-
#endif
319+
#endif
322320
}
323321

324322
// Callback invoked when received an SCSI command not in built-in list below

examples/dual/host_info_to_device_cdc/src/main.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,7 @@ static void print_device_info(uint8_t daddr, const tusb_desc_device_t* desc_devi
218218
cdc_printf("\r\n");
219219

220220
cdc_printf(" iSerialNumber %u " , desc_device->iSerialNumber);
221-
cdc_printf((char*)serial); // serial is already to UTF-8
222-
cdc_printf("\r\n");
223-
221+
cdc_printf("%s \r\n", (char*)serial); // serial is already to UTF-8
224222
cdc_printf(" bNumConfigurations %u\r\n" , desc_device->bNumConfigurations);
225223
}
226224

@@ -310,5 +308,5 @@ static void print_utf16(uint16_t *temp_buf, size_t buf_len) {
310308
_convert_utf16le_to_utf8(temp_buf + 1, utf16_len, (uint8_t *) temp_buf, sizeof(uint16_t) * buf_len);
311309
((uint8_t*) temp_buf)[utf8_len] = '\0';
312310

313-
cdc_printf((char*) temp_buf);
311+
cdc_printf("%s", (char*) temp_buf);
314312
}

hw/bsp/imxrt/family.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ TU_ATTR_UNUSED void _start(void) {
249249

250250
#ifdef __clang__
251251
void _exit(int __status) {
252+
(void) __status;
252253
while (1) {}
253254
}
254255
#endif

hw/bsp/stm32h7/boards/stm32h743eval/board.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,18 @@ static int32_t i2c_writereg(uint16_t DevAddr, uint16_t Reg, uint8_t *pData, uint
214214
return 0;
215215
}
216216

217+
static int32_t i2c_get_tick(void) {
218+
return (int32_t) HAL_GetTick();
219+
}
220+
217221
static inline void board_init2(void) {
218222
// IO control via MFX
219223
MFXSTM32L152_IO_t io_ctx;
220224
io_ctx.Init = board_i2c_init;
221225
io_ctx.DeInit = board_i2c_deinit;
222226
io_ctx.ReadReg = i2c_readreg;
223227
io_ctx.WriteReg = i2c_writereg;
224-
io_ctx.GetTick = (MFXSTM32L152_GetTick_Func) HAL_GetTick;
228+
io_ctx.GetTick = i2c_get_tick;
225229

226230
uint16_t i2c_addr[] = { 0x84, 0x86 };
227231
for(uint8_t i = 0U; i < 2U; i++) {

0 commit comments

Comments
 (0)