The patch number 9013 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]>
S2API: cx24116 Rolloff changes, sysctls cleanup, isl power changes.
Remove the debugging sysctls.
Rolloff was broken, not it works as expected and has been tested in kaffeine.
Power related changes for the isl6421 are not implemented on the
HVR4000/4000LITE.
Priority: normal
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
Signed-off-by: Darron Broad <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/frontends/cx24116.c | 82 +-------------------
linux/drivers/media/video/cx88/cx88-dvb.c | 2
2 files changed, 7 insertions(+), 77 deletions(-)
diff -r 65b646d6849e -r 90e602bdbc3e linux/drivers/media/dvb/frontends/cx24116.c
--- a/linux/drivers/media/dvb/frontends/cx24116.c Sun Sep 14 02:56:59
2008 +0300
+++ b/linux/drivers/media/dvb/frontends/cx24116.c Sun Sep 14 09:45:58
2008 -0400
@@ -36,7 +36,6 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/firmware.h>
-#include <linux/sysctl.h>
#include "dvb_frontend.h"
#include "cx24116.h"
@@ -107,70 +106,6 @@ static int debug = 0;
/* DiSEqC tone burst */
static int toneburst = 1;
-
-/* debug & toneburst sysctl */
-static struct ctl_table_header *kernel_table_header;
-static ctl_table toneburst_table[] = {
-{
- .ctl_name = 0,
- .procname = "toneburst",
- .data = &toneburst,
- .maxlen = sizeof(int),
- .mode = 0666,
- .child = NULL,
- .parent = NULL,
- .proc_handler = &proc_dointvec,
- .strategy = NULL,
- .extra1 = NULL,
- .extra2 = NULL,
-},
-{
- .ctl_name = 0,
- .procname = "debug",
- .data = &debug,
- .maxlen = sizeof(int),
- .mode = 0666,
- .child = NULL,
- .parent = NULL,
- .proc_handler = &proc_dointvec,
- .strategy = NULL,
- .extra1 = NULL,
- .extra2 = NULL,
- },
- {0},
-};
-static ctl_table cx24116_table[] = {
-{
- .ctl_name = 0,
- .procname = "cx24116",
- .data = NULL,
- .maxlen = 0,
- .mode = 0555,
- .child = toneburst_table,
- .parent = NULL,
- .proc_handler = NULL,
- .strategy = NULL,
- .extra1 = NULL,
- .extra2 = NULL,
- },
- {0},
-};
-static ctl_table kernel_table[] = {
-{
- .ctl_name = CTL_DEV,
- .procname = "dev",
- .data = NULL,
- .maxlen = 0,
- .mode = 0555,
- .child = cx24116_table,
- .parent = NULL,
- .proc_handler = NULL,
- .strategy = NULL,
- .extra1 = NULL,
- .extra2 = NULL,
- },
- {0},
-};
enum cmds
{
@@ -964,7 +899,7 @@ static int cx24116_send_diseqc_msg(struc
* 2/C/A: E0 10 38 F8..FB
* 3/D/B: E0 10 38 FC..FF
*
- * datebyte[3]= 8421:8421
+ * databyte[3]= 8421:8421
* ABCD:WXYZ
* CLR :SET
*
@@ -1061,7 +996,6 @@ static void cx24116_release(struct dvb_f
struct cx24116_state* state = fe->demodulator_priv;
dprintk("%s\n",__func__);
kfree(state);
- unregister_sysctl_table(kernel_table_header);
}
static struct dvb_frontend_ops cx24116_ops;
@@ -1073,16 +1007,12 @@ struct dvb_frontend* cx24116_attach(cons
int ret;
dprintk("%s\n",__func__);
-
- kernel_table_header = register_sysctl_table(kernel_table);
- if(!kernel_table_header)
- goto error1;
/* allocate memory for the internal state */
state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);
if (state == NULL) {
printk("Unable to kmalloc\n");
- goto error2;
+ goto error1;
}
/* setup the state */
@@ -1095,7 +1025,7 @@ struct dvb_frontend* cx24116_attach(cons
ret = (cx24116_readreg(state, 0xFF) << 8) | cx24116_readreg(state,
0xFE);
if (ret != 0x0501) {
printk("Invalid probe, probably not a CX24116 device\n");
- goto error3;
+ goto error2;
}
/* create dvb_frontend */
@@ -1103,8 +1033,7 @@ struct dvb_frontend* cx24116_attach(cons
state->frontend.demodulator_priv = state;
return &state->frontend;
-error3: kfree(state);
-error2: unregister_sysctl_table(kernel_table_header);
+error2: kfree(state);
error1: return NULL;
}
#if 0
@@ -1212,7 +1141,8 @@ static int cx24116_set_frontend(struct d
case SYS_DVBS:
dprintk("%s: DVB-S delivery system
selected\n",__func__);
state->dnxt.pilot = PILOT_OFF;
- state->dnxt.rolloff = CX24116_ROLLOFF_035;
+ 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__);
diff -r 65b646d6849e -r 90e602bdbc3e linux/drivers/media/video/cx88/cx88-dvb.c
--- a/linux/drivers/media/video/cx88/cx88-dvb.c Sun Sep 14 02:56:59 2008 +0300
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c Sun Sep 14 09:45:58 2008 -0400
@@ -961,7 +961,7 @@ static int dvb_register(struct cx8802_de
if (dev->dvb.frontend) {
dvb_attach(isl6421_attach, dev->dvb.frontend,
&dev->core->i2c_adap,
- 0x08, 0x00, 0x00);
+ 0x08, ISL6421_DCL, 0x00);
}
break;
case CX88_BOARD_TEVII_S460:
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/90e602bdbc3e9ff709ce63282cc5213b6223db72
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
