summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2021-07-12 11:02:02 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-07-12 15:56:57 +0300
commitace5e21feba28cf43461375312f09c29230df370 (patch)
tree47a63d42c5787ddeeac91e08a685b99c7ee1398d
parent6a31a8d8e2742990f3b3a3dbf5157a9e1cb835ea (diff)
ipa: raspberrypi: Make device_status.h C++ only header, and update comments
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@raspberrypi.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/ipa/raspberrypi/controller/device_status.h24
1 files changed, 9 insertions, 15 deletions
diff --git a/src/ipa/raspberrypi/controller/device_status.h b/src/ipa/raspberrypi/controller/device_status.h
index f7423524..733378db 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