From cbdc93e9d1666010d49e06940158a37c61cc6fa7 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Tue, 15 Jun 2021 15:40:45 +0100
Subject: libcamera/base: Move utils to the base library

Move the utils functionality to the libcamera/base library.

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 test/camera-sensor.cpp               | 3 ++-
 test/file-descriptor.cpp             | 2 +-
 test/ipc/unixsocket_ipc.cpp          | 3 ++-
 test/log/log_process.cpp             | 3 ++-
 test/pixel-format.cpp                | 2 +-
 test/process/process_test.cpp        | 3 ++-
 test/signal-threads.cpp              | 3 ++-
 test/utils.cpp                       | 2 +-
 test/v4l2_subdevice/list_formats.cpp | 3 ++-
 test/v4l2_videodevice/formats.cpp    | 3 ++-
 10 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp
index 8c7fd1d2..a8dcad82 100644
--- a/test/camera-sensor.cpp
+++ b/test/camera-sensor.cpp
@@ -10,10 +10,11 @@
 
 #include <linux/media-bus-format.h>
 
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/camera_sensor.h"
 #include "libcamera/internal/device_enumerator.h"
 #include "libcamera/internal/media_device.h"
-#include "libcamera/internal/utils.h"
 #include "libcamera/internal/v4l2_subdevice.h"
 
 #include "test.h"
diff --git a/test/file-descriptor.cpp b/test/file-descriptor.cpp
index aa3c896f..85b077a2 100644
--- a/test/file-descriptor.cpp
+++ b/test/file-descriptor.cpp
@@ -13,7 +13,7 @@
 
 #include <libcamera/file_descriptor.h>
 
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
 
 #include "test.h"
 
diff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp
index 3049eaa8..161d09b9 100644
--- a/test/ipc/unixsocket_ipc.cpp
+++ b/test/ipc/unixsocket_ipc.cpp
@@ -15,6 +15,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/ipa_data_serializer.h"
 #include "libcamera/internal/ipc_pipe.h"
@@ -22,7 +24,6 @@
 #include "libcamera/internal/process.h"
 #include "libcamera/internal/thread.h"
 #include "libcamera/internal/timer.h"
-#include "libcamera/internal/utils.h"
 
 #include "test.h"
 
diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp
index c0a1a012..413d9207 100644
--- a/test/log/log_process.cpp
+++ b/test/log/log_process.cpp
@@ -16,12 +16,13 @@
 
 #include <libcamera/logging.h>
 
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/process.h"
 #include "libcamera/internal/thread.h"
 #include "libcamera/internal/timer.h"
-#include "libcamera/internal/utils.h"
 
 #include "test.h"
 
diff --git a/test/pixel-format.cpp b/test/pixel-format.cpp
index c4a08f46..0f364f83 100644
--- a/test/pixel-format.cpp
+++ b/test/pixel-format.cpp
@@ -10,7 +10,7 @@
 #include <libcamera/formats.h>
 #include <libcamera/pixel_format.h>
 
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
 
 #include "test.h"
 
diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp
index 1279d8c1..a5155bae 100644
--- a/test/process/process_test.cpp
+++ b/test/process/process_test.cpp
@@ -9,11 +9,12 @@
 #include <unistd.h>
 #include <vector>
 
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/event_dispatcher.h"
 #include "libcamera/internal/process.h"
 #include "libcamera/internal/thread.h"
 #include "libcamera/internal/timer.h"
-#include "libcamera/internal/utils.h"
 
 #include "test.h"
 
diff --git a/test/signal-threads.cpp b/test/signal-threads.cpp
index 3c5f3792..8a96b5d2 100644
--- a/test/signal-threads.cpp
+++ b/test/signal-threads.cpp
@@ -9,9 +9,10 @@
 #include <iostream>
 #include <thread>
 
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/message.h"
 #include "libcamera/internal/thread.h"
-#include "libcamera/internal/utils.h"
 
 #include "test.h"
 
diff --git a/test/utils.cpp b/test/utils.cpp
index f170ae4c..9cd2cd07 100644
--- a/test/utils.cpp
+++ b/test/utils.cpp
@@ -14,7 +14,7 @@
 #include <libcamera/geometry.h>
 #include <libcamera/span.h>
 
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
 
 #include "test.h"
 
diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp
index 74ec81a8..9cbd7b94 100644
--- a/test/v4l2_subdevice/list_formats.cpp
+++ b/test/v4l2_subdevice/list_formats.cpp
@@ -10,7 +10,8 @@
 
 #include <libcamera/geometry.h>
 
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/v4l2_subdevice.h"
 
 #include "v4l2_subdevice_test.h"
diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp
index 255446fe..6c052622 100644
--- a/test/v4l2_videodevice/formats.cpp
+++ b/test/v4l2_videodevice/formats.cpp
@@ -8,7 +8,8 @@
 #include <iostream>
 #include <limits.h>
 
-#include "libcamera/internal/utils.h"
+#include <libcamera/base/utils.h>
+
 #include "libcamera/internal/v4l2_videodevice.h"
 
 #include "v4l2_videodevice_test.h"
-- 
cgit v1.2.1