V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18

Initial addition of controls to set AC-3 audio encoding for the CX23418 - it
does not work yet due to firmware or cx18 driver issues.  This change affects
the common cx2341x and ivtv modules due to shared structures and
common functions.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index f50cf2167adc..f9df3cc5aa3d 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -587,7 +587,8 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
                 (cx->params.video_temporal_filter_mode << 1) |
                 (cx->params.video_median_filter_type << 2);
         cx->params.port = CX2341X_PORT_MEMORY;
-        cx->params.capabilities = CX2341X_CAP_HAS_TS;
+        cx->params.capabilities = CX2341X_CAP_HAS_TS   | CX2341X_CAP_HAS_AC3 |
+                                  CX2341X_CAP_HAS_LPCM;
         init_waitqueue_head(&cx->cap_w);
         init_waitqueue_head(&cx->mb_apu_waitq);
         init_waitqueue_head(&cx->mb_cpu_waitq);
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 0d2edebc39b4..36809dd3d848 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -413,7 +413,7 @@ struct cx18 {
 
         /* dualwatch */
         unsigned long dualwatch_jiffies;
-        u16 dualwatch_stereo_mode;
+        u32 dualwatch_stereo_mode;
 
         /* Digitizer type */
         int digitizer;          /* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 055f6e004b2d..863d29db85eb 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -128,10 +128,10 @@ static void cx18_release_stream(struct cx18_stream *s)
 static void cx18_dualwatch(struct cx18 *cx)
 {
         struct v4l2_tuner vt;
-        u16 new_bitmap;
-        u16 new_stereo_mode;
-        const u16 stereo_mask = 0x0300;
-        const u16 dual = 0x0200;
+        u32 new_bitmap;
+        u32 new_stereo_mode;
+        const u32 stereo_mask = 0x0300;
+        const u32 dual = 0x0200;
         u32 h;
 
         new_stereo_mode = cx->params.audio_properties & stereo_mask;