From patchwork Wed Oct 23 13:52:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2214 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 95DC96138B for ; Wed, 23 Oct 2019 15:54:01 +0200 (CEST) Received: from pendragon.ideasonboard.com (143.121.2.93.rev.sfr.net [93.2.121.143]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 465C971F for ; Wed, 23 Oct 2019 15:54:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1571838841; bh=4WxC05OZFfV/oLQL/ZJLIbyvjLLOd8U6xruAJjZ1tg4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bkcx0eyqPAErTuFbK2Itz51v+im7+jEGfxdauF0JxMGNVYK72OeoXKRipCUT/0UBm C1OlOvgTgVg6VPg6BSWaTNX3NyVhYRNdNn9E1egEfCN8X74O3bZ2dhc1fQUtCmUV5b lndJ/qYMFVwtVCWvDloqFj97qtV8gnngbP2pz2VI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 23 Oct 2019 16:52:58 +0300 Message-Id: <20191023135258.32256-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023135258.32256-1-laurent.pinchart@ideasonboard.com> References: <20191023135258.32256-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/4] libcamera: Standardise on C compatibility headers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2019 13:54:01 -0000 Now that our usage of C compatibility header is documented, use them consistently through the source code. While at it, group the C and C++ include statements, and fix a handful of #include ordering issues. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/timer.h | 2 +- src/cam/capture.cpp | 2 +- src/cam/options.cpp | 2 +- src/ipa/rkisp1/rkisp1.cpp | 2 +- src/libcamera/device_enumerator_udev.cpp | 5 ++--- src/libcamera/include/event_dispatcher_poll.h | 4 ++-- src/libcamera/include/ipc_unixsocket.h | 2 +- src/libcamera/log.cpp | 6 +++--- src/libcamera/media_device.cpp | 3 +-- src/libcamera/media_object.cpp | 3 +-- src/libcamera/stream.cpp | 2 +- test/ipa/ipa_interface_test.cpp | 3 +-- test/media_device/media_device_print_test.cpp | 2 +- test/pipeline/ipu3/ipu3_pipeline_test.cpp | 1 - test/v4l2_subdevice/test_formats.cpp | 2 +- test/v4l2_videodevice/capture_async.cpp | 4 ++-- test/v4l2_videodevice/controls.cpp | 2 +- test/v4l2_videodevice/formats.cpp | 2 +- 18 files changed, 22 insertions(+), 27 deletions(-) diff --git a/include/libcamera/timer.h b/include/libcamera/timer.h index 34e7b8ac8e87..f55fe3c09660 100644 --- a/include/libcamera/timer.h +++ b/include/libcamera/timer.h @@ -8,7 +8,7 @@ #define __LIBCAMERA_TIMER_H__ #include -#include +#include #include #include diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp index 8a939c622703..d05c01f1b13e 100644 --- a/src/cam/capture.cpp +++ b/src/cam/capture.cpp @@ -6,9 +6,9 @@ */ #include -#include #include #include +#include #include #include "capture.h" diff --git a/src/cam/options.cpp b/src/cam/options.cpp index 7c3948df3b5c..1f0631eccfba 100644 --- a/src/cam/options.cpp +++ b/src/cam/options.cpp @@ -5,7 +5,7 @@ * options.cpp - cam - Options parsing */ -#include +#include #include #include #include diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 570145ce71b2..9a13f5c7df17 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -6,9 +6,9 @@ */ #include -#include #include #include +#include #include #include diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index ddcd59ea52c1..b2c5fd221dcd 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -8,11 +8,10 @@ #include "device_enumerator_udev.h" #include -#include -#include - #include #include +#include +#include #include #include #include diff --git a/src/libcamera/include/event_dispatcher_poll.h b/src/libcamera/include/event_dispatcher_poll.h index d82b302c4aea..1f0738617425 100644 --- a/src/libcamera/include/event_dispatcher_poll.h +++ b/src/libcamera/include/event_dispatcher_poll.h @@ -7,12 +7,12 @@ #ifndef __LIBCAMERA_EVENT_DISPATCHER_POLL_H__ #define __LIBCAMERA_EVENT_DISPATCHER_POLL_H__ -#include - #include #include #include +#include + struct pollfd; namespace libcamera { diff --git a/src/libcamera/include/ipc_unixsocket.h b/src/libcamera/include/ipc_unixsocket.h index 03e9fe492bde..820d05611049 100644 --- a/src/libcamera/include/ipc_unixsocket.h +++ b/src/libcamera/include/ipc_unixsocket.h @@ -8,7 +8,7 @@ #ifndef __LIBCAMERA_IPC_UNIXSOCKET_H__ #define __LIBCAMERA_IPC_UNIXSOCKET_H__ -#include +#include #include #include diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index 51f9f86b4c44..50f345b98c74 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -7,14 +7,14 @@ #include "log.h" -#include -#include -#include #include #include #include +#include +#include #include #include +#include #include #include diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index bd99deba098d..0d6630fbd1f4 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -9,11 +9,10 @@ #include #include +#include #include #include #include - -#include #include #include diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index 8794ff4578c9..ef32065c161d 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -8,10 +8,9 @@ #include "media_object.h" #include +#include #include #include - -#include #include #include diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index 610920d1e5b3..b8e7209c1047 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include #include diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 0bdeb167a675..cafc249bbbc9 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -6,13 +6,12 @@ */ #include +#include #include #include #include #include -#include - #include #include #include diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index 30d929b8c763..8dd8a151266d 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -4,8 +4,8 @@ * * media_device_print_test.cpp - Print out media devices */ -#include +#include #include #include #include diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp index 8bfcd609a071..a5c6be0955df 100644 --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp @@ -6,7 +6,6 @@ */ #include - #include #include #include diff --git a/test/v4l2_subdevice/test_formats.cpp b/test/v4l2_subdevice/test_formats.cpp index e90c2c2426da..5cf5d5664b04 100644 --- a/test/v4l2_subdevice/test_formats.cpp +++ b/test/v4l2_subdevice/test_formats.cpp @@ -5,8 +5,8 @@ * libcamera V4L2 Subdevice format handling test */ -#include #include +#include #include "v4l2_subdevice.h" #include "v4l2_subdevice_test.h" diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index 17eb528b12fd..442a4fe56eac 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -5,12 +5,12 @@ * libcamera V4L2 API tests */ +#include + #include #include #include -#include - #include "thread.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 975c852b8cbf..42c653d4435a 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -5,8 +5,8 @@ * controls.cpp - V4L2 device controls handling test */ -#include #include +#include #include "v4l2_videodevice.h" diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp index ee7d357de075..d504d1788d02 100644 --- a/test/v4l2_videodevice/formats.cpp +++ b/test/v4l2_videodevice/formats.cpp @@ -5,8 +5,8 @@ * libcamera V4L2 device format handling test */ -#include #include +#include #include "v4l2_videodevice.h"