The patch number 9170 was added via Steven Toth <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Darron Broad <[EMAIL PROTECTED]>
cx24116: Sanity checking to data input via S2API to the cx24116 demod.
Add some sanity checking to data input via S2API to the cx24116 demod.
This patch is valid for both s2-mfe and s2.
It was found when testing KAFFEINE with S2API support that invalid
modulation modes amongst other parameters were being delivered to
the demod. In order to debug this sanity checking has been added.
An example session would involve kaffeine setting QAM_AUTO when
querying DVB-T, then later when trying to tune to DVB-S this
cached value would be presented in error.
Priority: normal
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
Signed-off-by: Darron Broad <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/frontends/cx24116.c | 89 +++++++++++++++-----
1 file changed, 68 insertions(+), 21 deletions(-)
diff -r 979d14edeb2e -r 70ee86a7c630 linux/drivers/media/dvb/frontends/cx24116.c
--- a/linux/drivers/media/dvb/frontends/cx24116.c Sat Oct 04 21:37:36
2008 -0300
+++ b/linux/drivers/media/dvb/frontends/cx24116.c Fri Oct 03 10:47:46
2008 -0400
@@ -84,7 +84,8 @@ static int debug = 0;
#define CX24116_ROLLOFF_035 (0x02)
/* pilot bit */
-#define CX24116_PILOT (0x40)
+#define CX24116_PILOT_OFF (0x00)
+#define CX24116_PILOT_ON (0x40)
/* signal status */
#define CX24116_HAS_SIGNAL (0x01)
@@ -148,6 +149,7 @@ struct cx24116_tuning
u8 fec_val;
u8 fec_mask;
u8 inversion_val;
+ u8 pilot_val;
u8 rolloff_val;
};
@@ -1138,25 +1140,62 @@ static int cx24116_set_frontend(struct d
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct cx24116_cmd cmd;
fe_status_t tunerstat;
- int i, status, ret, retune = 1;
+ int i, status, ret, retune;
dprintk("%s()\n",__func__);
-
- state->dnxt.modulation = c->modulation;
- state->dnxt.frequency = c->frequency;
switch(c->delivery_system) {
case SYS_DVBS:
dprintk("%s: DVB-S delivery system
selected\n",__func__);
- state->dnxt.pilot = PILOT_OFF;
+
+ /* Only QPSK is supported for DVB-S */
+ if(c->modulation != QPSK) {
+ dprintk("%s: unsupported modulation selected
(%d)\n",
+ __func__, c->modulation);
+ return -EOPNOTSUPP;
+ }
+
+ /* Pilot doesn't exist in DVB-S, turn bit off */
+ state->dnxt.pilot_val = CX24116_PILOT_OFF;
+ retune = 1;
+
+ /* DVB-S only supports 0.35 */
+ if(c->rolloff != ROLLOFF_35) {
+ dprintk("%s: unsupported rolloff selected
(%d)\n",
+ __func__, c->rolloff);
+ return -EOPNOTSUPP;
+ }
state->dnxt.rolloff_val = CX24116_ROLLOFF_035;
- state->dnxt.rolloff = c->rolloff;
break;
+
case SYS_DVBS2:
dprintk("%s: DVB-S2 delivery system
selected\n",__func__);
- if(c->pilot == PILOT_AUTO)
- retune++;
- state->dnxt.pilot = c->pilot;
+
+ /*
+ * NBC 8PSK/QPSK with DVB-S is supported for DVB-S2,
+ * but not hardware auto detection
+ */
+ if(c->modulation != _8PSK && c->modulation != NBC_QPSK)
{
+ dprintk("%s: unsupported modulation selected
(%d)\n",
+ __func__, c->modulation);
+ return -EOPNOTSUPP;
+ }
+
+ switch(c->pilot) {
+ case PILOT_AUTO: /* Not supported but
emulated */
+ retune = 2; /* Fall-through */
+ case PILOT_OFF:
+ state->dnxt.pilot_val =
CX24116_PILOT_OFF;
+ break;
+ case PILOT_ON:
+ state->dnxt.pilot_val =
CX24116_PILOT_ON;
+ break;
+ default:
+ dprintk("%s: unsupported pilot mode
selected (%d)\n",
+ __func__, c->pilot);
+ return -EOPNOTSUPP;
+ }
+
switch(c->rolloff) {
case ROLLOFF_20:
state->dnxt.rolloff_val=
CX24116_ROLLOFF_020;
@@ -1167,20 +1206,28 @@ static int cx24116_set_frontend(struct d
case ROLLOFF_35:
state->dnxt.rolloff_val=
CX24116_ROLLOFF_035;
break;
- case ROLLOFF_AUTO:
+ case ROLLOFF_AUTO: /* Rolloff must be
explicit */
+ default:
+ dprintk("%s: unsupported rolloff
selected (%d)\n",
+ __func__, c->rolloff);
return -EOPNOTSUPP;
}
- state->dnxt.rolloff = c->rolloff;
break;
+
default:
dprintk("%s: unsupported delivery system selected
(%d)\n",
__func__, c->delivery_system);
return -EOPNOTSUPP;
}
+ state->dnxt.modulation = c->modulation;
+ state->dnxt.frequency = c->frequency;
+ state->dnxt.pilot = c->pilot;
+ state->dnxt.rolloff = c->rolloff;
if ((ret = cx24116_set_inversion(state, c->inversion)) != 0)
return ret;
+ /* FEC_NONE/AUTO for DVB-S2 is not supported and detected here */
if ((ret = cx24116_set_fec(state, c->modulation, c->fec_inner)) != 0)
return ret;
@@ -1190,10 +1237,13 @@ static int cx24116_set_frontend(struct d
/* discard the 'current' tuning parameters and prepare to tune */
cx24116_clone_params(fe);
+ dprintk("%s: modulation = %d\n", __func__, state->dcur.modulation);
+ dprintk("%s: frequency = %d\n", __func__, state->dcur.frequency);
+ dprintk("%s: pilot = %d (val = 0x%02x)\n", __func__,
+ state->dcur.pilot, state->dcur.pilot_val);
dprintk("%s: retune = %d\n", __func__, retune);
- dprintk("%s: rolloff = %d\n", __func__, state->dcur.rolloff);
- dprintk("%s: pilot = %d\n", __func__, state->dcur.pilot);
- dprintk("%s: frequency = %d\n", __func__, state->dcur.frequency);
+ dprintk("%s: rolloff = %d (val = 0x%02x)\n", __func__,
+ state->dcur.rolloff, state->dcur.rolloff_val);
dprintk("%s: symbol_rate = %d\n", __func__, state->dcur.symbol_rate);
dprintk("%s: FEC = %d (mask/val = 0x%02x/0x%02x)\n", __func__,
state->dcur.fec, state->dcur.fec_mask, state->dcur.fec_val);
@@ -1227,11 +1277,8 @@ static int cx24116_set_frontend(struct d
/* Automatic Inversion */
cmd.args[0x06] = state->dcur.inversion_val;
- /* Modulation / FEC & Pilot Off */
- cmd.args[0x07] = state->dcur.fec_val;
-
- if (state->dcur.pilot == PILOT_ON)
- cmd.args[0x07] |= CX24116_PILOT;
+ /* Modulation / FEC / Pilot */
+ cmd.args[0x07] = state->dcur.fec_val | state->dcur.pilot_val;
cmd.args[0x08] = CX24116_SEARCH_RANGE_KHZ >> 8;
cmd.args[0x09] = CX24116_SEARCH_RANGE_KHZ & 0xff;
@@ -1294,7 +1341,7 @@ static int cx24116_set_frontend(struct d
/* Toggle pilot bit when in auto-pilot */
if(state->dcur.pilot == PILOT_AUTO)
- cmd.args[0x07] ^= CX24116_PILOT;
+ cmd.args[0x07] ^= CX24116_PILOT_ON;
}
while(--retune);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/70ee86a7c6300e7c1c700d24bfc591739e1caa52
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
