Skip to content

Commit 95baa78

Browse files
committed
chore: fix wformat warning
Signed-off-by: sakumisu <1203593632@qq.com>
1 parent c827c2e commit 95baa78

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

class/cdc/usbh_cdc_ncm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ static void print_ntb_parameters(struct cdc_ncm_ntb_parameters *param)
6262
USB_LOG_RAW("wLength: 0x%02x \r\n", param->wLength);
6363
USB_LOG_RAW("bmNtbFormatsSupported: %s \r\n", param->bmNtbFormatsSupported ? "NTB16" : "NTB32");
6464

65-
USB_LOG_RAW("dwNtbInMaxSize: 0x%04x \r\n", param->dwNtbInMaxSize);
65+
USB_LOG_RAW("dwNtbInMaxSize: 0x%08lx \r\n", param->dwNtbInMaxSize);
6666
USB_LOG_RAW("wNdbInDivisor: 0x%02x \r\n", param->wNdbInDivisor);
6767
USB_LOG_RAW("wNdbInPayloadRemainder: 0x%02x \r\n", param->wNdbInPayloadRemainder);
6868
USB_LOG_RAW("wNdbInAlignment: 0x%02x \r\n", param->wNdbInAlignment);
6969

70-
USB_LOG_RAW("dwNtbOutMaxSize: 0x%04x \r\n", param->dwNtbOutMaxSize);
70+
USB_LOG_RAW("dwNtbOutMaxSize: 0x%08lx \r\n", param->dwNtbOutMaxSize);
7171
USB_LOG_RAW("wNdbOutDivisor: 0x%02x \r\n", param->wNdbOutDivisor);
7272
USB_LOG_RAW("wNdbOutPayloadRemainder: 0x%02x \r\n", param->wNdbOutPayloadRemainder);
7373
USB_LOG_RAW("wNdbOutAlignment: 0x%02x \r\n", param->wNdbOutAlignment);

class/wireless/usbh_rndis.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ static int usbh_rndis_init_msg_transfer(struct usbh_rndis *rndis_class)
9090

9191
rndis_class->max_transfer_pkts = resp->MaxPacketsPerTransfer;
9292
rndis_class->max_transfer_size = resp->MaxTransferSize;
93-
USB_LOG_INFO("MaxPacketsPerTransfer:%d\r\n", resp->MaxPacketsPerTransfer);
94-
USB_LOG_INFO("MaxTransferSize:%d\r\n", resp->MaxTransferSize);
93+
USB_LOG_INFO("MaxPacketsPerTransfer:%ld\r\n", resp->MaxPacketsPerTransfer);
94+
USB_LOG_INFO("MaxTransferSize:%ld\r\n", resp->MaxTransferSize);
9595

9696
return ret;
9797
}
@@ -278,8 +278,8 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf)
278278
struct usb_endpoint_descriptor *ep_desc;
279279
int ret;
280280
uint32_t *oid_support_list;
281-
unsigned int oid = 0;
282-
unsigned int oid_num = 0;
281+
uint32_t oid = 0;
282+
uint32_t oid_num = 0;
283283
uint32_t data_len;
284284
uint8_t tmp_buffer[512];
285285
uint8_t data[32];
@@ -319,7 +319,7 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf)
319319
return ret;
320320
}
321321
oid_num = (data_len / 4);
322-
USB_LOG_INFO("rndis query OID_GEN_SUPPORTED_LIST success,oid num :%d\r\n", oid_num);
322+
USB_LOG_INFO("rndis query OID_GEN_SUPPORTED_LIST success,oid num :%ld\r\n", oid_num);
323323

324324
oid_support_list = (uint32_t *)tmp_buffer;
325325

@@ -380,10 +380,10 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf)
380380
}
381381
break;
382382
default:
383-
USB_LOG_WRN("Ignore rndis query iod:%08x\r\n", oid);
383+
USB_LOG_WRN("Ignore rndis query iod:%08lx\r\n", oid);
384384
continue;
385385
}
386-
USB_LOG_INFO("rndis query iod:%08x success\r\n", oid);
386+
USB_LOG_INFO("rndis query iod:%08lx success\r\n", oid);
387387
}
388388

389389
uint32_t packet_filter = 0x0f;
@@ -414,7 +414,7 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf)
414414
usbh_rndis_run(rndis_class);
415415
return ret;
416416
query_errorout:
417-
USB_LOG_ERR("rndis query iod:%08x error\r\n", oid);
417+
USB_LOG_ERR("rndis query iod:%08lx error\r\n", oid);
418418
return ret;
419419
}
420420

@@ -501,7 +501,7 @@ void usbh_rndis_rx_thread(CONFIG_USB_OSAL_THREAD_SET_ARGV)
501501
uint32_t total_len = g_rndis_rx_length;
502502

503503
while (g_rndis_rx_length > 0) {
504-
USB_LOG_DBG("rxlen:%d\r\n", g_rndis_rx_length);
504+
USB_LOG_DBG("rxlen:%ld\r\n", g_rndis_rx_length);
505505

506506
pmsg = (rndis_data_packet_t *)(g_rndis_rx_buffer + pmg_offset);
507507

@@ -523,7 +523,7 @@ void usbh_rndis_rx_thread(CONFIG_USB_OSAL_THREAD_SET_ARGV)
523523
g_rndis_rx_length = 0;
524524
}
525525
} else {
526-
USB_LOG_ERR("offset:%d,remain:%d,total:%d\r\n", pmg_offset, g_rndis_rx_length, total_len);
526+
USB_LOG_ERR("offset:%ld,remain:%ld,total:%ld\r\n", pmg_offset, g_rndis_rx_length, total_len);
527527
g_rndis_rx_length = 0;
528528
USB_LOG_ERR("Error rndis packet message\r\n");
529529
}

common/usb_log.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static inline void usb_hexdump(const void *ptr, uint32_t buflen)
9191
(void)buf;
9292

9393
for (i = 0; i < buflen; i += 16) {
94-
CONFIG_USB_PRINTF("%08X:", i);
94+
CONFIG_USB_PRINTF("%08lx:", i);
9595

9696
for (j = 0; j < 16; j++)
9797
if (i + j < buflen) {

0 commit comments

Comments
 (0)