aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.lad@ti.com>2012-10-01 07:17:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 20:44:26 -0400
commit5ebef0fbe0f72fa911088800c5d0bc7a872c35de (patch)
tree02b76cf6fc36c613da5a2e7139189f416f656ba9 /drivers/media/v4l2-core
parentab7ef22419927910e563170db41f0a428d20b0a2 (diff)
[media] media: v4l2-ctrls: add control for test pattern
add V4L2_CID_TEST_PATTERN of type menu, which determines the internal test pattern selected by the device. Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-ctrls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 631cdc0e0bda..0bcef2b52cb1 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -749,6 +749,7 @@ const char *v4l2_ctrl_get_name(u32 id)
749 case V4L2_CID_IMAGE_PROC_CLASS: return "Image Processing Controls"; 749 case V4L2_CID_IMAGE_PROC_CLASS: return "Image Processing Controls";
750 case V4L2_CID_LINK_FREQ: return "Link Frequency"; 750 case V4L2_CID_LINK_FREQ: return "Link Frequency";
751 case V4L2_CID_PIXEL_RATE: return "Pixel Rate"; 751 case V4L2_CID_PIXEL_RATE: return "Pixel Rate";
752 case V4L2_CID_TEST_PATTERN: return "Test Pattern";
752 753
753 /* DV controls */ 754 /* DV controls */
754 case V4L2_CID_DV_CLASS: return "Digital Video Controls"; 755 case V4L2_CID_DV_CLASS: return "Digital Video Controls";
@@ -862,6 +863,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
862 case V4L2_CID_DV_TX_MODE: 863 case V4L2_CID_DV_TX_MODE:
863 case V4L2_CID_DV_TX_RGB_RANGE: 864 case V4L2_CID_DV_TX_RGB_RANGE:
864 case V4L2_CID_DV_RX_RGB_RANGE: 865 case V4L2_CID_DV_RX_RGB_RANGE:
866 case V4L2_CID_TEST_PATTERN:
865 *type = V4L2_CTRL_TYPE_MENU; 867 *type = V4L2_CTRL_TYPE_MENU;
866 break; 868 break;
867 case V4L2_CID_LINK_FREQ: 869 case V4L2_CID_LINK_FREQ: