drivers: video: controls: rename controls to Linux-like names

This uses Linux V4L2 controls as a reference to give names to the CIDs. Apply the renaming down to the drivers that use them. Signed-off-by: Josuah Demangeon <[email protected]>
zephyrproject-rtos · Oct 3, 2024 · b5f04d0 · b5f04d0
1 parent bf76277
commit b5f04d0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
@@ -939,28 +939,28 @@ static int ov2640_set_ctrl(const struct device *dev,
 	case VIDEO_CID_VFLIP:
 		ret |= ov2640_set_vertical_flip(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_EXPOSURE:
+	case VIDEO_CID_EXPOSURE:
 		ret |= ov2640_set_exposure_ctrl(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_GAIN:
+	case VIDEO_CID_GAIN:
 		ret |= ov2640_set_gain_ctrl(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_BRIGHTNESS:
+	case VIDEO_CID_BRIGHTNESS:
 		ret |= ov2640_set_brightness(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_SATURATION:
+	case VIDEO_CID_SATURATION:
 		ret |= ov2640_set_saturation(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_WHITE_BAL:
+	case VIDEO_CID_WHITE_BALANCE_TEMPERATURE:
 		ret |= ov2640_set_white_bal(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_CONTRAST:
+	case VIDEO_CID_CONTRAST:
 		ret |= ov2640_set_contrast(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_COLORBAR:
+	case VIDEO_CID_TEST_PATTERN:
 		ret |= ov2640_set_colorbar(dev, (int)value);
 		break;
-	case VIDEO_CID_CAMERA_QUALITY:
+	case VIDEO_CID_JPEG_COMPRESSION_QUALITY:
 		ret |= ov2640_set_quality(dev, (int)value);
 		break;
 	default:

diff --git a/include/zephyr/drivers/video-controls.h b/include/zephyr/drivers/video-controls.h
@@ -61,14 +61,14 @@ extern "C" {
  * @name Base class control IDs
  * @{
  */
-#define VIDEO_CID_CAMERA_BRIGHTNESS	(VIDEO_CTRL_CLASS_BASE + 0)
-#define VIDEO_CID_CAMERA_CONTRAST	(VIDEO_CTRL_CLASS_BASE + 1)
-#define VIDEO_CID_CAMERA_SATURATION	(VIDEO_CTRL_CLASS_BASE + 2)
-#define VIDEO_CID_CAMERA_EXPOSURE	(VIDEO_CTRL_CLASS_BASE + 17)
-#define VIDEO_CID_CAMERA_GAIN		(VIDEO_CTRL_CLASS_BASE + 19)
-#define VIDEO_CID_HFLIP			(VIDEO_CTRL_CLASS_BASE + 20)
-#define VIDEO_CID_VFLIP			(VIDEO_CTRL_CLASS_BASE + 21)
-#define VIDEO_CID_CAMERA_WHITE_BAL	(VIDEO_CTRL_CLASS_BASE + 26)
+#define VIDEO_CID_BRIGHTNESS			(VIDEO_CTRL_CLASS_BASE + 0)
+#define VIDEO_CID_CONTRAST			(VIDEO_CTRL_CLASS_BASE + 1)
+#define VIDEO_CID_SATURATION			(VIDEO_CTRL_CLASS_BASE + 2)
+#define VIDEO_CID_EXPOSURE			(VIDEO_CTRL_CLASS_BASE + 17)
+#define VIDEO_CID_GAIN				(VIDEO_CTRL_CLASS_BASE + 19)
+#define VIDEO_CID_HFLIP				(VIDEO_CTRL_CLASS_BASE + 20)
+#define VIDEO_CID_VFLIP				(VIDEO_CTRL_CLASS_BASE + 21)
+#define VIDEO_CID_WHITE_BALANCE_TEMPERATURE	(VIDEO_CTRL_CLASS_BASE + 26)
 /**
  * @}
  */
@@ -77,7 +77,7 @@ extern "C" {
  * @name Camera class controls IDs
  * @{
  */
-#define VIDEO_CID_CAMERA_ZOOM		(VIDEO_CTRL_CLASS_CAMERA_BASE + 13)
+#define VIDEO_CID_ZOOM_ABSOLUTE			(VIDEO_CTRL_CLASS_CAMERA_BASE + 13)
 /**
  * @}
  */
@@ -86,7 +86,7 @@ extern "C" {
  * @name JPEG class control IDs
  * @{
  */
-#define VIDEO_CID_CAMERA_QUALITY	(VIDEO_CTRL_CLASS_JPEG_BASE + 3)
+#define VIDEO_CID_JPEG_COMPRESSION_QUALITY	(VIDEO_CTRL_CLASS_JPEG_BASE + 3)
 /**
  * @}
  */
@@ -95,7 +95,7 @@ extern "C" {
  * @name Image Processing class control IDs
  * @{
  */
-#define VIDEO_CID_CAMERA_COLORBAR	(VIDEO_CTRL_CLASS_IMAGE_PROC_BASE + 3)
+#define VIDEO_CID_TEST_PATTERN			(VIDEO_CTRL_CLASS_IMAGE_PROC_BASE + 3)
 /**
  * @}
  */