1 files changed, 80 insertions, 5 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 78d28b03ec93..752c82c37f55 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -87,6 +87,78 @@ MODULE_LICENSE("GPL");
 */
+char *v4l2_norm_to_name(v4l2_std_id id)
+{
+        char *name;
+        switch (id) {
+        case V4L2_STD_PAL:
+                name="PAL";             break;
+        case V4L2_STD_PAL_BG:
+                name="PAL-BG";          break;
+        case V4L2_STD_PAL_DK:
+                name="PAL-DK";          break;
+        case V4L2_STD_PAL_B:
+                name="PAL-B";           break;
+        case V4L2_STD_PAL_B1:
+                name="PAL-B1";          break;
+        case V4L2_STD_PAL_G:
+                name="PAL-G";           break;
+        case V4L2_STD_PAL_H:
+                name="PAL-H";           break;
+        case V4L2_STD_PAL_I:
+                name="PAL-I";           break;
+        case V4L2_STD_PAL_D:
+                name="PAL-D";           break;
+        case V4L2_STD_PAL_D1:
+                name="PAL-D1";          break;
+        case V4L2_STD_PAL_K:
+                name="PAL-K";           break;
+        case V4L2_STD_PAL_M:
+                name="PAL-M";           break;
+        case V4L2_STD_PAL_N:
+                name="PAL-N";           break;
+        case V4L2_STD_PAL_Nc:
+                name="PAL-Nc";          break;
+        case V4L2_STD_PAL_60:
+                name="PAL-60";          break;
+        case V4L2_STD_NTSC:
+                name="NTSC";            break;
+        case V4L2_STD_NTSC_M:
+                name="NTSC-M";          break;
+        case V4L2_STD_NTSC_M_JP:
+                name="NTSC-M-JP";       break;
+        case V4L2_STD_NTSC_443:
+                name="NTSC-443";        break;
+        case V4L2_STD_NTSC_M_KR:
+                name="NTSC-M-KR";       break;
+        case V4L2_STD_SECAM:
+                name="SECAM";           break;
+        case V4L2_STD_SECAM_DK:
+                name="SECAM-DK";        break;
+        case V4L2_STD_SECAM_B:
+                name="SECAM-B";         break;
+        case V4L2_STD_SECAM_D:
+                name="SECAM-D";         break;
+        case V4L2_STD_SECAM_G:
+                name="SECAM-G";         break;
+        case V4L2_STD_SECAM_H:
+                name="SECAM-H";         break;
+        case V4L2_STD_SECAM_K:
+                name="SECAM-K";         break;
+        case V4L2_STD_SECAM_K1:
+                name="SECAM-K1";        break;
+        case V4L2_STD_SECAM_L:
+                name="SECAM-L";         break;
+        case V4L2_STD_SECAM_LC:
+                name="SECAM-LC";        break;
+        default:
+                name="Unknown";         break;
+        }
+        return name;
+}
 /* Fill in the fields of a v4l2_standard structure according to the
   'id' and 'transmission' parameters.  Returns negative on error.  */
 int v4l2_video_std_construct(struct v4l2_standard *vs,
@@ -184,11 +256,13 @@ char *v4l2_field_names[] = {
 };
 char *v4l2_type_names[] = {
-        [V4L2_BUF_TYPE_VIDEO_CAPTURE] = "video-cap",
+        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "video-cap",
-        [V4L2_BUF_TYPE_VIDEO_OVERLAY] = "video-over",
+        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "video-over",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT]  = "video-out",
+        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "video-out",
-        [V4L2_BUF_TYPE_VBI_CAPTURE]   = "vbi-cap",
+        [V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",
-        [V4L2_BUF_TYPE_VBI_OUTPUT]    = "vbi-out",
+        [V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",
+        [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap",
+        [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "slicec-vbi-out",
 };
 static char *v4l2_memory_names[] = {
@@ -1451,6 +1525,7 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)
 /* ----------------------------------------------------------------- */
+EXPORT_SYMBOL(v4l2_norm_to_name);
 EXPORT_SYMBOL(v4l2_video_std_construct);
 EXPORT_SYMBOL(v4l2_prio_init);

diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 78d28b03ec93..752c82c37f55 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c
@@ -87,6 +87,78 @@ MODULE_LICENSE("GPL");
87	*/	87	*/
88		88
89		89
		90	char *v4l2_norm_to_name(v4l2_std_id id)
		91	{
		92	char *name;
		93
		94	switch (id) {
		95	case V4L2_STD_PAL:
		96	name="PAL"; break;
		97	case V4L2_STD_PAL_BG:
		98	name="PAL-BG"; break;
		99	case V4L2_STD_PAL_DK:
		100	name="PAL-DK"; break;
		101	case V4L2_STD_PAL_B:
		102	name="PAL-B"; break;
		103	case V4L2_STD_PAL_B1:
		104	name="PAL-B1"; break;
		105	case V4L2_STD_PAL_G:
		106	name="PAL-G"; break;
		107	case V4L2_STD_PAL_H:
		108	name="PAL-H"; break;
		109	case V4L2_STD_PAL_I:
		110	name="PAL-I"; break;
		111	case V4L2_STD_PAL_D:
		112	name="PAL-D"; break;
		113	case V4L2_STD_PAL_D1:
		114	name="PAL-D1"; break;
		115	case V4L2_STD_PAL_K:
		116	name="PAL-K"; break;
		117	case V4L2_STD_PAL_M:
		118	name="PAL-M"; break;
		119	case V4L2_STD_PAL_N:
		120	name="PAL-N"; break;
		121	case V4L2_STD_PAL_Nc:
		122	name="PAL-Nc"; break;
		123	case V4L2_STD_PAL_60:
		124	name="PAL-60"; break;
		125	case V4L2_STD_NTSC:
		126	name="NTSC"; break;
		127	case V4L2_STD_NTSC_M:
		128	name="NTSC-M"; break;
		129	case V4L2_STD_NTSC_M_JP:
		130	name="NTSC-M-JP"; break;
		131	case V4L2_STD_NTSC_443:
		132	name="NTSC-443"; break;
		133	case V4L2_STD_NTSC_M_KR:
		134	name="NTSC-M-KR"; break;
		135	case V4L2_STD_SECAM:
		136	name="SECAM"; break;
		137	case V4L2_STD_SECAM_DK:
		138	name="SECAM-DK"; break;
		139	case V4L2_STD_SECAM_B:
		140	name="SECAM-B"; break;
		141	case V4L2_STD_SECAM_D:
		142	name="SECAM-D"; break;
		143	case V4L2_STD_SECAM_G:
		144	name="SECAM-G"; break;
		145	case V4L2_STD_SECAM_H:
		146	name="SECAM-H"; break;
		147	case V4L2_STD_SECAM_K:
		148	name="SECAM-K"; break;
		149	case V4L2_STD_SECAM_K1:
		150	name="SECAM-K1"; break;
		151	case V4L2_STD_SECAM_L:
		152	name="SECAM-L"; break;
		153	case V4L2_STD_SECAM_LC:
		154	name="SECAM-LC"; break;
		155	default:
		156	name="Unknown"; break;
		157	}
		158
		159	return name;
		160	}
		161
90	/* Fill in the fields of a v4l2_standard structure according to the	162	/* Fill in the fields of a v4l2_standard structure according to the
91	'id' and 'transmission' parameters. Returns negative on error. */	163	'id' and 'transmission' parameters. Returns negative on error. */
92	int v4l2_video_std_construct(struct v4l2_standard *vs,	164	int v4l2_video_std_construct(struct v4l2_standard *vs,
@@ -184,11 +256,13 @@ char *v4l2_field_names[] = {
184	};	256	};
185		257
186	char *v4l2_type_names[] = {	258	char *v4l2_type_names[] = {
187	[V4L2_BUF_TYPE_VIDEO_CAPTURE] = "video-cap",	259	[V4L2_BUF_TYPE_VIDEO_CAPTURE] = "video-cap",
188	[V4L2_BUF_TYPE_VIDEO_OVERLAY] = "video-over",	260	[V4L2_BUF_TYPE_VIDEO_OVERLAY] = "video-over",
189	[V4L2_BUF_TYPE_VIDEO_OUTPUT] = "video-out",	261	[V4L2_BUF_TYPE_VIDEO_OUTPUT] = "video-out",
190	[V4L2_BUF_TYPE_VBI_CAPTURE] = "vbi-cap",	262	[V4L2_BUF_TYPE_VBI_CAPTURE] = "vbi-cap",
191	[V4L2_BUF_TYPE_VBI_OUTPUT] = "vbi-out",	263	[V4L2_BUF_TYPE_VBI_OUTPUT] = "vbi-out",
		264	[V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap",
		265	[V4L2_BUF_TYPE_SLICED_VBI_OUTPUT] = "slicec-vbi-out",
192	};	266	};
193		267
194	static char *v4l2_memory_names[] = {	268	static char *v4l2_memory_names[] = {
@@ -1451,6 +1525,7 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)
1451		1525
1452	/* ----------------------------------------------------------------- */	1526	/* ----------------------------------------------------------------- */
1453		1527
		1528	EXPORT_SYMBOL(v4l2_norm_to_name);
1454	EXPORT_SYMBOL(v4l2_video_std_construct);	1529	EXPORT_SYMBOL(v4l2_video_std_construct);
1455		1530
1456	EXPORT_SYMBOL(v4l2_prio_init);	1531	EXPORT_SYMBOL(v4l2_prio_init);