From 605a967282e506ea3acccfe20a0edaf2ce8caebc Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Wed, 16 Jul 2025 22:17:19 +0800 Subject: [PATCH] style: remove some logs Signed-off-by: sakumisu <1203593632@qq.com> --- class/hub/usbh_hub.c | 36 ++++++++--------- class/msc/usbd_msc.c | 80 ++++--------------------------------- class/wireless/usbh_rndis.c | 19 ++++----- core/usbd_core.c | 6 --- 4 files changed, 32 insertions(+), 109 deletions(-) diff --git a/class/hub/usbh_hub.c b/class/hub/usbh_hub.c index b82efa92..9e2f99c1 100644 --- a/class/hub/usbh_hub.c +++ b/class/hub/usbh_hub.c @@ -179,15 +179,15 @@ static int parse_hub_descriptor(struct usb_hub_descriptor *desc, uint16_t length USB_LOG_ERR("unexpected descriptor 0x%02x\r\n", desc->bDescriptorType); return -2; } else { - USB_LOG_RAW("Hub Descriptor:\r\n"); - USB_LOG_RAW("bLength: 0x%02x \r\n", desc->bLength); - USB_LOG_RAW("bDescriptorType: 0x%02x \r\n", desc->bDescriptorType); - USB_LOG_RAW("bNbrPorts: 0x%02x \r\n", desc->bNbrPorts); - USB_LOG_RAW("wHubCharacteristics: 0x%04x \r\n", desc->wHubCharacteristics); - USB_LOG_RAW("bPwrOn2PwrGood: 0x%02x \r\n", desc->bPwrOn2PwrGood); - USB_LOG_RAW("bHubContrCurrent: 0x%02x \r\n", desc->bHubContrCurrent); - USB_LOG_RAW("DeviceRemovable: 0x%02x \r\n", desc->DeviceRemovable); - USB_LOG_RAW("PortPwrCtrlMask: 0x%02x \r\n", desc->PortPwrCtrlMask); + USB_LOG_DBG("Hub Descriptor:\r\n"); + USB_LOG_DBG("bLength: 0x%02x \r\n", desc->bLength); + USB_LOG_DBG("bDescriptorType: 0x%02x \r\n", desc->bDescriptorType); + USB_LOG_DBG("bNbrPorts: 0x%02x \r\n", desc->bNbrPorts); + USB_LOG_DBG("wHubCharacteristics: 0x%04x \r\n", desc->wHubCharacteristics); + USB_LOG_DBG("bPwrOn2PwrGood: 0x%02x \r\n", desc->bPwrOn2PwrGood); + USB_LOG_DBG("bHubContrCurrent: 0x%02x \r\n", desc->bHubContrCurrent); + USB_LOG_DBG("DeviceRemovable: 0x%02x \r\n", desc->DeviceRemovable); + USB_LOG_DBG("PortPwrCtrlMask: 0x%02x \r\n", desc->PortPwrCtrlMask); } return 0; } @@ -203,14 +203,14 @@ static int parse_hub_ss_descriptor(struct usb_hub_ss_descriptor *desc, uint16_t USB_LOG_ERR("unexpected descriptor 0x%02x\r\n", desc->bDescriptorType); return -2; } else { - USB_LOG_RAW("SuperSpeed Hub Descriptor:\r\n"); - USB_LOG_RAW("bLength: 0x%02x \r\n", desc->bLength); - USB_LOG_RAW("bDescriptorType: 0x%02x \r\n", desc->bDescriptorType); - USB_LOG_RAW("bNbrPorts: 0x%02x \r\n", desc->bNbrPorts); - USB_LOG_RAW("wHubCharacteristics: 0x%04x \r\n", desc->wHubCharacteristics); - USB_LOG_RAW("bPwrOn2PwrGood: 0x%02x \r\n", desc->bPwrOn2PwrGood); - USB_LOG_RAW("bHubContrCurrent: 0x%02x \r\n", desc->bHubContrCurrent); - USB_LOG_RAW("DeviceRemovable: 0x%02x \r\n", desc->DeviceRemovable); + USB_LOG_DBG("SuperSpeed Hub Descriptor:\r\n"); + USB_LOG_DBG("bLength: 0x%02x \r\n", desc->bLength); + USB_LOG_DBG("bDescriptorType: 0x%02x \r\n", desc->bDescriptorType); + USB_LOG_DBG("bNbrPorts: 0x%02x \r\n", desc->bNbrPorts); + USB_LOG_DBG("wHubCharacteristics: 0x%04x \r\n", desc->wHubCharacteristics); + USB_LOG_DBG("bPwrOn2PwrGood: 0x%02x \r\n", desc->bPwrOn2PwrGood); + USB_LOG_DBG("bHubContrCurrent: 0x%02x \r\n", desc->bHubContrCurrent); + USB_LOG_DBG("DeviceRemovable: 0x%02x \r\n", desc->DeviceRemovable); } return 0; } @@ -403,7 +403,7 @@ static int usbh_hub_connect(struct usbh_hubport *hport, uint8_t intf) for (uint8_t port = 0; port < hub->nports; port++) { ret = usbh_hub_get_portstatus(hub, port + 1, &port_status); - USB_LOG_INFO("port %u, status:0x%02x, change:0x%02x\r\n", port + 1, port_status.wPortStatus, port_status.wPortChange); + USB_LOG_DBG("port %u, status:0x%02x, change:0x%02x\r\n", port + 1, port_status.wPortStatus, port_status.wPortChange); if (ret < 0) { return ret; } diff --git a/class/msc/usbd_msc.c b/class/msc/usbd_msc.c index 4a7b7524..af0a685b 100644 --- a/class/msc/usbd_msc.c +++ b/class/msc/usbd_msc.c @@ -7,9 +7,10 @@ #include "usbd_core.h" #include "usbd_msc.h" #include "usb_scsi.h" -#if defined(CONFIG_USBDEV_MSC_THREAD) -#include "usb_osal.h" -#endif + +#undef USB_DBG_TAG +#define USB_DBG_TAG "usbd_msc" +#include "usb_log.h" #define MSD_OUT_EP_IDX 0 #define MSD_IN_EP_IDX 1 @@ -516,19 +517,14 @@ static bool SCSI_read10(uint8_t busid, uint8_t **data, uint32_t *len) } g_usbd_msc[busid].start_sector = GET_BE32(&g_usbd_msc[busid].cbw.CB[2]); /* Logical Block Address of First Block */ - USB_LOG_DBG("lba: 0x%04x\r\n", g_usbd_msc[busid].start_sector); - g_usbd_msc[busid].nsectors = GET_BE16(&g_usbd_msc[busid].cbw.CB[7]); /* Number of Blocks to transfer */ - USB_LOG_DBG("nsectors: 0x%02x\r\n", g_usbd_msc[busid].nsectors); if ((g_usbd_msc[busid].start_sector + g_usbd_msc[busid].nsectors) > g_usbd_msc[busid].scsi_blk_nbr[g_usbd_msc[busid].cbw.bLUN]) { SCSI_SetSenseData(busid, SCSI_KCQIR_LBAOUTOFRANGE); - USB_LOG_ERR("LBA out of range\r\n"); return false; } if (g_usbd_msc[busid].cbw.dDataLength != (g_usbd_msc[busid].nsectors * g_usbd_msc[busid].scsi_blk_size[g_usbd_msc[busid].cbw.bLUN])) { - USB_LOG_ERR("scsi_blk_len does not match with dDataLength\r\n"); return false; } g_usbd_msc[busid].stage = MSC_DATA_IN; @@ -554,19 +550,14 @@ static bool SCSI_read12(uint8_t busid, uint8_t **data, uint32_t *len) } g_usbd_msc[busid].start_sector = GET_BE32(&g_usbd_msc[busid].cbw.CB[2]); /* Logical Block Address of First Block */ - USB_LOG_DBG("lba: 0x%04x\r\n", g_usbd_msc[busid].start_sector); - g_usbd_msc[busid].nsectors = GET_BE32(&g_usbd_msc[busid].cbw.CB[6]); /* Number of Blocks to transfer */ - USB_LOG_DBG("nsectors: 0x%02x\r\n", g_usbd_msc[busid].nsectors); if ((g_usbd_msc[busid].start_sector + g_usbd_msc[busid].nsectors) > g_usbd_msc[busid].scsi_blk_nbr[g_usbd_msc[busid].cbw.bLUN]) { SCSI_SetSenseData(busid, SCSI_KCQIR_LBAOUTOFRANGE); - USB_LOG_ERR("LBA out of range\r\n"); return false; } if (g_usbd_msc[busid].cbw.dDataLength != (g_usbd_msc[busid].nsectors * g_usbd_msc[busid].scsi_blk_size[g_usbd_msc[busid].cbw.bLUN])) { - USB_LOG_ERR("scsi_blk_len does not match with dDataLength\r\n"); return false; } g_usbd_msc[busid].stage = MSC_DATA_IN; @@ -594,14 +585,10 @@ static bool SCSI_write10(uint8_t busid, uint8_t **data, uint32_t *len) } g_usbd_msc[busid].start_sector = GET_BE32(&g_usbd_msc[busid].cbw.CB[2]); /* Logical Block Address of First Block */ - USB_LOG_DBG("lba: 0x%04x\r\n", g_usbd_msc[busid].start_sector); - g_usbd_msc[busid].nsectors = GET_BE16(&g_usbd_msc[busid].cbw.CB[7]); /* Number of Blocks to transfer */ - USB_LOG_DBG("nsectors: 0x%02x\r\n", g_usbd_msc[busid].nsectors); data_len = g_usbd_msc[busid].nsectors * g_usbd_msc[busid].scsi_blk_size[g_usbd_msc[busid].cbw.bLUN]; if ((g_usbd_msc[busid].start_sector + g_usbd_msc[busid].nsectors) > g_usbd_msc[busid].scsi_blk_nbr[g_usbd_msc[busid].cbw.bLUN]) { - USB_LOG_ERR("LBA out of range\r\n"); return false; } @@ -627,14 +614,10 @@ static bool SCSI_write12(uint8_t busid, uint8_t **data, uint32_t *len) } g_usbd_msc[busid].start_sector = GET_BE32(&g_usbd_msc[busid].cbw.CB[2]); /* Logical Block Address of First Block */ - USB_LOG_DBG("lba: 0x%04x\r\n", g_usbd_msc[busid].start_sector); - g_usbd_msc[busid].nsectors = GET_BE32(&g_usbd_msc[busid].cbw.CB[6]); /* Number of Blocks to transfer */ - USB_LOG_DBG("nsectors: 0x%02x\r\n", g_usbd_msc[busid].nsectors); data_len = g_usbd_msc[busid].nsectors * g_usbd_msc[busid].scsi_blk_size[g_usbd_msc[busid].cbw.bLUN]; if ((g_usbd_msc[busid].start_sector + g_usbd_msc[busid].nsectors) > g_usbd_msc[busid].scsi_blk_nbr[g_usbd_msc[busid].cbw.bLUN]) { - USB_LOG_ERR("LBA out of range\r\n"); return false; } @@ -646,52 +629,6 @@ static bool SCSI_write12(uint8_t busid, uint8_t **data, uint32_t *len) usbd_ep_start_read(busid, mass_ep_data[busid][MSD_OUT_EP_IDX].ep_addr, g_usbd_msc[busid].block_buffer, data_len); return true; } -/* do not use verify to reduce code size */ -#if 0 -static bool SCSI_verify10(uint8_t busid, uint8_t **data, uint32_t *len) -{ - /* Logical Block Address of First Block */ - uint32_t lba = 0; - uint32_t blk_num = 0; - - if ((g_usbd_msc[busid].cbw.CB[1] & 0x02U) == 0x00U) { - return true; - } - - if (((g_usbd_msc[busid].cbw.bmFlags & 0x80U) != 0x00U) || (g_usbd_msc[busid].cbw.dDataLength == 0U)) { - SCSI_SetSenseData(busid, SCSI_KCQIR_INVALIDCOMMAND); - return false; - } - - if ((g_usbd_msc[busid].cbw.CB[1] & 0x02U) == 0x02U) { - SCSI_SetSenseData(busid, SCSI_KCQIR_INVALIDFIELDINCBA); - return false; /* Error, Verify Mode Not supported*/ - } - - lba = GET_BE32(&g_usbd_msc[busid].cbw.CB[2]); - USB_LOG_DBG("lba: 0x%x\r\n", lba); - - g_usbd_msc[busid].scsi_blk_addr = lba * g_usbd_msc[busid].scsi_blk_size[g_usbd_msc[busid].cbw.bLUN]; - - /* Number of Blocks to transfer */ - blk_num = GET_BE16(&g_usbd_msc[busid].cbw.CB[7]); - - USB_LOG_DBG("num (block) : 0x%x\r\n", blk_num); - g_usbd_msc[busid].scsi_blk_len = blk_num * g_usbd_msc[busid].scsi_blk_size[g_usbd_msc[busid].cbw.bLUN]; - - if ((lba + blk_num) > g_usbd_msc[busid].scsi_blk_nbr[g_usbd_msc[busid].cbw.bLUN]) { - USB_LOG_ERR("LBA out of range\r\n"); - return false; - } - - if (g_usbd_msc[busid].cbw.dDataLength != g_usbd_msc[busid].scsi_blk_len) { - return false; - } - - g_usbd_msc[busid].stage = MSC_DATA_OUT; - return true; -} -#endif static bool SCSI_processRead(uint8_t busid) { @@ -722,6 +659,7 @@ static bool SCSI_processRead(uint8_t busid) static bool SCSI_processWrite(uint8_t busid, uint32_t nbytes) { uint32_t data_len = 0; + USB_LOG_DBG("write lba:%d\r\n", g_usbd_msc[busid].start_sector); if (usbd_msc_sector_write(busid, g_usbd_msc[busid].cbw.bLUN, g_usbd_msc[busid].start_sector, g_usbd_msc[busid].block_buffer, nbytes) != 0) { @@ -804,7 +742,6 @@ static bool SCSI_CBWDecode(uint8_t busid, uint32_t nbytes) ret = SCSI_write12(busid, NULL, 0); break; case SCSI_CMD_VERIFY10: - //ret = SCSI_verify10(NULL, 0); ret = false; break; case SCSI_CMD_SYNCHCACHE10: @@ -812,7 +749,6 @@ static bool SCSI_CBWDecode(uint8_t busid, uint32_t nbytes) break; default: SCSI_SetSenseData(busid, SCSI_KCQIR_INVALIDCOMMAND); - USB_LOG_WRN("unsupported cmd:0x%02x\r\n", g_usbd_msc[busid].cbw.CB[0]); ret = false; break; } @@ -820,7 +756,7 @@ static bool SCSI_CBWDecode(uint8_t busid, uint32_t nbytes) if (ret) { if (g_usbd_msc[busid].stage == MSC_READ_CBW) { if (len2send) { - USB_LOG_DBG("Send info len:%d\r\n", len2send); + USB_LOG_DBG("Send info len: %d\r\n", len2send); usbd_msc_send_info(busid, buf2send, len2send); } else { usbd_msc_send_csw(busid, CSW_STATUS_CMD_PASSED); @@ -837,7 +773,7 @@ void mass_storage_bulk_out(uint8_t busid, uint8_t ep, uint32_t nbytes) switch (g_usbd_msc[busid].stage) { case MSC_READ_CBW: if (SCSI_CBWDecode(busid, nbytes) == false) { - USB_LOG_ERR("Command:0x%02x decode err\r\n", g_usbd_msc[busid].cbw.CB[0]); + USB_LOG_ERR("Command: 0x%02x decode err\r\n", g_usbd_msc[busid].cbw.CB[0]); usbd_msc_bot_abort(busid); return; } @@ -921,7 +857,6 @@ static void usbdev_msc_thread(CONFIG_USB_OSAL_THREAD_SET_ARGV) if (ret < 0) { continue; } - USB_LOG_DBG("event:%d\r\n", event); if (event == MSC_DATA_OUT) { if (SCSI_processWrite(busid, g_usbd_msc[busid].nbytes) == false) { usbd_msc_send_csw(busid, CSW_STATUS_CMD_FAILED); /* send fail status to host,and the host will retry*/ @@ -943,7 +878,6 @@ void usbd_msc_polling(uint8_t busid) if (event != 0) { g_usbd_msc[busid].event = 0; - USB_LOG_DBG("event:%d\r\n", event); if (event == MSC_DATA_OUT) { if (SCSI_processWrite(busid, g_usbd_msc[busid].nbytes) == false) { usbd_msc_send_csw(busid, CSW_STATUS_CMD_FAILED); /* send fail status to host,and the host will retry*/ diff --git a/class/wireless/usbh_rndis.c b/class/wireless/usbh_rndis.c index b6e43a76..cb00651f 100644 --- a/class/wireless/usbh_rndis.c +++ b/class/wireless/usbh_rndis.c @@ -68,7 +68,7 @@ static int usbh_rndis_init_msg_transfer(struct usbh_rndis *rndis_class) ret = usbh_control_transfer(rndis_class->hport, setup, (uint8_t *)cmd); if (ret < 0) { - USB_LOG_ERR("rndis_initialize_msg_t send error, ret: %d\r\n", ret); + USB_LOG_ERR("init send error, ret: %d\r\n", ret); return ret; } @@ -84,14 +84,14 @@ static int usbh_rndis_init_msg_transfer(struct usbh_rndis *rndis_class) ret = usbh_control_transfer(rndis_class->hport, setup, (uint8_t *)resp); if (ret < 0) { - USB_LOG_ERR("rndis_initialize_cmplt_t recv error, ret: %d\r\n", ret); + USB_LOG_ERR("init recv error, ret: %d\r\n", ret); return ret; } rndis_class->max_transfer_pkts = resp->MaxPacketsPerTransfer; rndis_class->max_transfer_size = resp->MaxTransferSize; - USB_LOG_INFO("MaxPacketsPerTransfer:%u\r\n", (unsigned int)resp->MaxPacketsPerTransfer); - USB_LOG_INFO("MaxTransferSize:%u\r\n", (unsigned int)resp->MaxTransferSize); + USB_LOG_INFO("MaxPacketsPerTransfer: %u\r\n", (unsigned int)resp->MaxPacketsPerTransfer); + USB_LOG_INFO("MaxTransferSize: %u\r\n", (unsigned int)resp->MaxTransferSize); return ret; } @@ -312,14 +312,13 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) if (ret < 0) { return ret; } - USB_LOG_INFO("rndis init success\r\n"); ret = usbh_rndis_query_msg_transfer(rndis_class, OID_GEN_SUPPORTED_LIST, 0, tmp_buffer, &data_len); if (ret < 0) { return ret; } oid_num = (data_len / 4); - USB_LOG_INFO("rndis query OID_GEN_SUPPORTED_LIST success,oid num :%u\r\n", (unsigned int)oid_num); + USB_LOG_INFO("rndis query OID_GEN_SUPPORTED_LIST success,oid num: %u\r\n", (unsigned int)oid_num); oid_support_list = (uint32_t *)tmp_buffer; @@ -380,10 +379,8 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) } break; default: - USB_LOG_WRN("Ignore rndis query iod:%08x\r\n", (unsigned int)oid); - continue; + break; } - USB_LOG_INFO("rndis query iod:%08x success\r\n", (unsigned int)oid); } uint32_t packet_filter = 0x0f; @@ -391,14 +388,12 @@ static int usbh_rndis_connect(struct usbh_hubport *hport, uint8_t intf) if (ret < 0) { return ret; } - USB_LOG_INFO("rndis set OID_GEN_CURRENT_PACKET_FILTER success\r\n"); uint8_t multicast_list[6] = { 0x01, 0x00, 0x5E, 0x00, 0x00, 0x01 }; ret = usbh_rndis_set_msg_transfer(rndis_class, OID_802_3_MULTICAST_LIST, multicast_list, 6); if (ret < 0) { return ret; } - USB_LOG_INFO("rndis set OID_802_3_MULTICAST_LIST success\r\n"); USB_LOG_INFO("rndis MAC address %02x:%02x:%02x:%02x:%02x:%02x\r\n", rndis_class->mac[0], @@ -487,7 +482,7 @@ find_class: usbh_bulk_urb_fill(&g_rndis_class.bulkin_urb, g_rndis_class.hport, g_rndis_class.bulkin, &g_rndis_rx_buffer[g_rndis_rx_length], transfer_size, USB_OSAL_WAITING_FOREVER, NULL, NULL); ret = usbh_submit_urb(&g_rndis_class.bulkin_urb); if (ret < 0) { - goto find_class; + break; } g_rndis_rx_length += g_rndis_class.bulkin_urb.actual_length; diff --git a/core/usbd_core.c b/core/usbd_core.c index 72136e1b..66ec4dc6 100644 --- a/core/usbd_core.c +++ b/core/usbd_core.c @@ -950,7 +950,6 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s *len = desclen; return 0; default: - USB_LOG_ERR("unknown vendor code\r\n"); return -1; } } @@ -964,7 +963,6 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s *len = g_usbd_core[busid].descriptors->msosv2_descriptor->compat_id_len; return 0; default: - USB_LOG_ERR("unknown vendor code\r\n"); return -1; } } @@ -980,7 +978,6 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s *len = desclen; return 0; default: - USB_LOG_ERR("unknown vendor code\r\n"); return -1; } } @@ -1008,7 +1005,6 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s *len = desclen; return 0; default: - USB_LOG_ERR("unknown vendor code\r\n"); return -1; } } @@ -1021,7 +1017,6 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s *len = g_usbd_core[busid].msosv2_desc->compat_id_len; return 0; default: - USB_LOG_ERR("unknown vendor code\r\n"); return -1; } } @@ -1037,7 +1032,6 @@ static int usbd_vendor_request_handler(uint8_t busid, struct usb_setup_packet *s *len = desclen; return 0; default: - USB_LOG_ERR("unknown vendor code\r\n"); return -1; } }