DVB Update [PATCH 18/31] make DVBFE_GET_INFO backward compatible
Quoted 1 line
From
2bffadf07b54a3ee47164b65687d673175f14bacMon Sep 17 00:00:00 2001
From: Manu Abraham <[email protected]>
Date: Thu, 4 Sep 2008 14:09:26 +0200
Subject: [PATCH] DVB Make DVBFE_GET_INFO as well backward compatible.
DVBFE_GET_INFO ioctl was not backward compatible. The patch fixes the issue.
From: Marco Schluessler <[email protected]>
Signed-off-by Marco Schluessler <[email protected]>
Signed-off-by Manu Abraham <[email protected]>
dvb_frontend.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)
Quoted 1 line
From
2bffadf07b54a3ee47164b65687d673175f14bacMon Sep 17 00:00:00 2001
From: Manu Abraham <[email protected]>
Date: Thu, 4 Sep 2008 14:09:26 +0200
Subject: [PATCH] DVB Make DVBFE_GET_INFO as well backward compatible.
DVBFE_GET_INFO ioctl was not backward compatible. The patch fixes the issue.
From: Marco Schluessler <[email protected]>
Signed-off-by Marco Schluessler <[email protected]>
Signed-off-by Manu Abraham <[email protected]>
drivers/media/dvb/dvb-core/dvb_frontend.c +63 -1
@@ -1859,7 +1859,69 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, err = fe->ops.get_info (fe, &fepriv->fe_info);memcpy ((struct dvbfe_info *) parg, &fepriv->fe_info,sizeof (struct dvbfe_info )); }else { -memcpy (&fepriv->fe_info, (struct dvbfe_info *) parg,sizeof (struct dvbfe_info )); +memset (&fepriv->fe_info,0 ,sizeof (struct dvbfe_info )); +switch (fe->ops.info.type) { +case FE_QPSK : + fepriv->fe_info.delivery =DVBFE_DELSYS_DVBS ; + fepriv->fe_info.delsys.dvbs.modulation =DVBFE_MOD_QPSK ; +if (fe->ops.info.caps &FE_CAN_FEC_1_2 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_1_2 ; +if (fe->ops.info.caps &FE_CAN_FEC_2_3 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_2_3 ; +if (fe->ops.info.caps &FE_CAN_FEC_3_4 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_3_4 ; +if (fe->ops.info.caps &FE_CAN_FEC_4_5 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_4_5 ; +if (fe->ops.info.caps &FE_CAN_FEC_5_6 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_5_6 ; +if (fe->ops.info.caps &FE_CAN_FEC_6_7 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_6_7 ; +if (fe->ops.info.caps &FE_CAN_FEC_7_8 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_7_8 ; +if (fe->ops.info.caps &FE_CAN_FEC_8_9 ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_8_9 ; +if (fe->ops.info.caps &FE_CAN_FEC_AUTO ) + fepriv->fe_info.delsys.dvbs.fec |=DVBFE_FEC_AUTO ; +break ; +case FE_QAM : + fepriv->fe_info.delivery =DVBFE_DELSYS_DVBC ; +if (fe->ops.info.caps &FE_CAN_QAM_16 ) + fepriv->fe_info.delsys.dvbc.modulation |=DVBFE_MOD_QAM16 ; +if (fe->ops.info.caps &FE_CAN_QAM_32 ) + fepriv->fe_info.delsys.dvbc.modulation |=DVBFE_MOD_QAM32 ; +if (fe->ops.info.caps &FE_CAN_QAM_64 ) + fepriv->fe_info.delsys.dvbc.modulation |=DVBFE_MOD_QAM64 ; +if (fe->ops.info.caps &FE_CAN_QAM_128 ) + fepriv->fe_info.delsys.dvbc.modulation |=DVBFE_MOD_QAM128 ; +if (fe->ops.info.caps &FE_CAN_QAM_256 ) + fepriv->fe_info.delsys.dvbc.modulation |=DVBFE_MOD_QAM256 ; +if (fe->ops.info.caps &FE_CAN_QAM_AUTO ) + fepriv->fe_info.delsys.dvbc.modulation |=DVBFE_MOD_QAMAUTO ; +break ; +case FE_OFDM : + fepriv->fe_info.delivery =DVBFE_DELSYS_DVBT ; +if (fe->ops.info.caps &FE_CAN_QPSK ) + fepriv->fe_info.delsys.dvbt.modulation |=DVBFE_MOD_QPSK ; +if (fe->ops.info.caps &FE_CAN_QAM_16 ) + fepriv->fe_info.delsys.dvbt.modulation |=DVBFE_MOD_QAM16 ; +if (fe->ops.info.caps &FE_CAN_QAM_64 ) + fepriv->fe_info.delsys.dvbt.modulation |=DVBFE_MOD_QAM64 ; +if (fe->ops.info.caps &FE_CAN_QAM_AUTO ) + fepriv->fe_info.delsys.dvbt.modulation |=DVBFE_MOD_QAMAUTO ; +break ; +default : +up (&fepriv->sem); +return -EINVAL ; + } +memcpy (&fepriv->fe_info.name, &fe->ops.info.name,128 ); + fepriv->fe_info.frequency_min = fe->ops.info.frequency_min; + fepriv->fe_info.frequency_max = fe->ops.info.frequency_max; + fepriv->fe_info.frequency_step = fe->ops.info.frequency_stepsize; + fepriv->fe_info.symbol_rate_min = fe->ops.info.symbol_rate_min; + fepriv->fe_info.symbol_rate_max = fe->ops.info.symbol_rate_max; + fepriv->fe_info.symbol_rate_tolerance = fe->ops.info.symbol_rate_tolerance; + +memcpy ((struct dvbfe_info *) parg, &fepriv->fe_info,sizeof (struct dvbfe_info )); err =0 ; }break ;