From 645f4a6f335230809ba61e86d3fc8bf69eb822b7 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sun, 10 Apr 2022 11:59:48 +0200 Subject: [PATCH] Move `device/hw/device.h` to `device/device.h` --- cmd/camera_stream.c | 2 +- device/buffer.c | 2 +- device/buffer_list.c | 2 +- device/buffer_queue.c | 2 +- device/camera.c | 2 +- device/camera.h | 2 +- device/camera_decoder.c | 2 +- device/camera_direct.c | 2 +- device/camera_isp.c | 2 +- device/camera_legacy_isp.c | 2 +- device/{hw => }/device.c | 2 +- device/{hw => }/device.h | 0 device/links.c | 2 +- device/v4l2/buffer.c | 2 +- device/v4l2/buffer_list.c | 2 +- device/v4l2/debug.c | 2 +- device/v4l2/device.c | 2 +- device/v4l2/device_hw.c | 2 +- device/v4l2/device_media.c | 2 +- device/v4l2/device_options.c | 2 +- http/http_ffmpeg.c | 2 +- http/http_h264.c | 2 +- 22 files changed, 21 insertions(+), 21 deletions(-) rename device/{hw => }/device.c (99%) rename device/{hw => }/device.h (100%) diff --git a/cmd/camera_stream.c b/cmd/camera_stream.c index adc9e56..521aa4a 100644 --- a/cmd/camera_stream.c +++ b/cmd/camera_stream.c @@ -1,6 +1,6 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/links.h" #include "device/hw/v4l2.h" #include "http/http.h" diff --git a/device/buffer.c b/device/buffer.c index fe2cc4e..d33154b 100644 --- a/device/buffer.c +++ b/device/buffer.c @@ -1,6 +1,6 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/hw/v4l2.h" buffer_t *buffer_open(const char *name, buffer_list_t *buf_list, int index) { diff --git a/device/buffer_list.c b/device/buffer_list.c index 4718c69..22ead2f 100644 --- a/device/buffer_list.c +++ b/device/buffer_list.c @@ -1,6 +1,6 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/hw/v4l2.h" buffer_list_t *buffer_list_open(const char *name, struct device_s *dev, bool do_capture, bool do_mmap) diff --git a/device/buffer_queue.c b/device/buffer_queue.c index 1d26e29..afcc635 100644 --- a/device/buffer_queue.c +++ b/device/buffer_queue.c @@ -1,6 +1,6 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/hw/v4l2.h" #include diff --git a/device/camera.c b/device/camera.c index 101041e..4e0c1f1 100644 --- a/device/camera.c +++ b/device/camera.c @@ -1,6 +1,6 @@ #include "camera.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/buffer_list.h" #include "device/links.h" #include "device/hw/v4l2.h" diff --git a/device/camera.h b/device/camera.h index 684d0bb..0c3c56e 100644 --- a/device/camera.h +++ b/device/camera.h @@ -1,7 +1,7 @@ #pragma once #include "device/links.h" -#include "device/hw/device.h" +#include "device/device.h" #define MAX_DEVICES 20 #define MAX_HTTP_METHODS 20 diff --git a/device/camera_decoder.c b/device/camera_decoder.c index 48b153d..b0f749e 100644 --- a/device/camera_decoder.c +++ b/device/camera_decoder.c @@ -2,7 +2,7 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/links.h" #include "device/hw/v4l2.h" #include "device/buffer_list.h" diff --git a/device/camera_direct.c b/device/camera_direct.c index 0d23a4c..c5a7f8d 100644 --- a/device/camera_direct.c +++ b/device/camera_direct.c @@ -2,7 +2,7 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/links.h" #include "device/hw/v4l2.h" #include "device/buffer_list.h" diff --git a/device/camera_isp.c b/device/camera_isp.c index 0c06f8f..409e144 100644 --- a/device/camera_isp.c +++ b/device/camera_isp.c @@ -2,7 +2,7 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/links.h" #include "device/hw/v4l2.h" #include "device/buffer_list.h" diff --git a/device/camera_legacy_isp.c b/device/camera_legacy_isp.c index e9a9e65..d07c732 100644 --- a/device/camera_legacy_isp.c +++ b/device/camera_legacy_isp.c @@ -2,7 +2,7 @@ #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/links.h" #include "device/hw/v4l2.h" #include "device/buffer_list.h" diff --git a/device/hw/device.c b/device/device.c similarity index 99% rename from device/hw/device.c rename to device/device.c index 18b5ac3..ff4f732 100644 --- a/device/hw/device.c +++ b/device/device.c @@ -1,4 +1,4 @@ -#include "device/hw/device.h" +#include "device/device.h" #include "device/buffer.h" #include "device/buffer_list.h" #include "device/hw/v4l2.h" diff --git a/device/hw/device.h b/device/device.h similarity index 100% rename from device/hw/device.h rename to device/device.h diff --git a/device/links.c b/device/links.c index f98397f..48a82be 100644 --- a/device/links.c +++ b/device/links.c @@ -1,5 +1,5 @@ #include "device/links.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/buffer.h" #include "device/buffer_list.h" #include "device/hw/v4l2.h" diff --git a/device/v4l2/buffer.c b/device/v4l2/buffer.c index 0c417f3..2f612c7 100644 --- a/device/v4l2/buffer.c +++ b/device/v4l2/buffer.c @@ -1,7 +1,7 @@ #include "device/v4l2/v4l2.h" #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" int v4l2_buffer_open(buffer_t *buf) { diff --git a/device/v4l2/buffer_list.c b/device/v4l2/buffer_list.c index 4c96762..6450b62 100644 --- a/device/v4l2/buffer_list.c +++ b/device/v4l2/buffer_list.c @@ -1,7 +1,7 @@ #include "device/v4l2/v4l2.h" #include "device/buffer.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" int v4l2_buffer_list_set_format(buffer_list_t *buf_list, unsigned width, unsigned height, unsigned format, unsigned bytesperline) { diff --git a/device/v4l2/debug.c b/device/v4l2/debug.c index 237d6a1..1233bf1 100644 --- a/device/v4l2/debug.c +++ b/device/v4l2/debug.c @@ -1,6 +1,6 @@ #include "device/v4l2/v4l2.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" int v4l2_buffer_list_refresh_states(buffer_list_t *buf_list) { diff --git a/device/v4l2/device.c b/device/v4l2/device.c index 9633344..faa1e08 100644 --- a/device/v4l2/device.c +++ b/device/v4l2/device.c @@ -1,6 +1,6 @@ #include "device/v4l2/v4l2.h" #include "device/hw/v4l2.h" -#include "device/hw/device.h" +#include "device/device.h" int v4l2_device_open(device_t *dev) { diff --git a/device/v4l2/device_hw.c b/device/v4l2/device_hw.c index 1dbe8b5..12287ed 100644 --- a/device/v4l2/device_hw.c +++ b/device/v4l2/device_hw.c @@ -1,6 +1,6 @@ #include "device/v4l2/v4l2.h" #include "device/hw/v4l2.h" -#include "device/hw/device.h" +#include "device/device.h" device_hw_t v4l2_device_hw = { .device_open = v4l2_device_open, diff --git a/device/v4l2/device_media.c b/device/v4l2/device_media.c index 66f481e..8b750e7 100644 --- a/device/v4l2/device_media.c +++ b/device/v4l2/device_media.c @@ -1,5 +1,5 @@ #include "device/v4l2/v4l2.h" -#include "device/hw/device.h" +#include "device/device.h" #include "device/hw/v4l2.h" #include diff --git a/device/v4l2/device_options.c b/device/v4l2/device_options.c index fe32894..764148d 100644 --- a/device/v4l2/device_options.c +++ b/device/v4l2/device_options.c @@ -1,6 +1,6 @@ #include "device/v4l2/v4l2.h" #include "device/hw/v4l2.h" -#include "device/hw/device.h" +#include "device/device.h" #include diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c index ce8d04c..2c5d4fd 100644 --- a/http/http_ffmpeg.c +++ b/http/http_ffmpeg.c @@ -6,7 +6,7 @@ #include "device/buffer.h" #include "device/buffer_lock.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" #include "ffmpeg/remuxer.h" buffer_lock_t *http_h264_buffer_for_res(http_worker_t *worker); diff --git a/http/http_h264.c b/http/http_h264.c index 616520f..619e6e4 100644 --- a/http/http_h264.c +++ b/http/http_h264.c @@ -6,7 +6,7 @@ #include "device/buffer.h" #include "device/buffer_lock.h" #include "device/buffer_list.h" -#include "device/hw/device.h" +#include "device/device.h" DEFINE_BUFFER_LOCK(http_h264, 0); DEFINE_BUFFER_LOCK(http_h264_lowres, 0);