From: Dr. Werner Fink Driver support for live-ac3, firmware >= 2621 required. Signed-off-by: Dr. Werner Fink Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/dvb/ttpci/av7110.c | 9 +++++++-- drivers/media/dvb/ttpci/av7110_av.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff -puN drivers/media/dvb/ttpci/av7110_av.c~dvb-2441-driver-support-for-live-ac3-firmware-= drivers/media/dvb/ttpci/av7110_av.c --- devel/drivers/media/dvb/ttpci/av7110_av.c~dvb-2441-driver-support-for-live-ac3-firmware-= 2005-12-22 05:09:50.000000000 -0800 +++ devel-akpm/drivers/media/dvb/ttpci/av7110_av.c 2005-12-22 05:09:50.000000000 -0800 @@ -1256,7 +1256,9 @@ static int dvb_audio_ioctl(struct inode 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 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: diff -puN drivers/media/dvb/ttpci/av7110.c~dvb-2441-driver-support-for-live-ac3-firmware-= drivers/media/dvb/ttpci/av7110.c --- devel/drivers/media/dvb/ttpci/av7110.c~dvb-2441-driver-support-for-live-ac3-firmware-= 2005-12-22 05:09:50.000000000 -0800 +++ devel-akpm/drivers/media/dvb/ttpci/av7110.c 2005-12-22 05:09:50.000000000 -0800 @@ -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->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, _