refactor(uvc): Clean-up

Author: roma-jam

host/class/uvc/usb_host_uvc/Kconfig

@@ -1,12 +1,12 @@
-menu "USB HOST UVC"
+menu "USB-Driver: UVC Host"
 
-    config PRINTF_UVC_CONFIGURATION_DESCRIPTOR
+    config UVC_HOST_PRINT_CONFIG_DESCRIPTOR
         bool "Print UVC Configuration Descriptor"
         default n
         help
             Print UVC Configuration Descriptor to console.
 
-    config UVC_INTERVAL_ARRAY_SIZE
+    config UVC_HOST_INTERVAL_ARRAY_SIZE
         int "Size of the interval array in uvc_host_frame_info_t"
         default 3
         help

host/class/uvc/usb_host_uvc/include/usb/uvc_host.h

@@ -10,12 +10,15 @@
 #include "usb/usb_host.h"
 #include "usb/usb_types_uvc.h"
 #include "esp_err.h"
+#include "sdkconfig.h"
 
 // Use this macros for opening a UVC stream with any VID or PID
 #define UVC_HOST_ANY_VID (0)
 #define UVC_HOST_ANY_PID (0)
 #define UVC_HOST_ANY_DEV_ADDR (0)
 
+#define UVC_HOST_INTERVAL_ARRAY_SIZE (CONFIG_UVC_HOST_INTERVAL_ARRAY_SIZE)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -53,7 +56,7 @@ typedef struct {
             uint32_t interval_max;            /**< Maximum frame interval */
             uint32_t interval_step;           /**< Frame interval step */
         };
-        uint32_t interval[CONFIG_UVC_INTERVAL_ARRAY_SIZE]; /**< We must put a fixed size here because of the union type. This is flexible size array though */
+        uint32_t interval[UVC_HOST_INTERVAL_ARRAY_SIZE]; /**< We must put a fixed size here because of the union type. This is flexible size array though */
     };
 } uvc_host_frame_info_t;
 

host/class/uvc/usb_host_uvc/uvc_descriptor_parsing.c

@@ -454,7 +454,7 @@ esp_err_t uvc_desc_get_frame_list(const usb_config_desc_t *config_desc, uint8_t
                     frame_info->interval_max = this_frame->mjpeg_uncompressed.dwMaxFrameInterval;
                     frame_info->interval_step = this_frame->mjpeg_uncompressed.dwFrameIntervalStep;
                 } else {
-                    for (int i = 0; i < CONFIG_UVC_INTERVAL_ARRAY_SIZE; i ++) {
+                    for (int i = 0; i < UVC_HOST_INTERVAL_ARRAY_SIZE; i ++) {
                         frame_info->interval[i] = this_frame->mjpeg_uncompressed.dwFrameInterval[i];
                     }
                 }
@@ -468,7 +468,7 @@ esp_err_t uvc_desc_get_frame_list(const usb_config_desc_t *config_desc, uint8_t
                     frame_info->interval_max = this_frame->frame_based.dwMaxFrameInterval;
                     frame_info->interval_step = this_frame->frame_based.dwFrameIntervalStep;
                 } else {
-                    for (int i = 0; i < CONFIG_UVC_INTERVAL_ARRAY_SIZE; i ++) {
+                    for (int i = 0; i < UVC_HOST_INTERVAL_ARRAY_SIZE; i ++) {
                         frame_info->interval[i] = this_frame->frame_based.dwFrameInterval[i];
                     }
                 }

host/class/uvc/usb_host_uvc/uvc_host.c

@@ -31,8 +31,12 @@
 #include "freertos/queue.h"
 #include "freertos/event_groups.h"
 
+#include "sdkconfig.h"
+
 static const char *TAG = "uvc";
 
+#define UVC_HOST_PRINT_CONFIG_DESCRIPTOR     CONFIG_UVC_HOST_PRINT_CONFIG_DESCRIPTOR
+
 // UVC spinlock
 portMUX_TYPE uvc_lock = portMUX_INITIALIZER_UNLOCKED;
 
@@ -120,9 +124,9 @@ static esp_err_t uvc_host_device_connected(uint8_t addr)
 
     // Create UAC interfaces list in RAM, connected to the particular USB dev
     if (is_uvc_device) {
-#ifdef CONFIG_PRINTF_UVC_CONFIGURATION_DESCRIPTOR
+#if (UVC_HOST_PRINT_CONFIG_DESCRIPTOR)
         usb_print_config_descriptor(config_desc, &uvc_print_desc);
-#endif
+#endif // UVC_HOST_PRINT_CONFIG_DESCRIPTOR
         // Create Interfaces list for a possibility to claim Interface
         ESP_RETURN_ON_ERROR(uvc_host_interface_check(addr, config_desc), TAG, "uvc stream interface not found");
     } else {
@@ -356,7 +360,6 @@ static esp_err_t uvc_find_and_open_usb_device(uint8_t dev_addr, uint16_t vid, ui
         if ((vid == device_desc->idVendor || vid == UVC_HOST_ANY_VID) &&
                 (pid == device_desc->idProduct || pid == UVC_HOST_ANY_PID) &&
                 (dev_addr == dev_info.dev_addr || dev_addr == UVC_HOST_ANY_DEV_ADDR)) {
-            // Return path 1: t
             (*dev)->constant.dev_hdl = uvc_stream->constant.dev_hdl;
             return ESP_OK;
         }
@@ -394,7 +397,6 @@ static esp_err_t uvc_find_and_open_usb_device(uint8_t dev_addr, uint16_t vid, ui
                 if ((vid == device_desc->idVendor || vid == UVC_HOST_ANY_VID) &&
                         (pid == device_desc->idProduct || pid == UVC_HOST_ANY_PID) &&
                         (dev_addr == dev_addr_list[i] || dev_addr == UVC_HOST_ANY_DEV_ADDR)) {
-                    // Return path 2:
                     (*dev)->constant.dev_hdl = current_device;
                     return ESP_OK;
                 }