From 95baa7845c51673e471d93f53546ba29d123397b Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Sun, 26 Jan 2025 13:10:25 +0800 Subject: [PATCH] chore: fix wformat warning Signed-off-by: sakumisu <1203593632@qq.com> --- class/cdc/usbh_cdc_ncm.c | 4 ++-- class/wireless/usbh_rndis.c | 20 ++++++++++---------- common/usb_log.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/class/cdc/usbh_cdc_ncm.c b/class/cdc/usbh_cdc_ncm.c index b3347695..8bffea7f 100644 --- a/class/cdc/usbh_cdc_ncm.c +++ b/class/cdc/usbh_cdc_ncm.c @@ -62,12 +62,12 @@ static void print_ntb_parameters(struct cdc_ncm_ntb_parameters *param) USB_LOG_RAW("wLength: 0x%02x \r\n", param->wLength); USB_LOG_RAW("bmNtbFormatsSupported: %s \r\n", param->bmNtbFormatsSupported ? "NTB16" : "NTB32"); - USB_LOG_RAW("dwNtbInMaxSize: 0x%04x \r\n", param->dwNtbInMaxSize); + USB_LOG_RAW("dwNtbInMaxSize: 0x%08lx \r\n", param->dwNtbInMaxSize); USB_LOG_RAW("wNdbInDivisor: 0x%02x \r\n", param->wNdbInDivisor); USB_LOG_RAW("wNdbInPayloadRemainder: 0x%02x \r\n", param->wNdbInPayloadRemainder); USB_LOG_RAW("wNdbInAlignment: 0x%02x \r\n", param->wNdbInAlignment); - USB_LOG_RAW("dwNtbOutMaxSize: 0x%04x \r\n", param->dwNtbOutMaxSize); + USB_LOG_RAW("dwNtbOutMaxSize: 0x%08lx \r\n", param->dwNtbOutMaxSize); USB_LOG_RAW("wNdbOutDivisor: 0x%02x \r\n", param->wNdbOutDivisor); USB_LOG_RAW("wNdbOutPayloadRemainder: 0x%02x \r\n", param->wNdbOutPayloadRemainder); USB_LOG_RAW("wNdbOutAlignment: 0x%02x \r\n", param->wNdbOutAlignment); diff --git a/class/wireless/usbh_rndis.c b/class/wireless/usbh_rndis.c index 2c250d9f..17260acd 100644 --- a/class/wireless/usbh_rndis.c +++ b/class/wireless/usbh_rndis.c @@ -90,8 +90,8 @@ static int usbh_rndis_init_msg_transfer(struct usbh_rndis *rndis_class) rndis_class->max_transfer_pkts = resp->MaxPacketsPerTransfer; rndis_class->max_transfer_size = resp->MaxTransferSize; - USB_LOG_INFO("MaxPacketsPerTransfer:%d\r\n", resp->MaxPacketsPerTransfer); - USB_LOG_INFO("MaxTransferSize:%d\r\n", resp->MaxTransferSize); + USB_LOG_INFO("MaxPacketsPerTransfer:%ld\r\n", resp->MaxPacketsPerTransfer); + USB_LOG_INFO("MaxTransferSize:%ld\r\n", resp->MaxTransferSize); return ret; } @@ -278,8 +278,8 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) struct usb_endpoint_descriptor *ep_desc; int ret; uint32_t *oid_support_list; - unsigned int oid = 0; - unsigned int oid_num = 0; + uint32_t oid = 0; + uint32_t oid_num = 0; uint32_t data_len; uint8_t tmp_buffer[512]; uint8_t data[32]; @@ -319,7 +319,7 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) return ret; } oid_num = (data_len / 4); - USB_LOG_INFO("rndis query OID_GEN_SUPPORTED_LIST success,oid num :%d\r\n", oid_num); + USB_LOG_INFO("rndis query OID_GEN_SUPPORTED_LIST success,oid num :%ld\r\n", oid_num); oid_support_list = (uint32_t *)tmp_buffer; @@ -380,10 +380,10 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) } break; default: - USB_LOG_WRN("Ignore rndis query iod:%08x\r\n", oid); + USB_LOG_WRN("Ignore rndis query iod:%08lx\r\n", oid); continue; } - USB_LOG_INFO("rndis query iod:%08x success\r\n", oid); + USB_LOG_INFO("rndis query iod:%08lx success\r\n", oid); } uint32_t packet_filter = 0x0f; @@ -414,7 +414,7 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) usbh_rndis_run(rndis_class); return ret; query_errorout: - USB_LOG_ERR("rndis query iod:%08x error\r\n", oid); + USB_LOG_ERR("rndis query iod:%08lx error\r\n", oid); return ret; } @@ -501,7 +501,7 @@ find_class: uint32_t total_len = g_rndis_rx_length; while (g_rndis_rx_length > 0) { - USB_LOG_DBG("rxlen:%d\r\n", g_rndis_rx_length); + USB_LOG_DBG("rxlen:%ld\r\n", g_rndis_rx_length); pmsg = (rndis_data_packet_t *)(g_rndis_rx_buffer + pmg_offset); @@ -523,7 +523,7 @@ find_class: g_rndis_rx_length = 0; } } else { - USB_LOG_ERR("offset:%d,remain:%d,total:%d\r\n", pmg_offset, g_rndis_rx_length, total_len); + USB_LOG_ERR("offset:%ld,remain:%ld,total:%ld\r\n", pmg_offset, g_rndis_rx_length, total_len); g_rndis_rx_length = 0; USB_LOG_ERR("Error rndis packet message\r\n"); } diff --git a/common/usb_log.h b/common/usb_log.h index 8c798c7c..ed6e7561 100644 --- a/common/usb_log.h +++ b/common/usb_log.h @@ -91,7 +91,7 @@ static inline void usb_hexdump(const void *ptr, uint32_t buflen) (void)buf; for (i = 0; i < buflen; i += 16) { - CONFIG_USB_PRINTF("%08X:", i); + CONFIG_USB_PRINTF("%08lx:", i); for (j = 0; j < 16; j++) if (i + j < buflen) {