[libcamera-devel] [PATCH v5 1/8] ipa: raspberrypi: Make device_status.h C++ only header, and update comments

Naushir Patuck naush at raspberrypi.com
Fri Jul 9 11:56:31 CEST 2021


This header file is no longer C compatible, so remove the extern "C"
declaration.

Replace C++ style comments with C style based on libcamera guidelines.

There are no functional changes in this commit.

Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
Reviewed-by: David Plowman <david.plowman at raspberrypi.com>
---
 .../raspberrypi/controller/device_status.h    | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/ipa/raspberrypi/controller/device_status.h b/src/ipa/raspberrypi/controller/device_status.h
index f74235248b12..733378dbfa27 100644
--- a/src/ipa/raspberrypi/controller/device_status.h
+++ b/src/ipa/raspberrypi/controller/device_status.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 /*
- * Copyright (C) 2019, Raspberry Pi (Trading) Limited
+ * Copyright (C) 2019-2021, Raspberry Pi (Trading) Limited
  *
  * device_status.h - device (image sensor) status
  */
@@ -8,25 +8,19 @@
 
 #include <libcamera/base/utils.h>
 
-// Definition of "device metadata" which stores things like shutter time and
-// analogue gain that downstream control algorithms will want to know.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+/*
+ * Definition of "device metadata" which stores things like shutter time and
+ * analogue gain that downstream control algorithms will want to know.
+ */
 
 struct DeviceStatus {
-	// time shutter is open
+	/* time shutter is open */
 	libcamera::utils::Duration shutter_speed;
 	double analogue_gain;
-	// 1.0/distance-in-metres, or 0 if unknown
+	/* 1.0/distance-in-metres, or 0 if unknown */
 	double lens_position;
-	// 1/f so that brightness quadruples when this doubles, or 0 if unknown
+	/* 1/f so that brightness quadruples when this doubles, or 0 if unknown */
 	double aperture;
-	// proportional to brightness with 0 = no flash, 1 = maximum flash
+	/* proportional to brightness with 0 = no flash, 1 = maximum flash */
 	double flash_intensity;
 };
-
-#ifdef __cplusplus
-}
-#endif
-- 
2.25.1



More information about the libcamera-devel mailing list