diff --git a/include/librealsense2/hpp/rs_device.hpp b/include/librealsense2/hpp/rs_device.hpp index 156258b34fc..d977f59beff 100644 --- 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 index 467dbe9672d..4223252b9e1 100644 --- 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 index 848df9f4ba4..6157cba595c 100644 --- 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 index fea2db3949b..ae756ef8c52 100644 --- 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 create_hid_device(hid_device_info info) const = 0; virtual std::vector query_hid_devices() const = 0; - virtual std::shared_ptr create_mipi_device(mipi_device_info info) const = 0; virtual std::vector query_mipi_devices() const = 0; virtual std::shared_ptr 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 index 25bc068ada3..ec18af4a1bc 100644 --- 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 index a3c3b57aa37..a1ed524a33f 100644 --- 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 index 60a6d9b9ba9..d0c3049d3b4 100644 --- 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 index 8f733d2af71..e0480c65ce8 100644 --- 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-factory.cpp b/src/fw-update/fw-update-factory.cpp index aa13e8107c4..579267bfe5e 100644 --- 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 index e5b1a910d29..b085177b14c 100644 --- 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 index 4d5589fd089..822b197438e 100644 --- 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 @@ -2905,11 +2905,6 @@ namespace librealsense return device_infos; } - std::shared_ptr v4l_backend::create_mipi_device(mipi_device_info info) const - { - return nullptr; - } - std::vector v4l_backend::query_mipi_devices() const { std::vector mipi_nodes; diff --git a/src/linux/backend-v4l2.h b/src/linux/backend-v4l2.h index 2998cee5d95..e4c39fc6624 100644 --- 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 create_hid_device(hid_device_info info) const override; std::vector query_hid_devices() const override; - std::shared_ptr create_mipi_device(mipi_device_info info) const override; std::vector query_mipi_devices() const override; std::shared_ptr create_device_watcher() const override; diff --git a/src/platform/backend-device-group.h b/src/platform/backend-device-group.h index cb4c4aa75f9..0e5a46e9f07 100644 --- 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 index 80b42ab6f09..682e4866d8a 100644 --- 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 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(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 new file mode 100644 index 00000000000..ad64326652a --- /dev/null +++ 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 +#include +#include "mipi-device-info.h" + +namespace librealsense { +namespace platform { + +class mipi_device; +typedef std::shared_ptr 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(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 index 23971431261..447345386c6 100644 --- 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 index dd199045a5f..8c0c7bdda40 100644 --- 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