aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2011-10-04 07:20:05 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 07:35:24 -0400
commit8c9d236ec64f1f1e7764385e7b5eae88eec7c02b (patch)
tree89f5610e7db1e0c226383b641b0309e7481fb100 /drivers
parent6016af82eafcb6e086a8f2a2197b46029a843d68 (diff)
[media] v4l: Image source control class
Add image source control class. This control class is intended to contain low level controls which deal with control of the image capture process --- the A/D converter in image sensors, for example. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/v4l2-ctrls.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index ae544d870d7d..7a2f855d4e21 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -644,6 +644,12 @@ const char *v4l2_ctrl_get_name(u32 id)
644 case V4L2_CID_JPEG_COMPRESSION_QUALITY: return "Compression Quality"; 644 case V4L2_CID_JPEG_COMPRESSION_QUALITY: return "Compression Quality";
645 case V4L2_CID_JPEG_ACTIVE_MARKER: return "Active Markers"; 645 case V4L2_CID_JPEG_ACTIVE_MARKER: return "Active Markers";
646 646
647 /* Image source controls */
648 case V4L2_CID_IMAGE_SOURCE_CLASS: return "Image Source Controls";
649 case V4L2_CID_VBLANK: return "Vertical Blanking";
650 case V4L2_CID_HBLANK: return "Horizontal Blanking";
651 case V4L2_CID_ANALOGUE_GAIN: return "Analogue Gain";
652
647 default: 653 default:
648 return NULL; 654 return NULL;
649 } 655 }
@@ -745,6 +751,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
745 case V4L2_CID_FM_TX_CLASS: 751 case V4L2_CID_FM_TX_CLASS:
746 case V4L2_CID_FLASH_CLASS: 752 case V4L2_CID_FLASH_CLASS:
747 case V4L2_CID_JPEG_CLASS: 753 case V4L2_CID_JPEG_CLASS:
754 case V4L2_CID_IMAGE_SOURCE_CLASS:
748 *type = V4L2_CTRL_TYPE_CTRL_CLASS; 755 *type = V4L2_CTRL_TYPE_CTRL_CLASS;
749 /* You can neither read not write these */ 756 /* You can neither read not write these */
750 *flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY; 757 *flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY;