diff --git a/class/audio/usbh_audio.c b/class/audio/usbh_audio.c index ffc4a7e3..1da958d5 100644 --- a/class/audio/usbh_audio.c +++ b/class/audio/usbh_audio.c @@ -236,27 +236,27 @@ int usbh_audio_set_mute(struct usbh_audio *audio_class, const char *name, uint8_ void usbh_audio_list_module(struct usbh_audio *audio_class) { USB_LOG_INFO("============= Audio module information ===================\r\n"); - USB_LOG_INFO("bcdADC :%04x\r\n", audio_class->bcdADC); - USB_LOG_INFO("Num of modules :%u\r\n", audio_class->module_num); - USB_LOG_INFO("Num of altsettings:%u\r\n", audio_class->num_of_intf_altsettings); + USB_LOG_RAW("bcdADC :%04x\r\n", audio_class->bcdADC); + USB_LOG_RAW("Num of modules :%u\r\n", audio_class->module_num); + USB_LOG_RAW("Num of altsettings:%u\r\n", audio_class->num_of_intf_altsettings); for (uint8_t i = 0; i < audio_class->module_num; i++) { - USB_LOG_INFO(" module name :%s\r\n", audio_class->module[i].name); - USB_LOG_INFO(" module feature unit id :%d\r\n", audio_class->module[i].feature_unit_id); + USB_LOG_RAW(" module name :%s\r\n", audio_class->module[i].name); + USB_LOG_RAW(" module feature unit id :%d\r\n", audio_class->module[i].feature_unit_id); for (uint8_t j = 0; j < audio_class->num_of_intf_altsettings; j++) { if (j == 0) { - USB_LOG_INFO(" Ingore altsetting 0\r\n"); + USB_LOG_RAW(" Ingore altsetting 0\r\n"); continue; } - USB_LOG_INFO(" Altsetting %u\r\n", j); - USB_LOG_INFO(" module channels :%u\r\n", audio_class->module[i].altsetting[j].channels); - //USB_LOG_INFO(" module format_type :%u\r\n",audio_class->module[i].altsetting[j].format_type); - USB_LOG_INFO(" module bitresolution :%u\r\n", audio_class->module[i].altsetting[j].bitresolution); - USB_LOG_INFO(" module sampfreq num :%u\r\n", audio_class->module[i].altsetting[j].sampfreq_num); + USB_LOG_RAW(" Altsetting %u\r\n", j); + USB_LOG_RAW(" module channels :%u\r\n", audio_class->module[i].altsetting[j].channels); + //USB_LOG_RAW(" module format_type :%u\r\n",audio_class->module[i].altsetting[j].format_type); + USB_LOG_RAW(" module bitresolution :%u\r\n", audio_class->module[i].altsetting[j].bitresolution); + USB_LOG_RAW(" module sampfreq num :%u\r\n", audio_class->module[i].altsetting[j].sampfreq_num); for (uint8_t k = 0; k < audio_class->module[i].altsetting[j].sampfreq_num; k++) { - USB_LOG_INFO(" module sampfreq :%d hz\r\n", audio_class->module[i].altsetting[j].sampfreq[k]); + USB_LOG_RAW(" module sampfreq :%d hz\r\n", audio_class->module[i].altsetting[j].sampfreq[k]); } } } diff --git a/class/video/usbh_video.c b/class/video/usbh_video.c index df2d8db1..4a7bfe48 100644 --- a/class/video/usbh_video.c +++ b/class/video/usbh_video.c @@ -300,12 +300,12 @@ void usbh_video_list_info(struct usbh_video *video_class) uint16_t mps; USB_LOG_INFO("============= Video device information ===================\r\n"); - USB_LOG_INFO("bcdVDC:%04x\r\n", video_class->bcdVDC); - USB_LOG_INFO("Num of altsettings:%u\r\n", video_class->num_of_intf_altsettings); + USB_LOG_RAW("bcdVDC:%04x\r\n", video_class->bcdVDC); + USB_LOG_RAW("Num of altsettings:%u\r\n", video_class->num_of_intf_altsettings); for (uint8_t i = 0; i < video_class->num_of_intf_altsettings; i++) { if (i == 0) { - USB_LOG_INFO("Ingore altsetting 0\r\n"); + USB_LOG_RAW("Ingore altsetting 0\r\n"); continue; } ep_desc = &video_class->hport->config.intf[video_class->data_intf].altsetting[i].ep[0].ep_desc; @@ -313,7 +313,7 @@ void usbh_video_list_info(struct usbh_video *video_class) mult = (ep_desc->wMaxPacketSize & USB_MAXPACKETSIZE_ADDITIONAL_TRANSCATION_MASK) >> USB_MAXPACKETSIZE_ADDITIONAL_TRANSCATION_SHIFT; mps = ep_desc->wMaxPacketSize & USB_MAXPACKETSIZE_MASK; - USB_LOG_INFO("Altsetting:%u, Ep=%02x Attr=%02u Mps=%d Interval=%02u Mult=%02u\r\n", + USB_LOG_RAW("Altsetting:%u, Ep=%02x Attr=%02u Mps=%d Interval=%02u Mult=%02u\r\n", i, ep_desc->bEndpointAddress, ep_desc->bmAttributes, @@ -322,15 +322,15 @@ void usbh_video_list_info(struct usbh_video *video_class) mult); } - USB_LOG_INFO("bNumFormats:%u\r\n", video_class->num_of_formats); + USB_LOG_RAW("bNumFormats:%u\r\n", video_class->num_of_formats); for (uint8_t i = 0; i < video_class->num_of_formats; i++) { - USB_LOG_INFO(" FormatIndex:%u\r\n", i + 1); - USB_LOG_INFO(" FormatType:%s\r\n", format_type[video_class->format[i].format_type]); - USB_LOG_INFO(" bNumFrames:%u\r\n", video_class->format[i].num_of_frames); - USB_LOG_INFO(" Resolution:\r\n"); + USB_LOG_RAW(" FormatIndex:%u\r\n", i + 1); + USB_LOG_RAW(" FormatType:%s\r\n", format_type[video_class->format[i].format_type]); + USB_LOG_RAW(" bNumFrames:%u\r\n", video_class->format[i].num_of_frames); + USB_LOG_RAW(" Resolution:\r\n"); for (uint8_t j = 0; j < video_class->format[i].num_of_frames; j++) { - USB_LOG_INFO(" FrameIndex:%u\r\n", j + 1); - USB_LOG_INFO(" wWidth: %d, wHeight: %d\r\n", + USB_LOG_RAW(" FrameIndex:%u\r\n", j + 1); + USB_LOG_RAW(" wWidth: %d, wHeight: %d\r\n", video_class->format[i].frame[j].wWidth, video_class->format[i].frame[j].wHeight); }