DVB (2441): Driver support for live-ac3, firmware >= 2621 required.

- Driver support for live-ac3, firmware >= 2621 required.

Signed-off-by: Dr. Werner Fink <werner@suse.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

2 files changed, 15 insertions, 4 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 240451dcd8b8..8fa487fb507b 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -720,6 +720,8 @@ static struct dvb_device dvbdev_osd = {
 static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
                           u16 subpid, u16 pcrpid)
 {
+        u16 aflags = 0;
+
         dprintk(4, "%p\n", av7110);
 
         if (vpid == 0x1fff || apid == 0x1fff ||
@@ -731,8 +733,11 @@ static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
                 av7110->pids[DMX_PES_PCR] = 0;
         }
 
-        return av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, MultiPID, 5,
-                             pcrpid, vpid, apid, ttpid, subpid);
+        if (av7110->audiostate.bypass_mode)
+                aflags |= 0x8000;
+
+        return av7110_fw_cmd(av7110, COMTYPE_PIDFILTER, MultiPID, 6,
+                             pcrpid, vpid, apid, ttpid, subpid, aflags);
 }
 
 int ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 2d26ff316fe6..400facec7407 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -1256,7 +1256,9 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case AUDIO_SET_BYPASS_MODE:
-                ret = -EINVAL;
+                if (FW_VERSION(av7110->arm_app) < 0x2621)
+                        ret = -EINVAL;
+                av7110->audiostate.bypass_mode = (int)arg;
                 break;
 
         case AUDIO_CHANNEL_SELECT:
@@ -1295,7 +1297,11 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
                 break;
 
         case AUDIO_GET_CAPABILITIES:
-                *(int *)parg = AUDIO_CAP_LPCM | AUDIO_CAP_MP1 | AUDIO_CAP_MP2;
+                if (FW_VERSION(av7110->arm_app) < 0x2621)
+                        *(unsigned int *)parg = AUDIO_CAP_LPCM | AUDIO_CAP_MP1 | AUDIO_CAP_MP2;
+                else
+                        *(unsigned int *)parg = AUDIO_CAP_LPCM | AUDIO_CAP_DTS | AUDIO_CAP_AC3 |
+                                                AUDIO_CAP_MP1 | AUDIO_CAP_MP2;
                 break;
 
         case AUDIO_CLEAR_BUFFER: