[PATCH] update dvb frontend drivers

- update dvb frontend drivers - C99 initializers - fix up some includes - various bugfixes

[PATCH] update dvb frontend drivers
- update dvb frontend drivers - C99 initializers - fix up some includes - various bugfixes
cc987f10 · Michael Hunold · Linus Torvalds · e33951e1 · cc987f10 · cc987f10
Commit cc987f10 authored Jun 22, 2003 by Michael Hunold Committed by Linus Torvalds Jun 22, 2003
12 changed files
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -5,10 +5,9 @@ config DVB_STV0299
 	tristate "STV0299 based DVB-S frontend (QPSK)"
 	depends on DVB_CORE
 	help
-	  A DVB-S tuner module. 
+	  The stv0299 by ST is used in many DVB-S tuner modules, 
+	  say Y when you want to support frontends based on this 
-	  Say Y when you want to support frontend based on this 
+	  DVB-S demodulator.
-	  demodulator.
 	  Some examples are the Alps BSRU6, the Philips SU1278 and
 	  the LG TDQB-S00x.
@@ -63,6 +62,17 @@ config DVB_ATMEL_AT76C651
 	  DVB adapter simply enable all supported frontends, the
 	  right one will get autodetected.
+config DVB_CX24110
+	tristate "Frontends with Connexant CX24110 demodulator (QPSK)"
+	depends on DVB_CORE
+	help
+	  The CX24110 Demodulator is used in some DVB-S frontends. 
+	  Say Y if you want support for this chip in your kernel.
+	  If you don't know what tuner module is soldered on your 
+	  DVB adapter simply enable all supported frontends, the 
+	  right one will get autodetected.
 config DVB_GRUNDIG_29504_491
 	tristate "Grundig 29504-491 (QPSK)"
 	depends on DVB_CORE

--- a/drivers/media/dvb/frontends/Makefile
+++ b/drivers/media/dvb/frontends/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_DVB_ALPS_BSRV2) += alps_bsrv2.o
 obj-$(CONFIG_DVB_ALPS_TDLB7) += alps_tdlb7.o
 obj-$(CONFIG_DVB_ALPS_TDMB7) += alps_tdmb7.o
 obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o
+obj-$(CONFIG_DVB_CX24110) += cx24110.o
 obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o
 obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o
 obj-$(CONFIG_DVB_VES1820) += ves1820.o
--- a/drivers/media/dvb/frontends/alps_bsrv2.c
+++ b/drivers/media/dvb/frontends/alps_bsrv2.c
@@ -20,8 +20,11 @@
 */    
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
@@ -31,17 +34,17 @@ static int debug = 0;
 static
 struct dvb_frontend_info bsrv2_info = {
-	name: "Alps BSRV2",
+	.name 			= "Alps BSRV2",
-	type: FE_QPSK,
+	.type 			= FE_QPSK,
-	frequency_min: 950000,
+	.frequency_min 		= 950000,
-	frequency_max: 2150000,
+	.frequency_max 		= 2150000,
-	frequency_stepsize: 250,           /* kHz for QPSK frontends */
+	.frequency_stepsize 	= 250,           /* kHz for QPSK frontends */
-	frequency_tolerance: 29500,
+	.frequency_tolerance 	= 29500,
-	symbol_rate_min: 1000000,
+	.symbol_rate_min	= 1000000,
-	symbol_rate_max: 45000000,
+	.symbol_rate_max	= 45000000,
-/*      symbol_rate_tolerance: ???,*/
+/*     . symbol_rate_tolerance	= 	???,*/
-	notifier_delay: 50,                /* 1/20 s */
+	.notifier_delay		= 50,                /* 1/20 s */
-	caps:   FE_CAN_INVERSION_AUTO |
+	.caps = FE_CAN_INVERSION_AUTO |
 		FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
 		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
 		FE_CAN_QPSK
@@ -75,7 +78,7 @@ static
 int ves1893_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 {
        u8 buf [] = { 0x00, reg, data };
-	struct i2c_msg msg = { addr: 0x08, flags: 0, buf: buf, len: 3 };
+	struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = buf, .len = 3 };
 	int err;
        if ((err = i2c->xfer (i2c, &msg, 1)) != 1) {
@@ -93,8 +96,8 @@ u8 ves1893_readreg (struct dvb_i2c_bus *i2c, u8 reg)
 	int ret;
 	u8 b0 [] = { 0x00, reg };
 	u8 b1 [] = { 0 };
-	struct i2c_msg msg [] = { { addr: 0x08, flags: 0, buf: b0, len: 2 },
+	struct i2c_msg msg [] = { { .addr = 0x08, .flags = 0, .buf = b0, .len = 2 },
-			   { addr: 0x08, flags: I2C_M_RD, buf: b1, len: 1 } };
+			   { .addr = 0x08, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 	ret = i2c->xfer (i2c, msg, 2);
@@ -109,7 +112,7 @@ static
 int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
 {
        int ret;
-        struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+        struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
        ret = i2c->xfer (i2c, &msg, 1);
@@ -211,7 +214,7 @@ int ves1893_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
 	u32 BDRI;
 	u32 tmp;
-	dprintk("%s: srate == %d\n", __FUNCTION__, srate);
+	dprintk("%s: srate == %ud\n", __FUNCTION__, (unsigned int) srate);
 	if (srate > 90100000UL/2)
 		srate = 90100000UL/2;
@@ -257,9 +260,9 @@ int ves1893_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
 	BDRI = ( ((FIN << 8) / ((srate << (FNR >> 1)) >> 2)) + 1) >> 1;
        dprintk("FNR= %d\n", FNR);
-        dprintk("ratio= %08x\n", ratio);
+        dprintk("ratio= %08x\n", (unsigned int) ratio);
-        dprintk("BDR= %08x\n", BDR);
+        dprintk("BDR= %08x\n", (unsigned int) BDR);
-        dprintk("BDRI= %02x\n", BDRI);
+        dprintk("BDRI= %02x\n", (unsigned int) BDRI);
 	if (BDRI > 0xff)
 		BDRI = 0xff;
@@ -294,6 +297,8 @@ int ves1893_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
 		return ves1893_writereg (i2c, 0x1f, 0x20);
 	case SEC_VOLTAGE_18:
 		return ves1893_writereg (i2c, 0x1f, 0x30);
+	case SEC_VOLTAGE_OFF:
+		return ves1893_writereg (i2c, 0x1f, 0x00);
 	default:
 		return -EINVAL;
 	}
@@ -387,12 +392,12 @@ int bsrv2_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 	case FE_GET_FRONTEND:
 	{
 		struct dvb_frontend_parameters *p = arg;
-		s32 afc;
+		int afc;
 		afc = ((int)((char)(ves1893_readreg (i2c, 0x0a) << 1)))/2;
-		afc = (afc * (int)(p->u.qpsk.symbol_rate/8))/16;
+		afc = (afc * (int)(p->u.qpsk.symbol_rate/1000/8))/16;
-		p->frequency += afc;
+		p->frequency -= afc;
 		p->inversion = (ves1893_readreg (i2c, 0x0f) & 2) ? 
 					INVERSION_ON : INVERSION_OFF;
 		p->u.qpsk.fec_inner = ves1893_get_fec (i2c);

--- a/drivers/media/dvb/frontends/alps_tdlb7.c
+++ b/drivers/media/dvb/frontends/alps_tdlb7.c
@@ -72,19 +72,19 @@ static int errno;
 static
 struct dvb_frontend_info tdlb7_info = {
-	name: "Alps TDLB7",
+	.name			 = "Alps TDLB7",
-	type: FE_OFDM,
+	.type			 = FE_OFDM,
-	frequency_min: 470000000,
+	.frequency_min		 = 470000000,
-	frequency_max: 860000000,
+	.frequency_max		 = 860000000,
-	frequency_stepsize: 166666,
+	.frequency_stepsize	 = 166666,
 #if 0
-    	frequency_tolerance: ???,
+    	.frequency_tolerance	 = ???,
-	symbol_rate_min: ???,
+	.symbol_rate_min	 = ???,
-	symbol_rate_max: ???,
+	.symbol_rate_max	 = ???,
-	symbol_rate_tolerance: ???,
+	.symbol_rate_tolerance	 = ???,
-	notifier_delay: 0,
+	.notifier_delay	 = 0,
 #endif
-	caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
 	      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
 	      FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64
 };
@@ -94,7 +94,7 @@ static
 int sp8870_writereg (struct dvb_i2c_bus *i2c, u16 reg, u16 data)
 {
        u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
-	struct i2c_msg msg = { addr: 0x71, flags: 0, buf: buf, len: 4 };
+	struct i2c_msg msg = { .addr = 0x71, .flags = 0, .buf =  buf, .len = 4 };
 	int err;
        if ((err = i2c->xfer (i2c, &msg, 1)) != 1) {
@@ -112,8 +112,8 @@ u16 sp8870_readreg (struct dvb_i2c_bus *i2c, u16 reg)
 	int ret;
 	u8 b0 [] = { reg >> 8 , reg & 0xff };
 	u8 b1 [] = { 0, 0 };
-	struct i2c_msg msg [] = { { addr: 0x71, flags: 0, buf: b0, len: 2 },
+	struct i2c_msg msg [] = { { .addr = 0x71, .flags = 0, .buf = b0, .len = 2 },
-			   { addr: 0x71, flags: I2C_M_RD, buf: b1, len: 2 } };
+			   { .addr = 0x71, .flags = I2C_M_RD, .buf = b1, .len = 2 } };
 	ret = i2c->xfer (i2c, msg, 2);
@@ -128,7 +128,7 @@ static
 int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
 {
        int ret;
-        struct i2c_msg msg = { addr: 0x60, flags: 0, buf: data, len: 4 };
+        struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = 4 };
        ret = i2c->xfer (i2c, &msg, 1);
@@ -419,7 +419,7 @@ static
 int tdlb7_attach (struct dvb_i2c_bus *i2c)
 {
-	struct i2c_msg msg = { addr: 0x71, flags: 0, buf: NULL, len: 0 };
+	struct i2c_msg msg = { .addr = 0x71, .flags = 0, .buf = NULL, .len = 0 };
 	dprintk ("%s\n", __FUNCTION__);

--- a/drivers/media/dvb/frontends/alps_tdmb7.c
+++ b/drivers/media/dvb/frontends/alps_tdmb7.c
@@ -20,10 +20,14 @@
 */    
+#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
+#include "dvb_functions.h"
 static int debug = 0;
@@ -32,33 +36,25 @@ static int debug = 0;
 static
 struct dvb_frontend_info tdmb7_info = {
-	name: "Alps TDMB7",
+	.name 			= "Alps TDMB7",
-	type: FE_OFDM,
+	.type 			= FE_OFDM,
-	frequency_min: 470000000,
+	.frequency_min 		= 470000000,
-	frequency_max: 860000000,
+	.frequency_max 		= 860000000,
-	frequency_stepsize: 166667,
+	.frequency_stepsize 	= 166667,
 #if 0
-    	frequency_tolerance: ???,
+    	.frequency_tolerance 	= ???,
-	symbol_rate_min: ???,
+	.symbol_rate_min 	= ???,
-	symbol_rate_max: ???,
+	.symbol_rate_max 	= ???,
-	symbol_rate_tolerance: 500,  /* ppm */
+	.symbol_rate_tolerance	= 500,  /* ppm */
-	notifier_delay: 0,
+	.notifier_delay 	= 0,
 #endif
-	caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
 	      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
 	      FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | 
 	      FE_CAN_CLEAN_SETUP | FE_CAN_RECOVER
 };
-static
-inline void ddelay (int timeout)
-{
-	current->state=TASK_INTERRUPTIBLE;
-	schedule_timeout(timeout);
-}
 static
 u8 init_tab [] = {
 	0x04, 0x10,
@@ -87,7 +83,7 @@ int cx22700_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 {
 	int ret;
 	u8 buf [] = { reg, data };
-	struct i2c_msg msg = { addr: 0x43, flags: 0, buf: buf, len: 2 };
+	struct i2c_msg msg = { .addr = 0x43, .flags = 0, .buf = buf, .len = 2 };
 	dprintk ("%s\n", __FUNCTION__);
@@ -107,8 +103,8 @@ u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
 	int ret;
 	u8 b0 [] = { reg };
 	u8 b1 [] = { 0 };
-	struct i2c_msg msg [] = { { addr: 0x43, flags: 0, buf: b0, len: 1 },
+	struct i2c_msg msg [] = { { .addr = 0x43, .flags = 0, .buf = b0, .len = 1 },
-			   { addr: 0x43, flags: I2C_M_RD, buf: b1, len: 1 } };
+			   { .addr = 0x43, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 	dprintk ("%s\n", __FUNCTION__);
@@ -124,7 +120,7 @@ u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
 static
 int pll_write (struct dvb_i2c_bus *i2c, u8 data [4])
 {
-	struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
 	int ret;
 	cx22700_writereg (i2c, 0x0a, 0x00);  /* open i2c bus switch */
@@ -154,7 +150,7 @@ int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
 		       freq < 470000000 ? 0x42 : freq < 862000000 ? 0x41 : 0x81 };
 #endif
-	dprintk ("%s: freq == %i, div == %i\n", __FUNCTION__, freq, div);
+	dprintk ("%s: freq == %i, div == %i\n", __FUNCTION__, (int) freq, (int) div);
 	return pll_write (i2c, buf);
 }
@@ -170,7 +166,7 @@ int cx22700_init (struct dvb_i2c_bus *i2c)
 	cx22700_writereg (i2c, 0x00, 0x02);   /*  soft reset */
 	cx22700_writereg (i2c, 0x00, 0x00);
-	ddelay (HZ/100);
+	dvb_delay (HZ/100);
 	for (i=0; i<sizeof(init_tab); i+=2)
 		cx22700_writereg (i2c, init_tab[i], init_tab[i+1]);
@@ -355,7 +351,7 @@ int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 	}
        case FE_READ_BER:
-		*((uint32_t*) arg) = cx22700_readreg (i2c, 0x0c) & 0x7f;
+		*((u32*) arg) = cx22700_readreg (i2c, 0x0c) & 0x7f;
 		cx22700_writereg (i2c, 0x0c, 0x00);
 		break;
@@ -363,18 +359,18 @@ int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 	{
 		u16 rs_ber = (cx22700_readreg (i2c, 0x0d) << 9)
 			   | (cx22700_readreg (i2c, 0x0e) << 1);
-		*((uint16_t*) arg) = ~rs_ber;
+		*((u16*) arg) = ~rs_ber;
 		break;
 	}
        case FE_READ_SNR:
 	{
 		u16 rs_ber = (cx22700_readreg (i2c, 0x0d) << 9)
 			   | (cx22700_readreg (i2c, 0x0e) << 1);
-		*((uint16_t*) arg) = ~rs_ber;
+		*((u16*) arg) = ~rs_ber;
 		break;
 	}
 	case FE_READ_UNCORRECTED_BLOCKS: 
-		*((uint32_t*) arg) = cx22700_readreg (i2c, 0x0f);
+		*((u32*) arg) = cx22700_readreg (i2c, 0x0f);
 		cx22700_writereg (i2c, 0x0f, 0x00);
 		break;
@@ -420,7 +416,7 @@ int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 static
 int tdmb7_attach (struct dvb_i2c_bus *i2c)
 {
-	struct i2c_msg msg = { addr: 0x43, flags: 0, buf: NULL, len: 0 };
+	struct i2c_msg msg = { .addr = 0x43, .flags = 0, .buf = NULL,. len = 0 };
 	dprintk ("%s\n", __FUNCTION__);

--- a/drivers/media/dvb/frontends/at76c651.c
+++ b/drivers/media/dvb/frontends/at76c651.c
@@ -22,11 +22,11 @@
 *
 */
-#include <linux/module.h>
 #include <linux/init.h>
-#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/i2c.h>
 #if defined(__powerpc__)
 #include <asm/bitops.h>
@@ -34,6 +34,7 @@
 #include "dvb_frontend.h"
 #include "dvb_i2c.h"
+#include "dvb_functions.h"
 static int debug = 0;
@@ -67,8 +68,8 @@ static struct dvb_frontend_info at76c651_info = {
 	    FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
 	    FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
 	    FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 | FE_CAN_QAM_128 |
-	    FE_CAN_QAM_256,
+	    FE_CAN_QAM_256 /* | FE_CAN_QAM_512 | FE_CAN_QAM_1024 */ |
-	/* FE_CAN_QAM_512 | FE_CAN_QAM_1024 |  */
+	    FE_CAN_RECOVER | FE_CAN_CLEAN_SETUP | FE_CAN_MUTE_TS
 };
@@ -94,7 +95,7 @@ at76c651_writereg(struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 	int ret;
 	u8 buf[] = { reg, data };
-	struct i2c_msg msg = { addr:0x1a >> 1, flags:0, buf:buf, len:2 };
+	struct i2c_msg msg = { .addr = 0x1a >> 1, .flags = 0, .buf = buf, .len = 2 };
 	ret = i2c->xfer(i2c, &msg, 1);
@@ -103,7 +104,7 @@ at76c651_writereg(struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 			"(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
 			__FUNCTION__, reg, data, ret);
-	mdelay(10);
+	dvb_delay(10);
 	return (ret != 1) ? -EREMOTEIO : 0;
@@ -116,8 +117,8 @@ at76c651_readreg(struct dvb_i2c_bus *i2c, u8 reg)
 	int ret;
 	u8 b0[] = { reg };
 	u8 b1[] = { 0 };
-	struct i2c_msg msg[] = { {addr: 0x1a >> 1, flags: 0, buf: b0, len:1},
+	struct i2c_msg msg[] = { {.addr =  0x1a >> 1, .flags =  0, .buf =  b0, .len = 1},
-			  {addr: 0x1a >> 1, flags: I2C_M_RD, buf: b1, len:1} };
+			  {.addr =  0x1a >> 1, .flags =  I2C_M_RD, .buf =  b1, .len = 1} };
 	ret = i2c->xfer(i2c, msg, 2);
@@ -192,7 +193,7 @@ dat7021_write(struct dvb_i2c_bus *i2c, u32 tw)
 	int ret;
 	struct i2c_msg msg =
-	    { addr:0xc2 >> 1, flags:0, buf:(u8 *) & tw, len:sizeof (tw) };
+	    { .addr = 0xc2 >> 1, .flags = 0, .buf = (u8 *) & tw, .len = sizeof (tw) };
 	at76c651_switch_tuner_i2c(i2c, 1);

--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -32,17 +32,17 @@ static int sct = 0;
 static
 struct dvb_frontend_info dvb_s_dummyfe_info = {
-	name: "DVB-S dummy frontend",
+	.name 			= "DVB-S dummy frontend",
-	type: FE_QPSK,
+	.type 			= FE_QPSK,
-	frequency_min: 950000,
+	.frequency_min 		= 950000,
-	frequency_max: 2150000,
+	.frequency_max 		= 2150000,
-	frequency_stepsize: 250,           /* kHz for QPSK frontends */
+	.frequency_stepsize 	= 250,           /* kHz for QPSK frontends */
-	frequency_tolerance: 29500,
+	.frequency_tolerance 	= 29500,
-	symbol_rate_min: 1000000,
+	.symbol_rate_min 	= 1000000,
-	symbol_rate_max: 45000000,
+	.symbol_rate_max 	= 45000000,
-/*      symbol_rate_tolerance: ???,*/
+/*      .symbol_rate_tolerance 	= ???,*/
-	notifier_delay: 50,                /* 1/20 s */
+	.notifier_delay		 = 50,                /* 1/20 s */
-	caps:   FE_CAN_INVERSION_AUTO | 
+	.caps = FE_CAN_INVERSION_AUTO | 
 	FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
 	FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
 	FE_CAN_QPSK
@@ -58,9 +58,9 @@ struct dvb_frontend_info dvb_c_dummyfe_info = {
 	.symbol_rate_min = (57840000/2)/64,     /* SACLK/64 == (XIN/2)/64 */
 	.symbol_rate_max = (57840000/2)/4,      /* SACLK/4 */
 #if 0
-	frequency_tolerance: ???,
+	.frequency_tolerance	= ???,
-	symbol_rate_tolerance: ???,  /* ppm */  /* == 8% (spec p. 5) */
+	.symbol_rate_tolerance	= ???,  /* ppm */  /* == 8% (spec p. 5) */
-	notifier_delay: ?,
+	.notifier_delay		= ?,
 #endif
 	.caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |
 		FE_CAN_QAM_128 | FE_CAN_QAM_256 | 

--- a/drivers/media/dvb/frontends/grundig_29504-401.c
+++ b/drivers/media/dvb/frontends/grundig_29504-401.c
@@ -22,10 +22,14 @@
 */    
-#include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
+#include "dvb_functions.h"
 static int debug = 0;
@@ -33,15 +37,15 @@ static int debug = 0;
 struct dvb_frontend_info grundig_29504_401_info = {
-	name: "Grundig 29504-401",
+	.name 			= "Grundig 29504-401",
-	type: FE_OFDM,
+	.type 			= FE_OFDM,
-/*	frequency_min: ???,*/
+/*	.frequency_min 		= ???,*/
-/*	frequency_max: ???,*/
+/*	.frequency_max 		= ???,*/
-	frequency_stepsize: 166666,
+	.frequency_stepsize 	= 166666,
-/*      frequency_tolerance: ???,*/
+/*      .frequency_tolerance 	= ???,*/
-/*      symbol_rate_tolerance: ???,*/
+/*      .symbol_rate_tolerance 	= ???,*/
-	notifier_delay: 0,
+	.notifier_delay =  0,
-	caps: FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | 
+	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | 
 	      FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
 	      FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
 	      FE_CAN_MUTE_TS /*| FE_CAN_CLEAN_SETUP*/
@@ -53,7 +57,7 @@ int l64781_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 {
 	int ret;
 	u8 buf [] = { reg, data };
-	struct i2c_msg msg = { addr: 0x55, flags: 0, buf: buf, len: 2 };
+	struct i2c_msg msg = { .addr = 0x55, .flags = 0, .buf = buf, .len = 2 };
 	if ((ret = i2c->xfer (i2c, &msg, 1)) != 1)
 		dprintk ("%s: write_reg error (reg == %02x) = %02x!\n",
@@ -69,8 +73,8 @@ u8 l64781_readreg (struct dvb_i2c_bus *i2c, u8 reg)
 	int ret;
 	u8 b0 [] = { reg };
 	u8 b1 [] = { 0 };
-	struct i2c_msg msg [] = { { addr: 0x55, flags: 0, buf: b0, len: 1 },
+	struct i2c_msg msg [] = { { .addr = 0x55, .flags = 0, .buf = b0, .len = 1 },
-			   { addr: 0x55, flags: I2C_M_RD, buf: b1, len: 1 } };
+			   { .addr = 0x55, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 	ret = i2c->xfer (i2c, msg, 2);
@@ -85,7 +89,7 @@ static
 int tsa5060_write (struct dvb_i2c_bus *i2c, u8 data [4])
 {
 	int ret;
-	struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
 	if ((ret = i2c->xfer (i2c, &msg, 1)) != 1)
 		dprintk ("%s: write_reg error == %02x!\n", __FUNCTION__, ret);
@@ -97,22 +101,27 @@ int tsa5060_write (struct dvb_i2c_bus *i2c, u8 data [4])
 /**
 *   set up the downconverter frequency divisor for a
 *   reference clock comparision frequency of 166666 Hz.
- *   frequency offset is 36000000 Hz.
+ *   frequency offset is 36125000 Hz.
 */
 static
 int tsa5060_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
 {
 	u32 div;
 	u8 buf [4];
-	u8 cfg;
+	u8 cfg, cpump, band_select;
-	div = (36000000 + freq) / 166666;
+	div = (36125000 + freq) / 166666;
 	cfg = 0x88;
+	cpump = div < 175000000 ? 2 : div < 390000000 ? 1 :
+		div < 470000000 ? 2 : div < 750000000 ? 1 : 3;
+	band_select = div < 175000000 ? 0x0e : div < 470000000 ? 0x05 : 0x03;
 	buf [0] = (div >> 8) & 0x7f;
 	buf [1] = div & 0xff;
 	buf [2] = ((div >> 10) & 0x60) | cfg;
-	buf [3] = 0xc0;
+	buf [3] = cpump | band_select;
 	return tsa5060_write (i2c, buf);
 }
@@ -269,7 +278,7 @@ static
 void reset_and_configure (struct dvb_i2c_bus *i2c)
 {
 	u8 buf [] = { 0x06 };
-	struct i2c_msg msg = { addr: 0x00, flags: 0, buf: buf, len: 1 };
+	struct i2c_msg msg = { .addr = 0x00, .flags = 0, .buf = buf, .len = 1 };
 	i2c->xfer (i2c, &msg, 1);
 }
@@ -420,8 +429,8 @@ int l64781_attach (struct dvb_i2c_bus *i2c)
 {
 	u8 b0 [] = { 0x1a };
 	u8 b1 [] = { 0x00 };
-	struct i2c_msg msg [] = { { addr: 0x55, flags: 0, buf: b0, len: 1 },
+	struct i2c_msg msg [] = { { .addr = 0x55, .flags = 0, .buf = b0, .len = 1 },
-			   { addr: 0x55, flags: I2C_M_RD, buf: b1, len: 1 } };
+			   { .addr = 0x55, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 	if (i2c->xfer (i2c, msg, 2) == 2)   /*  probably an EEPROM... */
 		return -ENODEV;

--- a/drivers/media/dvb/frontends/grundig_29504-491.c
+++ b/drivers/media/dvb/frontends/grundig_29504-491.c
@@ -25,9 +25,13 @@
 */    
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
+#include "dvb_functions.h"
 static int debug = 0;
 #define dprintk	if (debug) printk
@@ -35,17 +39,17 @@ static int debug = 0;
 static
 struct dvb_frontend_info grundig_29504_491_info = {
-	name: "Grundig 29504-491, (TDA8083 based)",
+	.name			= "Grundig 29504-491, (TDA8083 based)",
-	type: FE_QPSK,
+	.type			= FE_QPSK,
-	frequency_min: 950000,     /* FIXME: guessed! */
+	.frequency_min		= 950000,     /* FIXME: guessed! */
-	frequency_max: 1400000,    /* FIXME: guessed! */
+	.frequency_max		= 1400000,    /* FIXME: guessed! */
-	frequency_stepsize: 125,   /* kHz for QPSK frontends */
+	.frequency_stepsize	= 125,   /* kHz for QPSK frontends */
-/*      frequency_tolerance: ???,*/
+/*      .frequency_tolerance	= ???,*/
-	symbol_rate_min: 1000000,   /* FIXME: guessed! */
+	.symbol_rate_min	= 1000000,   /* FIXME: guessed! */
-	symbol_rate_max: 45000000,  /* FIXME: guessed! */
+	.symbol_rate_max	= 45000000,  /* FIXME: guessed! */
-/*      symbol_rate_tolerance: ???,*/
+/*      .symbol_rate_tolerance	= ???,*/
-	notifier_delay: 0,
+	.notifier_delay		= 0,
-	caps:	FE_CAN_INVERSION_AUTO |
+	.caps = FE_CAN_INVERSION_AUTO |
 		FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
 		FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
 		FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
@@ -72,7 +76,7 @@ int tda8083_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 {
 	int ret;
 	u8 buf [] = { reg, data };
-	struct i2c_msg msg = { addr: 0x68, flags: 0, buf: buf, len: 2 };
+	struct i2c_msg msg = { .addr = 0x68, .flags = 0, .buf = buf, .len = 2 };
        ret = i2c->xfer (i2c, &msg, 1);
@@ -88,8 +92,8 @@ static
 int tda8083_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
 {
 	int ret;
-	struct i2c_msg msg [] = { { addr: 0x68, flags: 0, buf: &reg1, len: 1 },
+	struct i2c_msg msg [] = { { .addr = 0x68, .flags = 0, .buf = &reg1, .len = 1 },
-			   { addr: 0x68, flags: I2C_M_RD, buf: b, len: len } };
+			   { .addr = 0x68, .flags = I2C_M_RD, .buf = b, .len = len } };
 	ret = i2c->xfer (i2c, msg, 2);
@@ -116,7 +120,7 @@ static
 int tsa5522_write (struct dvb_i2c_bus *i2c, u8 data [4])
 {
 	int ret;
-	struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
 	ret = i2c->xfer (i2c, &msg, 1);
@@ -222,7 +226,7 @@ int tda8083_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
 	tmp = (tmp % srate) << 8;
 	ratio = (ratio << 8) + tmp / srate;
-	dprintk("tda8083: ratio == %08x\n", ratio);
+	dprintk("tda8083: ratio == %08x\n", (unsigned int) ratio);
 	tda8083_writereg (i2c, 0x05, filter);
 	tda8083_writereg (i2c, 0x02, (ratio >> 16) & 0xff);
@@ -244,8 +248,7 @@ void tda8083_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
 	while (jiffies - start < timeout &&
               !(tda8083_readreg(i2c, 0x02) & 0x80))
 	{
-		current->state = TASK_INTERRUPTIBLE;
+		dvb_delay(50);
-		schedule_timeout (5);
 	};
 }

--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -25,13 +25,11 @@
 */    
-#include <linux/module.h>
 #include <linux/init.h>
-#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/poll.h>
-#include <asm/io.h>
-#include <linux/i2c.h>
 #include "dvb_frontend.h"
 #include "nxt6000.h"
@@ -90,11 +88,11 @@ static int nxt6000_write(struct dvb_i2c_bus *i2c, u8 addr, u8 reg, u8 data)
 {
 	u8 buf[] = {reg, data};
-	struct i2c_msg msg = {addr: addr >> 1, flags: 0, buf: buf, len: 2};
+	struct i2c_msg msg = {.addr = addr >> 1, .flags = 0, .buf = buf, .len = 2};
 	int ret;
 	if ((ret = i2c->xfer(i2c, &msg, 1)) != 1)
-		dprintk("nxt6000: nxt6000_write error (addr: 0x%02X, reg: 0x%02X, data: 0x%02X, ret: %d)\n", addr, reg, data, ret);
+		dprintk("nxt6000: nxt6000_write error (.addr = 0x%02X, reg: 0x%02X, data: 0x%02X, ret: %d)\n", addr, reg, data, ret);
 	return (ret != 1) ? -EFAULT : 0;
@@ -115,13 +113,13 @@ static u8 nxt6000_read(struct dvb_i2c_bus *i2c, u8 addr, u8 reg)
 	int ret;
 	u8 b0[] = {reg};
 	u8 b1[] = {0};
-	struct i2c_msg msgs[] = {{addr: addr >> 1, flags: 0, buf: b0, len: 1},
+	struct i2c_msg msgs[] = {{.addr = addr >> 1, .flags = 0, .buf = b0, .len = 1},
-							{addr: addr >> 1, flags: I2C_M_RD, buf: b1, len: 1}};
+							{.addr = addr >> 1, .flags = I2C_M_RD, .buf = b1, .len = 1}};
 	ret = i2c->xfer(i2c, msgs, 2);
 	if (ret != 2)
-		dprintk("nxt6000: nxt6000_read error (addr: 0x%02X, reg: 0x%02X, ret: %d)\n", addr, reg, ret);
+		dprintk("nxt6000: nxt6000_read error (.addr = 0x%02X, reg: 0x%02X, ret: %d)\n", addr, reg, ret);
 	return b1[0];
@@ -139,7 +137,7 @@ static u8 nxt6000_readreg(struct dvb_frontend *fe, u8 reg)
 static int pll_write(struct dvb_i2c_bus *i2c, u8 demod_addr, u8 tuner_addr, u8 *buf, u8 len)
 {
-	struct i2c_msg msg = {addr: tuner_addr >> 1, flags: 0, buf: buf, len: len};
+	struct i2c_msg msg = {.addr = tuner_addr >> 1, .flags = 0, .buf = buf, .len = len};
 	int ret;
 	nxt6000_write(i2c, demod_addr, ENABLE_TUNER_IIC, 0x01);		/* open i2c bus switch */

--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -19,11 +19,15 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */    
+#include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
+#include "dvb_functions.h"
 #if 0
@@ -39,37 +43,33 @@
 */
 #define SET_PWM(data,pwm) do { 		\
-	(int) data &= ~0xff; 		\
+	(long) data &= ~0xff; 		\
-	(int) data |= pwm; 		\
+	(long) data |= pwm; 		\
 } while (0)
 #define SET_REG0(data,reg0) do {	\
-	(int) data &= ~(0xff << 8); 	\
+	(long) data &= ~(0xff << 8); 	\
-	(int) data |= reg0 << 8; 	\
+	(long) data |= reg0 << 8; 	\
 } while (0)
 #define SET_TUNER(data,type) do {	\
-	(int) data &= ~(0xff << 16); 	\
+	(long) data &= ~(0xff << 16); 	\
-	(int) data |= type << 16;	\
+	(long) data |= type << 16;	\
 } while (0)
 #define SET_DEMOD_ADDR(data,type) do {	\
-	(int) data &= ~(0xff << 24); 	\
+	(long) data &= ~(0xff << 24); 	\
-	(int) data |= type << 24;	\
+	(long) data |= type << 24;	\
 } while (0)
-#define GET_PWM(data) ((u8) ((int) data & 0xff))
+#define GET_PWM(data) ((u8) ((long) data & 0xff))
-#define GET_REG0(data) ((u8) (((int) data >> 8) & 0xff))
+#define GET_REG0(data) ((u8) (((long) data >> 8) & 0xff))
-#define GET_TUNER(data) ((u8) (((int) data >> 16) & 0xff))
+#define GET_TUNER(data) ((u8) (((long) data >> 16) & 0xff))
-#define GET_DEMOD_ADDR(data) ((u8) (((int) data >> 24) & 0xff))
+#define GET_DEMOD_ADDR(data) ((u8) (((long) data >> 24) & 0xff))
+#define XIN 57840000UL
+#define FIN (XIN >> 4)
-static inline
-void ddelay (int ms)
-{
-	current->state=TASK_INTERRUPTIBLE;
-	schedule_timeout((HZ*ms)/1000);
-}
 static
@@ -79,8 +79,8 @@ struct dvb_frontend_info ves1820_info = {
 	.frequency_stepsize = 62500,
 	.frequency_min = 51000000,
 	.frequency_max = 858000000,
-	.symbol_rate_min = (57840000/2)/64,     /* SACLK/64 == (XIN/2)/64 */
+	.symbol_rate_min = (XIN/2)/64,     /* SACLK/64 == (XIN/2)/64 */
-	.symbol_rate_max = (57840000/2)/4,      /* SACLK/4 */
+	.symbol_rate_max = (XIN/2)/4,      /* SACLK/4 */
 #if 0
 	frequency_tolerance: ???,
 	symbol_rate_tolerance: ???,  /* ppm */  /* == 8% (spec p. 5) */
@@ -112,7 +112,7 @@ int ves1820_writereg (struct dvb_frontend *fe, u8 reg, u8 data)
 {
 	u8 addr = GET_DEMOD_ADDR(fe->data);
        u8 buf[] = { 0x00, reg, data };
-	struct i2c_msg msg = { addr: addr, flags: 0, buf: buf, len: 3 };
+	struct i2c_msg msg = { addr: addr, .flags = 0, .buf = buf, .len = 3 };
 	struct dvb_i2c_bus *i2c = fe->i2c;
        int ret;
@@ -123,7 +123,7 @@ int ves1820_writereg (struct dvb_frontend *fe, u8 reg, u8 data)
 			"(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
 			__FUNCTION__, reg, data, ret);
-	mdelay(10);
+	dvb_delay(10);
 	return (ret != 1) ? -EREMOTEIO : 0;
 }
@@ -134,8 +134,8 @@ u8 ves1820_readreg (struct dvb_frontend *fe, u8 reg)
 	u8 b0 [] = { 0x00, reg };
 	u8 b1 [] = { 0 };
 	u8 addr = GET_DEMOD_ADDR(fe->data);
-	struct i2c_msg msg [] = { { addr: addr, flags: 0, buf: b0, len: 2 },
+	struct i2c_msg msg [] = { { addr: addr, .flags = 0, .buf = b0, .len = 2 },
-	                   { addr: addr, flags: I2C_M_RD, buf: b1, len: 1 } };
+	                   { addr: addr, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
 	struct dvb_i2c_bus *i2c = fe->i2c;
 	int ret;
@@ -152,7 +152,7 @@ static
 int tuner_write (struct dvb_i2c_bus *i2c, u8 addr, u8 data [4])
 {
        int ret;
-        struct i2c_msg msg = { addr: addr, flags: 0, buf: data, len: 4 };
+        struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = 4 };
        ret = i2c->xfer (i2c, &msg, 1);
@@ -170,7 +170,7 @@ int tuner_write (struct dvb_i2c_bus *i2c, u8 addr, u8 data [4])
 static
 int tuner_set_tv_freq (struct dvb_frontend *fe, u32 freq)
 {
-        u32 div;
+        u32 div, ifreq;
 	static u8 addr [] = { 0x61, 0x62 };
 	static u8 byte3 [] = { 0x8e, 0x85 };
 	int tuner_type = GET_TUNER(fe->data);
@@ -179,7 +179,13 @@ int tuner_set_tv_freq (struct dvb_frontend *fe, u32 freq)
 	if (tuner_type == 0xff)     /*  PLL not reachable over i2c ...  */
 		return 0;
-	div = (freq + 36125000 + 31250) / 62500;
+	if (strstr (fe->i2c->adapter->name, "Technotrend"))
+		ifreq = 35937500;
+	else
+		ifreq = 36125000;
+	div = (freq + ifreq + 31250) / 62500;
 	buf[0] = (div >> 8) & 0x7f;
 	buf[1] = div & 0xff;
 	buf[2] = byte3[tuner_type];
@@ -198,18 +204,24 @@ int tuner_set_tv_freq (struct dvb_frontend *fe, u32 freq)
 static
-int ves1820_setup_reg0 (struct dvb_frontend *fe, u8 reg0)
+int ves1820_setup_reg0 (struct dvb_frontend *fe, u8 reg0,
+			fe_spectral_inversion_t inversion)
 {
 	reg0 |= GET_REG0(fe->data) & 0x62;
+	if (INVERSION_ON == inversion)
+		reg0 &= ~0x20;
+	else if (INVERSION_OFF == inversion)
+		reg0 |= 0x20;
 	ves1820_writereg (fe, 0x00, reg0 & 0xfe);
        ves1820_writereg (fe, 0x00, reg0 | 0x01);
 	/**
 	 *  check lock and toggle inversion bit if required...
 	 */
-	if (!(ves1820_readreg (fe, 0x11) & 0x08)) {
+	if (INVERSION_AUTO == inversion && !(ves1820_readreg (fe, 0x11) & 0x08)) {
-		ddelay(1);
+		dvb_delay(10);
 		if (!(ves1820_readreg (fe, 0x11) & 0x08)) {
 			reg0 ^= 0x20;
 			ves1820_writereg (fe, 0x00, reg0 & 0xfe);
@@ -250,9 +262,6 @@ int ves1820_set_symbolrate (struct dvb_frontend *fe, u32 symbolrate)
        u16 NDEC = 0;
        u32 tmp, ratio;
-#define XIN 57840000UL
-#define FIN (XIN >> 4)
        if (symbolrate > XIN/2) 
                symbolrate = XIN/2;
@@ -305,7 +314,7 @@ int ves1820_set_parameters (struct dvb_frontend *fe,
 			    struct dvb_frontend_parameters *p)
 {
 	static const u8 reg0x00 [] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };
-	static const u8 reg0x01 [] = {  140,  140,  106,  120,   92 };
+	static const u8 reg0x01 [] = {  140,  140,  106,  100,   92 };
 	static const u8 reg0x05 [] = {  135,  100,   70,   54,   38 };
 	static const u8 reg0x08 [] = {  162,  116,   67,   52,   35 };
 	static const u8 reg0x09 [] = {  145,  150,  106,  126,  107 };
@@ -323,7 +332,7 @@ int ves1820_set_parameters (struct dvb_frontend *fe,
        ves1820_writereg (fe, 0x08, reg0x08[real_qam]);
        ves1820_writereg (fe, 0x09, reg0x09[real_qam]);
-	ves1820_setup_reg0 (fe, reg0x00[real_qam]);
+	ves1820_setup_reg0 (fe, reg0x00[real_qam], p->inversion);
 	return 0;
 }
@@ -400,15 +409,31 @@ int ves1820_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 		return ves1820_set_parameters (fe, arg);
 	case FE_GET_FRONTEND:
-		/*  XXX FIXME: implement! */
+	{
-/*
+		struct dvb_frontend_parameters *p = (struct dvb_frontend_parameters *)arg;
-                struct frontend *front = (struct frontend *)arg;
+		u8 reg0 = GET_REG0(fe->data);
+		int sync;
+		s8 afc = 0;
-                front->afc=(int)((char)(readreg(client,0x19)));
+                sync = ves1820_readreg (fe, 0x11);
-                front->afc=(front->afc*(int)(front->param.u.qam.SymbolRate/8))/128;
+		if (sync & 2)
-*/
+			/* AFC only valid when carrier has been recovered */
-		break;
+			afc = ves1820_readreg(fe, 0x19);
+		printk ("%s: AFC (%d) %dHz\n", __FILE__, afc,
+				-((s32)(p->u.qam.symbol_rate >> 3) * afc >> 7));
+		p->inversion = reg0 & 0x20 ? INVERSION_OFF : INVERSION_ON;
+		p->u.qam.modulation = ((reg0 >> 2) & 7) + QAM_16;
+		p->u.qam.fec_inner = FEC_NONE;
+		p->frequency = ((p->frequency + 31250) / 62500) * 62500;
+		// To prevent overflow, shift symbol rate first a
+		// couple of bits.
+		p->frequency -= (s32)(p->u.qam.symbol_rate >> 3) * afc >> 7;
+		break;
+	}
 	case FE_SLEEP:
 		ves1820_writereg (fe, 0x1b, 0x02);  /* pdown ADC */
 		ves1820_writereg (fe, 0x00, 0x80);  /* standby */
@@ -426,12 +451,12 @@ int ves1820_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 static
-int probe_tuner (struct dvb_i2c_bus *i2c)
+long probe_tuner (struct dvb_i2c_bus *i2c)
 {
 	static const
-	struct i2c_msg msg1 = { addr: 0x61, flags: 0, buf: NULL, len: 0 };
+	struct i2c_msg msg1 = { .addr = 0x61, .flags = 0, .buf = NULL, .len = 0 };
 	static const
-	struct i2c_msg msg2 = { addr: 0x62, flags: 0, buf: NULL, len: 0 };
+	struct i2c_msg msg2 = { .addr = 0x62, .flags = 0, .buf = NULL, .len = 0 };
 	int type;
 	if (i2c->xfer(i2c, &msg1, 1) == 1) {
@@ -456,8 +481,8 @@ u8 read_pwm (struct dvb_i2c_bus *i2c)
 {
 	u8 b = 0xff;
 	u8 pwm;
-	struct i2c_msg msg [] = { { addr: 0x50, flags: 0, buf: &b, len: 1 },
+	struct i2c_msg msg [] = { { .addr = 0x50, .flags = 0, .buf = &b, .len = 1 },
-			 { addr: 0x50, flags: I2C_M_RD, buf: &pwm, len: 1 } };
+			 { .addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1 } };
 	i2c->xfer (i2c, msg, 2);
@@ -471,12 +496,12 @@ u8 read_pwm (struct dvb_i2c_bus *i2c)
 static
-int probe_demod_addr (struct dvb_i2c_bus *i2c)
+long probe_demod_addr (struct dvb_i2c_bus *i2c)
 {
 	u8 b [] = { 0x00, 0x1a };
 	u8 id;
-	struct i2c_msg msg [] = { { addr: 0x08, flags: 0, buf: b, len: 2 },
+	struct i2c_msg msg [] = { { .addr = 0x08, .flags = 0, .buf = b, .len = 2 },
-	                   { addr: 0x08, flags: I2C_M_RD, buf: &id, len: 1 } };
+	                   { .addr = 0x08, .flags = I2C_M_RD, .buf = &id, .len = 1 } };
 	if (i2c->xfer(i2c, msg, 2) == 2 && (id & 0xf0) == 0x70)
 		return msg[0].addr;
@@ -494,8 +519,8 @@ static
 int ves1820_attach (struct dvb_i2c_bus *i2c)
 {
 	void *data = NULL;
-	int demod_addr;
+	long demod_addr;
-	int tuner_type;
+	long tuner_type;
 	if ((demod_addr = probe_demod_addr(i2c)) < 0)
 		return -ENODEV;