From fd2f19270c2e8215a0681324cda491974fa02af5 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sun, 10 Apr 2022 11:11:50 +0200 Subject: [PATCH] Move `device/hw/buffer.c` to `device/buffer.c` --- cmd/camera_stream.c | 2 +- device/{hw => }/buffer.c | 2 +- device/{hw => }/buffer.h | 0 device/buffer_lock.c | 2 +- device/{hw => }/buffer_queue.c | 2 +- device/camera_decoder.c | 2 +- device/camera_direct.c | 2 +- device/camera_isp.c | 2 +- device/camera_legacy_isp.c | 2 +- device/hw/buffer_list.c | 2 +- device/hw/device.c | 2 +- device/links.c | 2 +- device/v4l2/buffer.c | 2 +- http/http_ffmpeg.c | 2 +- http/http_h264.c | 2 +- http/http_jpeg.c | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename device/{hw => }/buffer.c (95%) rename device/{hw => }/buffer.h (100%) rename device/{hw => }/buffer_queue.c (99%) diff --git a/cmd/camera_stream.c b/cmd/camera_stream.c index 997a120..cc52c23 100644 --- a/cmd/camera_stream.c +++ b/cmd/camera_stream.c @@ -1,4 +1,4 @@ -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/links.h" diff --git a/device/hw/buffer.c b/device/buffer.c similarity index 95% rename from device/hw/buffer.c rename to device/buffer.c index 9c385e5..86762c3 100644 --- a/device/hw/buffer.c +++ b/device/buffer.c @@ -1,4 +1,4 @@ -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/hw/v4l2.h" diff --git a/device/hw/buffer.h b/device/buffer.h similarity index 100% rename from device/hw/buffer.h rename to device/buffer.h diff --git a/device/buffer_lock.c b/device/buffer_lock.c index cccae11..c0bf3b3 100644 --- a/device/buffer_lock.c +++ b/device/buffer_lock.c @@ -1,6 +1,6 @@ #include "device/buffer_lock.h" #include "device/hw/buffer_list.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/v4l2.h" bool buffer_lock_is_used(buffer_lock_t *buf_lock) diff --git a/device/hw/buffer_queue.c b/device/buffer_queue.c similarity index 99% rename from device/hw/buffer_queue.c rename to device/buffer_queue.c index 66c6719..f40d3b3 100644 --- a/device/hw/buffer_queue.c +++ b/device/buffer_queue.c @@ -1,4 +1,4 @@ -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/hw/v4l2.h" diff --git a/device/camera_decoder.c b/device/camera_decoder.c index 40432c8..b28266a 100644 --- a/device/camera_decoder.c +++ b/device/camera_decoder.c @@ -1,6 +1,6 @@ #include "camera.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/links.h" diff --git a/device/camera_direct.c b/device/camera_direct.c index 461ab9c..8635633 100644 --- a/device/camera_direct.c +++ b/device/camera_direct.c @@ -1,6 +1,6 @@ #include "camera.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/links.h" diff --git a/device/camera_isp.c b/device/camera_isp.c index aa6fbd4..57afaef 100644 --- a/device/camera_isp.c +++ b/device/camera_isp.c @@ -1,6 +1,6 @@ #include "camera.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/links.h" diff --git a/device/camera_legacy_isp.c b/device/camera_legacy_isp.c index 4f57ccc..15d7442 100644 --- a/device/camera_legacy_isp.c +++ b/device/camera_legacy_isp.c @@ -1,6 +1,6 @@ #include "camera.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/links.h" diff --git a/device/hw/buffer_list.c b/device/hw/buffer_list.c index 030adcf..8ba86cd 100644 --- a/device/hw/buffer_list.c +++ b/device/hw/buffer_list.c @@ -1,4 +1,4 @@ -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" #include "device/hw/v4l2.h" diff --git a/device/hw/device.c b/device/hw/device.c index ace09de..e90a6d6 100644 --- a/device/hw/device.c +++ b/device/hw/device.c @@ -1,5 +1,5 @@ #include "device/hw/device.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/v4l2.h" diff --git a/device/links.c b/device/links.c index 994f08b..c9941de 100644 --- a/device/links.c +++ b/device/links.c @@ -1,6 +1,6 @@ #include "device/links.h" #include "device/hw/device.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/v4l2.h" diff --git a/device/v4l2/buffer.c b/device/v4l2/buffer.c index 0c5e750..a470a15 100644 --- a/device/v4l2/buffer.c +++ b/device/v4l2/buffer.c @@ -1,5 +1,5 @@ #include "device/v4l2/v4l2.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c index 1eb991d..bdb6776 100644 --- a/http/http_ffmpeg.c +++ b/http/http_ffmpeg.c @@ -3,7 +3,7 @@ #include "opts/log.h" #include "http/http.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/buffer_lock.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" diff --git a/http/http_h264.c b/http/http_h264.c index 57eae72..da2f06a 100644 --- a/http/http_h264.c +++ b/http/http_h264.c @@ -3,7 +3,7 @@ #include "opts/log.h" #include "http/http.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/buffer_lock.h" #include "device/hw/buffer_list.h" #include "device/hw/device.h" diff --git a/http/http_jpeg.c b/http/http_jpeg.c index c4cc603..1aa9511 100644 --- a/http/http_jpeg.c +++ b/http/http_jpeg.c @@ -2,7 +2,7 @@ #include #include "http/http.h" -#include "device/hw/buffer.h" +#include "device/buffer.h" #include "device/buffer_lock.h" DEFINE_BUFFER_LOCK(http_jpeg, 1000);