Rename uvc_device_info fields: mipi->is_mipi, conn_spec->usb_conn_spec

Author: OhadMeir

src/ds/d500/d500-device.cpp

@@ -410,7 +410,7 @@ namespace librealsense
 
         auto raw_sensor = get_raw_depth_sensor();
         _pid = group.uvc_devices.front().pid;
-        _is_mipi_device = group.uvc_devices.front().mipi;
+        _is_mipi_device = group.uvc_devices.front().is_mipi;
 
         _color_calib_table_raw = [this]()
         {

src/ds/d500/d500-factory.cpp

@@ -475,7 +475,7 @@ namespace librealsense
         auto dev_info = std::dynamic_pointer_cast< const d500_info >( shared_from_this() );
 
         auto pid = _group.uvc_devices.front().pid;
-        bool is_mipi = _group.uvc_devices.front().mipi;
+        bool is_mipi = _group.uvc_devices.front().is_mipi;
 
         try
         {

src/linux/backend-v4l2.cpp

@@ -937,7 +937,7 @@ namespace librealsense
             info.unique_id = busnum + "-" + devpath + "-" + devnum;
             // Find the USB specification (USB2/3) type from the underlying device, traversing from
             // /sys/devices/.../M-N/3-6:1.0/video4linux/video0 up to /sys/devices/.../M-N/version
-            info.conn_spec = v4l_usb_logic::get_usb_connection_type(video_path + "/../../../");
+            info.usb_conn_spec = v4l_usb_logic::get_usb_connection_type(video_path + "/../../../");
             info.uvc_capabilities = get_dev_capabilities(dev_name).device_caps;
 
             return info;
@@ -992,8 +992,8 @@ namespace librealsense
                     break;
                 }
             }
-            info.conn_spec = usb_undefined;
-            info.mipi = true;
+            info.usb_conn_spec = usb_undefined;
+            info.is_mipi = true;
             info.uvc_capabilities = get_dev_capabilities(dev_name).device_caps;
 
             return info;
@@ -1223,7 +1223,7 @@ namespace librealsense
         v4l_uvc_device::v4l_uvc_device(const uvc_device_info& info, bool use_memory_map)
             : _name(info.id), 
               _device_path(info.device_path),
-              _device_usb_spec(info.conn_spec),
+              _device_usb_spec(info.usb_conn_spec),
               _info(info),
               _is_capturing(false),
               _is_alive(true),
@@ -2823,7 +2823,7 @@ namespace librealsense
 
         std::shared_ptr<uvc_device> v4l_backend::create_uvc_device(uvc_device_info info) const
         {
-            bool mipi_device = info.mipi;
+            bool mipi_device = info.is_mipi;
 
             auto v4l_uvc_dev =        mipi_device ?         std::make_shared<v4l_mipi_device>(info) :
                               ((!info.has_metadata_node) ?  std::make_shared<v4l_uvc_device>(info) :

src/platform/uvc-device-info.h

@@ -22,19 +22,19 @@ struct uvc_device_info
     std::string device_path;
     std::string dfu_device_path; // for mipi multiple cameras
     std::string serial;
-    usb_spec conn_spec = usb_undefined;
+    usb_spec usb_conn_spec = usb_undefined;
     uint32_t uvc_capabilities = 0;
     bool has_metadata_node = false;
     std::string metadata_node_id;
-    bool mipi = false;  // enumerated over a MIPI/GMSL V4L2 node rather than USB
+    bool is_mipi = false;  // enumerated over a MIPI/GMSL V4L2 node rather than USB
 
     operator std::string() const
     {
         std::ostringstream s;
         s << "id- " << id << "\nvid- " << std::hex << vid << "\npid- " << std::hex << pid << "\nmi- " << std::dec << mi
           << "\nunique_id- " << unique_id << "\npath- " << device_path << "\nUVC capabilities- " << std::hex
-          << uvc_capabilities << "\nUVC specification- " << std::hex << (uint16_t)conn_spec << std::dec
-          << ( has_metadata_node ? ( "\nmetadata node-" + metadata_node_id ) : "" ) << ( mipi ? "\nmipi" : "" ) << std::endl;
+          << uvc_capabilities << "\nUVC specification- " << std::hex << (uint16_t)usb_conn_spec << std::dec
+          << ( has_metadata_node ? ( "\nmetadata node-" + metadata_node_id ) : "" ) << ( is_mipi ? "\nmipi" : "" ) << std::endl;
 
         return s.str();
     }
@@ -49,7 +49,7 @@ struct uvc_device_info
 inline bool operator==( const uvc_device_info & a, const uvc_device_info & b )
 {
     return ( a.vid == b.vid ) && ( a.pid == b.pid ) && ( a.mi == b.mi ) && ( a.unique_id == b.unique_id )
-        && ( a.id == b.id ) && ( a.device_path == b.device_path ) && ( a.conn_spec == b.conn_spec );
+        && ( a.id == b.id ) && ( a.device_path == b.device_path ) && ( a.usb_conn_spec == b.usb_conn_spec );
 }
 
 

src/uvc/uvc-device.cpp

@@ -56,7 +56,7 @@ namespace librealsense
                 device_info.mi = info.mi;
                 device_info.unique_id = info.unique_id;
                 device_info.device_path = info.id;
-                device_info.conn_spec = info.conn_spec;
+                device_info.usb_conn_spec = info.conn_spec;
                 //LOG_INFO("Found UVC device: " << std::string(device_info).c_str());
                 rv.push_back(device_info);
             }
@@ -350,7 +350,7 @@ namespace librealsense
 
         usb_spec rs_uvc_device::get_usb_specification() const
         {
-            // On Win7, USB type is determined only when the USB device is created, _info.conn_spec holds wrong information
+            // On Win7 the cached uvc_device_info.usb_conn_spec is wrong, so read it live from the USB device's own info
             return _usb_device->get_info().conn_spec; 
         }