dfu - rework after review #1

Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
dmipx · May 28, 2024 · 0db48a9 · 0db48a9
1 parent 18ed846
commit 0db48a9
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 41 deletions.
diff --git a/include/librealsense2/hpp/rs_device.hpp b/include/librealsense2/hpp/rs_device.hpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2017-2024 Intel Corporation. All Rights Reserved.
 
 #ifndef LIBREALSENSE_RS2_DEVICE_HPP
 #define LIBREALSENSE_RS2_DEVICE_HPP

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -116,6 +116,7 @@ target_sources(${LRS_TARGET}
         "${CMAKE_CURRENT_LIST_DIR}/platform/hid-data.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/hid-device.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/hid-device-info.h"
+        "${CMAKE_CURRENT_LIST_DIR}/platform/mipi-device.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/mipi-device-info.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/playback-device-info.h"
         "${CMAKE_CURRENT_LIST_DIR}/platform/platform-utils.h"

diff --git a/src/backend-device-factory.cpp b/src/backend-device-factory.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2023-2024 Intel Corporation. All Rights Reserved.
 
 #include "backend-device-factory.h"
 #include "context.h"

diff --git a/src/backend.h b/src/backend.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2015-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 
@@ -44,7 +44,6 @@ namespace librealsense
             virtual std::shared_ptr<hid_device> create_hid_device(hid_device_info info) const = 0;
             virtual std::vector<hid_device_info> query_hid_devices() const = 0;
 
-            virtual std::shared_ptr<mipi_device> create_mipi_device(mipi_device_info info) const = 0;
             virtual std::vector<mipi_device_info> query_mipi_devices() const = 0;
 
             virtual std::shared_ptr<device_watcher> create_device_watcher() const = 0;

diff --git a/src/ds/d400/d400-fw-update-device.cpp b/src/ds/d400/d400-fw-update-device.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019-2024 Intel Corporation. All Rights Reserved.
 
 #include "d400-fw-update-device.h"
 #include "d400-private.h"

diff --git a/src/ds/d400/d400-fw-update-device.h b/src/ds/d400/d400-fw-update-device.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 

diff --git a/src/ds/d400/d400-private.h b/src/ds/d400/d400-private.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2015-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 

diff --git a/src/fw-update/fw-update-device.cpp b/src/fw-update/fw-update-device.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019-2024 Intel Corporation. All Rights Reserved.
 
 #include "fw-update-device.h"
 #include "../types.h"

diff --git a/src/fw-update/fw-update-device.h b/src/fw-update/fw-update-device.h
@@ -5,7 +5,7 @@
 #include <src/core/device-interface.h>
 #include "fw-update-device-interface.h"
 #include "usb/usb-device.h"
-#include "src/platform/mipi-device-info.h"
+#include "platform/mipi-device.h"
 
 namespace librealsense
 {
@@ -20,7 +20,7 @@ namespace librealsense
         RS2_DFU_STATUS_VERIFY = 0x07,       // Programmed memory failed verification.
         RS2_DFU_STATUS_ADDRESS = 0x08,      // Cannot program memory due to received address that is out of range.
         RS2_DFU_STATUS_NOTDONE = 0x09,      // Received DFU_DNLOAD with wLength = 0, but device does    not think it has all of the data yet.
-        RS2_DFU_STATUS_FIRMWARE = 0x0A,     // Device’s firmware is corrupt.It cannot return to run - time    (non - DFU) operations.
+        RS2_DFU_STATUS_FIRMWARE = 0x0A,     // Device�s firmware is corrupt.It cannot return to run - time    (non - DFU) operations.
         RS2_DFU_STATUS_VENDOR = 0x0B,       // iString indicates a vendor - specific RS2_DFU_STATUS_or.
         RS2_DFU_STATUS_USBR = 0x0C,         // Device detected unexpected USB reset signaling.
         RS2_DFU_STATUS_POR = 0x0D,          // Device detected unexpected power on reset.

diff --git a/src/fw-update/fw-update-factory.cpp b/src/fw-update/fw-update-factory.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019-2024 Intel Corporation. All Rights Reserved.
 
 #include "fw-update-factory.h"
 #include "fw-update-device.h"

diff --git a/src/fw-update/fw-update-factory.h b/src/fw-update/fw-update-factory.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 

diff --git a/src/linux/backend-v4l2.cpp b/src/linux/backend-v4l2.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2015-2024 Intel Corporation. All Rights Reserved.
 
 #include "backend-v4l2.h"
 #include <src/platform/command-transfer.h>
@@ -2905,11 +2905,6 @@ namespace librealsense
             return device_infos;
         }
 
-        std::shared_ptr<mipi_device> v4l_backend::create_mipi_device(mipi_device_info info) const
-        {
-           return nullptr;
-        }
-
         std::vector<mipi_device_info> v4l_backend::query_mipi_devices() const
         {
             std::vector<mipi_device_info> mipi_nodes;

diff --git a/src/linux/backend-v4l2.h b/src/linux/backend-v4l2.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2015-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 
@@ -515,7 +515,6 @@ namespace librealsense
             std::shared_ptr<hid_device> create_hid_device(hid_device_info info) const override;
             std::vector<hid_device_info> query_hid_devices() const override;
 
-            std::shared_ptr<mipi_device> create_mipi_device(mipi_device_info info) const override;
             std::vector<mipi_device_info> query_mipi_devices() const override;
 
             std::shared_ptr<device_watcher> create_device_watcher() const override;

diff --git a/src/platform/backend-device-group.h b/src/platform/backend-device-group.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2023-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 

diff --git a/src/platform/mipi-device-info.h b/src/platform/mipi-device-info.h
@@ -38,23 +38,5 @@ inline bool operator==( const mipi_device_info & a, const mipi_device_info & b )
         && ( a.device_path == b.device_path );
 }
 
-class mipi_device;
-typedef std::shared_ptr<mipi_device> rs_mipi_device;
-
-class mipi_device
-{
-public:
-    mipi_device(const mipi_device_info& info) : _info(info) {}
-    virtual ~mipi_device() = default;
-    static rs_mipi_device create_mipi_device(const mipi_device_info& info)
-    {
-        return std::make_shared<mipi_device>(info);
-    }
-    const mipi_device_info get_info() const { return _info; };
-private:
-    const mipi_device_info _info;
-};
-
-
 }  // namespace platform
 }  // namespace librealsense
diff --git a/src/platform/mipi-device.h b/src/platform/mipi-device.h
@@ -0,0 +1,32 @@
+// License: Apache 2.0. See LICENSE file in root directory.
+// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+
+#pragma once
+
+#include <sstream>
+#include <memory>
+#include "mipi-device-info.h"
+
+namespace librealsense {
+namespace platform {
+
+class mipi_device;
+typedef std::shared_ptr<mipi_device> rs_mipi_device;
+
+class mipi_device
+{
+public:
+    mipi_device(const mipi_device_info& info) : _info(info) {}
+    virtual ~mipi_device() = default;
+    static rs_mipi_device create_mipi_device(const mipi_device_info& info)
+    {
+        return std::make_shared<mipi_device>(info);
+    }
+    const mipi_device_info get_info() const { return _info; };
+private:
+    const mipi_device_info _info;
+};
+
+
+}  // namespace platform
+}  // namespace librealsense
diff --git a/src/platform/platform-device-info.h b/src/platform/platform-device-info.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2023-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once
 

diff --git a/src/platform/platform-utils.h b/src/platform/platform-utils.h
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2024 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2023-2024 Intel Corporation. All Rights Reserved.
 
 #pragma once