- more work on the nebula digitv USB

- following a small change in the other drivers

8 files changed, 152 insertions, 88 deletions

diff --git a/linux/drivers/media/dvb/dvb-usb/Kconfig b/linux/drivers/media/dvb/dvb-usb/Kconfig
index bfc1171f1..8aa32f6e4 100644
--- a/linux/drivers/media/dvb/dvb-usb/Kconfig
+++ b/linux/drivers/media/dvb/dvb-usb/Kconfig
@@ -70,10 +70,10 @@ config DVB_USB_UMT_010
 	  Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
 
 config DVB_USB_DIGITV
-	tristate "Nebula Electronics µDigiTV DVB-T USB2.0 support"
+	tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
 	depends on DVB_USB
 	help
-	  Say Y here to support the Nebula Electronics µDigitV USB2.0 DVB-T receiver.
+	  Say Y here to support the Nebula Electronics uDigitV USB2.0 DVB-T receiver.
 
 config DVB_USB_VP7045
 	tristate "TwinhanDTV Alpha/MagicBoxII and DNTV tinyUSB2 DVB-T USB2.0 support"
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c
index 58c6d61bb..11f9128e8 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -104,7 +104,7 @@ static int dibusb_i2c_msg(struct dvb_usb_device *d, u8 addr,
 		sndbuf[wlen+3] = rlen & 0xff;
 	}
 
-	return dvb_usb_generic_rw(d,sndbuf,len,rbuf,rlen);
+	return dvb_usb_generic_rw(d,sndbuf,len,rbuf,rlen,0);
 }
 
 /*
@@ -318,7 +318,7 @@ EXPORT_SYMBOL(dibusb_rc_init);
 int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
 	u8 key[5],cmd = DIBUSB_REQ_POLL_REMOTE;
-	dvb_usb_generic_rw(d,&cmd,1,key,5);
+	dvb_usb_generic_rw(d,&cmd,1,key,5,0);
 	dvb_usb_nec_rc_key_to_event(d,dibusb_rc_keys,sizeof(dibusb_rc_keys)/sizeof(struct dvb_usb_nec_rc_key),
 			key,event,state);
 	if (key[0] != 0)
diff --git a/linux/drivers/media/dvb/dvb-usb/digitv.c b/linux/drivers/media/dvb/dvb-usb/digitv.c
index 489644a51..649a5cd80 100644
--- a/linux/drivers/media/dvb/dvb-usb/digitv.c
+++ b/linux/drivers/media/dvb/dvb-usb/digitv.c
@@ -1,4 +1,4 @@
-/* DVB USB compliant linux driver for Nebula Electronics µDigiTV DVB-T USB2.0
+/* DVB USB compliant linux driver for Nebula Electronics uDigiTV DVB-T USB2.0
  * receiver
  *
  * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de) and
@@ -12,62 +12,38 @@
  *
  * see Documentation/dvb/README.dvb-usb for more information
  */
-#include "dvb-usb.h"
+#include "digitv.h"
 
 #include "mt352.h"
+#include "nxt6000.h"
 
-/* protocol: this is what I read of the USB log:
- *
- * Always 7 bytes control message(s),
- *
- * First byte at describes the command. Reads are 2 consecutive transfer (as always).
- *
- * I2C address is stored somewhere inside the device.
- *
- * 0x02 i2c reading (2 messages)
- *  1st msg <reg> <len>
- *  2nd msg <reg> <len> <value>
- *
- * 0x05 i2c writing
- *      <reg> <len> <value>
- *   len = 1 for the mt352
- *
- * Others:
- *
- * 0x03 remote control query (read 4 bytes)
- *  1st msg: 0x00 0x04
- *  2nd msg: 0x00 0x04 4 bytes key (probably NEC protocol)
- *
- * 0x08 stream control ?
- *    0x00 0x04 0x01
- *
- * 0x07 unkown (maybe pid filter?)
- */
+/* debug */
+int dvb_usb_digitv_debug;
+module_param_named(debug,dvb_usb_digitv_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
 
-
-/* I2C */
-static int digitv_i2c_msg(struct dvb_usb_device *d,u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+static int digitv_ctrl_msg(struct dvb_usb_device *d,
+		u8 cmd, u8 vv, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
 {
-	u8 sndbuf[7],rcvbuf[7]; /* <cmd> <reg> <len> <val[4]> */
 	int wo = (rbuf == NULL || rlen == 0); /* write-only */
-
+	u8 sndbuf[7],rcvbuf[7];
 	memset(sndbuf,0,7); memset(rcvbuf,0,7);
 
-	sndbuf[0] = wo ? 0x05 : 0x03;
-	sndbuf[1] = wbuf[0]; /* register */
-	sndbuf[2] = wo ? wlen-1 : rlen;
-
-	if (wo)
-		memcpy(&sndbuf[3],&wbuf[1],wlen-1);
-
-	dvb_usb_generic_rw(d,sndbuf,7,rcvbuf,7);
-
-	if (!wo)
-		memcpy(rbuf,&rcvbuf[3],rlen);
+	sndbuf[0] = cmd;
+	sndbuf[1] = vv;
+	sndbuf[2] = wo ? wlen : rlen;
 
+	if (!wo) {
+		memcpy(&sndbuf[3],wbuf,wlen);
+		dvb_usb_generic_write(d,sndbuf,7);
+	} else {
+		dvb_usb_generic_rw(d,sndbuf,7,rcvbuf,7,10);
+		memcpy(&rbuf,&rcvbuf[3],rlen);
+	}
 	return 0;
 }
 
+/* I2C */
 static int digitv_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
 {
 	struct dvb_usb_device *d = i2c_get_adapdata(adap);
@@ -82,12 +58,13 @@ static int digitv_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num
 	for (i = 0; i < num; i++) {
 		/* write/read request */
 		if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
-			if (digitv_i2c_msg(d, msg[i].buf, msg[i].len,
+			if (digitv_ctrl_msg(d, USB_READ_COFDM, msg[i].buf[0], NULL, 0,
 						msg[i+1].buf,msg[i+1].len) < 0)
 				break;
 			i++;
 		} else
-			if (digitv_i2c_msg(d, msg[i].buf,msg[i].len,NULL,0) < 0)
+			if (digitv_ctrl_msg(d,USB_WRITE_COFDM, msg[i].buf[0],
+						&msg[i].buf[1],msg[i].len-1,NULL,0) < 0)
 				break;
 	}
 
@@ -108,36 +85,120 @@ static struct i2c_algorithm digitv_i2c_algo = {
 };
 
 /* Callbacks for DVB USB */
-static int probe_count;
 static int digitv_identify_state (struct usb_device *udev, struct
 		dvb_usb_properties *props, struct dvb_usb_device_description **desc,
 		int *cold)
 {
+	*cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0;
+	return 0;
+}
+
+static int digitv_mt352_demod_init(struct dvb_frontend *fe)
+{
+	static u8 mt352_clock_config[] = { 0x89, 0x38, 0x2d };
+	static u8 mt352_reset[] = { 0x50, 0x80 };
+	static u8 mt352_mclk_ratio[] = { 0x8b, 0x00 };
+
+	static u8 mt352_agc_cfg[] = { 0x68, 0xa0 };
+	static u8 mt352_adc_ctl_1_cfg[] = { 0x8E, 0xa0 };
+	static u8 mt352_acq_ctl[] = { 0x53, 0x50 };
+	static u8 mt352_agc_target[] = { 0x67, 0x20 };
+
+	static u8 mt352_rs_err_per[] = { 0x7c, 0x00, 0x01 };
+	static u8 mt352_snr_select[] = { 0x79, 0x00, 0x20 };
+
+	static u8 mt352_input_freq_1[] = { 0x56, 0x31, 0x05 };
+
+	static u8 mt352_scan_ctl[] = { 0x88, 0x0f };
+	static u8 mt352_capt_range[] = { 0x75, 0x32 };
+
+	mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
+	mt352_write(fe, mt352_reset, sizeof(mt352_reset));
+	msleep(1);
+	mt352_write(fe, mt352_mclk_ratio, sizeof(mt352_mclk_ratio));
+
+	mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
+	mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
+	mt352_write(fe, mt352_acq_ctl, sizeof(mt352_acq_ctl));
+	mt352_write(fe, mt352_agc_target, sizeof(mt352_agc_target));
+
+
+	mt352_write(fe, mt352_rs_err_per, sizeof(mt352_rs_err_per));
+	mt352_write(fe, mt352_snr_select, sizeof(mt352_snr_select));
+
+	mt352_write(fe, mt352_input_freq_1, sizeof(mt352_input_freq_1));
+
+	mt352_write(fe, mt352_scan_ctl, sizeof(mt352_scan_ctl));
+	mt352_write(fe, mt352_capt_range, sizeof(mt352_capt_range));
 
-	/* here we have to determine if the device is in cold state (pre firmware
-	 * load) or in warm state therefore compare the 'lsusb -v' of each state.
-	 * Most likely the number of endpoints or interfaces can be used to figure
-	 * the real state out.
-	 * For now we assume each odd call of this function (when the device is
-	 * plugged in or virtually plugged in after the firmware load) is warm
-	 * state and each even call is cold probe_count is set to 0 at module load.
-	 */
-
-	*cold = (probe_count % 2) == 0;
-	probe_count++;
 	return 0;
 }
 
+static struct mt352_config digitv_mt352_config = {
+	.demod_address = 0x0, /* ignored by the digitv anyway */
+	.demod_init = digitv_mt352_demod_init,
+	.pll_set = NULL, /* TODO */
+};
+
+static struct nxt6000_config digitv_nxt6000_config = {
+	.demod_address = 0x0, /* ignored by the digitv anyway */
+	.clock_inversion = 0x0,
+
+	.pll_init = NULL,
+	.pll_set = NULL,
+};
+
 static int digitv_frontend_attach(struct dvb_usb_device *d)
 {
-	struct mt352_config digitv_config;
+	if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) == NULL)
+		return 0;
+	if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) == NULL) {
+
+		warn("nxt6000 support is not done yet, in fact you are one of the first "
+				"person who wants to use this device in Linux. Please report to "
+				"linux-dvb@linuxtv.org");
+
+		return 0;
+	}
+	return -EIO;
+}
+
+
+static struct dvb_usb_nec_rc_key digitv_rc_keys[] = {
+	{ 0x00, 0x16, KEY_POWER }, /* dummy key */
+};
+
+int digitv_rc_init(struct dvb_usb_device *d)
+{
+	int i;
+	u8 b[4];
+	for (i = 0; i < sizeof(digitv_rc_keys)/sizeof(struct dvb_usb_nec_rc_key); i++)
+		set_bit(digitv_rc_keys[i].event, d->rc_input_dev.keybit);
+
+	b[0] = 1;
+	digitv_ctrl_msg(d,USB_WRITE_REMOTE_TYPE,0,b,4,NULL,0);
+
+	b[0] = 0;
+	digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
 
-	memset(&digitv_config,0,sizeof(struct mt352_config));
-	digitv_config.demod_init = NULL; /* TODO maybe */
-	digitv_config.demod_address = 0x0; /* ignore by the digitv anyway */
-	digitv_config.pll_set = NULL; /* TODO */
+	return 0;
+}
 
-	d->fe = mt352_attach(&digitv_config, &d->i2c_adap);
+/* TODO is it really the NEC protocol ? */
+int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+	u8 key[5];
+
+	digitv_ctrl_msg(d,USB_READ_REMOTE,0,NULL,0,&key[1],4);
+	/* TODO state, maybe it is VV ? */
+	if (key[1] != 0)
+		key[0] = 0x01; /* if something is inside the buffer, simulate key press */
+
+	/* call the universal NEC remote processor, to find out the key's state and event */
+	dvb_usb_nec_rc_key_to_event(d,digitv_rc_keys,sizeof(digitv_rc_keys)/sizeof(struct dvb_usb_nec_rc_key),
+			key,event,state);
+	if (key[0] != 0)
+		deb_rc("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]);
 	return 0;
 }
 
@@ -165,17 +226,17 @@ static struct dvb_usb_properties digitv_properties = {
 
 	.size_of_priv     = 0,
 
-	.streaming_ctrl   = NULL, // digitv_streaming_ctrl,
+	.streaming_ctrl   = NULL,
 	.pid_filter       = NULL,
 	.pid_filter_ctrl  = NULL,
-	.power_ctrl       = NULL, // digitv_power_ctrl,
+	.power_ctrl       = NULL,
 	.frontend_attach  = digitv_frontend_attach,
 	.tuner_attach     = NULL, // digitv_tuner_attach,
 	.read_mac_address = NULL,
 
-	.rc_interval      = 0, // 150,
-	.init_rc          = NULL, // digitv_rc_init,
-	.query_rc         = NULL, // digitv_rc_query,
+	.rc_interval      = 1000,
+	.init_rc          = digitv_rc_init,
+	.query_rc         = digitv_rc_query,
 
 	.identify_state   = digitv_identify_state,
 
@@ -196,7 +257,7 @@ static struct dvb_usb_properties digitv_properties = {
 
 	.num_device_descs = 2,
 	.devices = {
-		{   "Nebula Electronics µDigiTV DVB-T USB2.0)",
+		{   "Nebula Electronics uDigiTV DVB-T USB2.0)",
 			{ &digitv_table[0], NULL },
 			{ NULL },
 		},
@@ -205,7 +266,7 @@ static struct dvb_usb_properties digitv_properties = {
 
 static struct usb_driver digitv_driver = {
 	.owner		= THIS_MODULE,
-	.name		= "Nebula Electronics µDigiTV DVB-T USB2.0 device",
+	.name		= "Nebula Electronics uDigiTV DVB-T USB2.0 device",
 	.probe		= digitv_probe,
 	.disconnect = dvb_usb_device_exit,
 	.id_table	= digitv_table,
@@ -233,6 +294,6 @@ module_init (digitv_module_init);
 module_exit (digitv_module_exit);
 
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
-MODULE_DESCRIPTION("Driver for Nebula Electronics µDigiTV DVB-T USB2.0");
+MODULE_DESCRIPTION("Driver for Nebula Electronics uDigiTV DVB-T USB2.0");
 MODULE_VERSION("1.0-alpha");
 MODULE_LICENSE("GPL");
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/linux/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index 9e7bee7a0..d17d76803 100644
--- a/linux/drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/linux/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -27,7 +27,7 @@ static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 	u8 br[3] = { 0 };
 //	u8 bdeb[5] = { 0 };
 
-	dvb_usb_generic_rw(state->d,&bw,1,br,3);
+	dvb_usb_generic_rw(state->d,&bw,1,br,3,0);
 	switch (br[0]) {
 		case 0x01:
 			*stat = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
@@ -41,7 +41,7 @@ static int dtt200u_fe_read_status(struct dvb_frontend* fe, fe_status_t *stat)
 	}
 
 //	bw[0] = 0x88;
-//	dvb_usb_generic_rw(state->d,bw,1,bdeb,5);
+//	dvb_usb_generic_rw(state->d,bw,1,bdeb,5,0);
 
 //	deb_info("%02x: %02x %02x %02x %02x %02x\n",bw[0],bdeb[0],bdeb[1],bdeb[2],bdeb[3],bdeb[4]);
 
@@ -52,7 +52,7 @@ static int dtt200u_fe_read_ber(struct dvb_frontend* fe, u32 *ber)
 	struct dtt200u_fe_state *state = fe->demodulator_priv;
 	u8 bw = GET_BER;
 	*ber = 0;
-	dvb_usb_generic_rw(state->d,&bw,1,(u8*) ber, 3);
+	dvb_usb_generic_rw(state->d,&bw,1,(u8*) ber,3,0);
 	return 0;
 }
 
@@ -61,7 +61,7 @@ static int dtt200u_fe_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 	struct dtt200u_fe_state *state = fe->demodulator_priv;
 	u8 bw = GET_UNK;
 	*unc = 0;
-	dvb_usb_generic_rw(state->d,&bw,1,(u8*) unc, 3);
+	dvb_usb_generic_rw(state->d,&bw,1,(u8*) unc,3,0);
 	return 0;
 }
 
@@ -69,7 +69,7 @@ static int dtt200u_fe_read_signal_strength(struct dvb_frontend* fe, u16 *strengt
 {
 	struct dtt200u_fe_state *state = fe->demodulator_priv;
 	u8 bw = GET_SIG_STRENGTH, b;
-	dvb_usb_generic_rw(state->d,&bw,1,&b, 1);
+	dvb_usb_generic_rw(state->d,&bw,1,&b,1,0);
 	*strength = (b << 8) | b;
 	return 0;
 }
@@ -78,7 +78,7 @@ static int dtt200u_fe_read_snr(struct dvb_frontend* fe, u16 *snr)
 {
 	struct dtt200u_fe_state *state = fe->demodulator_priv;
 	u8 bw = GET_SNR,br;
-	dvb_usb_generic_rw(state->d,&bw,1,&br,1);
+	dvb_usb_generic_rw(state->d,&bw,1,&br,1,0);
 	*snr = ~((br << 8) | br);
 	return 0;
 }
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u.c b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
index b529c06e0..5fcde0538 100644
--- a/linux/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -75,7 +75,7 @@ static int dtt200u_rc_init(struct dvb_usb_device *d)
 static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
 	u8 key[5],cmd = GET_RC_KEY;
-	dvb_usb_generic_rw(d,&cmd,1,key,5);
+	dvb_usb_generic_rw(d,&cmd,1,key,5,0);
 	dvb_usb_nec_rc_key_to_event(d,dtt200u_rc_keys,sizeof(dtt200u_rc_keys)/sizeof(struct dvb_usb_nec_rc_key),
 			key,event,state);
 	if (key[0] != 0)
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 0aa2e3c2b..f6721f0ea 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -11,7 +11,7 @@
 #include <linux/pci.h>
 
 int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
-	u16 rlen)
+	u16 rlen, int delay_ms)
 {
 	int actlen,ret = -ENOMEM;
 
@@ -39,6 +39,9 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
 
 	/* an answer is expected, and no error before */
 	if (!ret && rbuf && rlen) {
+		if (delay_ms)
+			msleep(delay_ms);
+
 		ret = usb_bulk_msg(d->udev,usb_rcvbulkpipe(d->udev,
 				d->props.generic_bulk_ctrl_endpoint),rbuf,rlen,&actlen,
 				2*HZ);
@@ -58,7 +61,7 @@ EXPORT_SYMBOL(dvb_usb_generic_rw);
 
 int dvb_usb_generic_write(struct dvb_usb_device *d, u8 *buf, u16 len)
 {
-	return dvb_usb_generic_rw(d,buf,len,NULL,0);
+	return dvb_usb_generic_rw(d,buf,len,NULL,0,0);
 }
 EXPORT_SYMBOL(dvb_usb_generic_write);
 
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
index e653f8648..e5ae34fe5 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -186,7 +186,7 @@ extern int dvb_usb_device_init(struct usb_interface *, struct dvb_usb_properties
 extern void dvb_usb_device_exit(struct usb_interface *);
 
 /* the generic read/write method for device control */
-extern int dvb_usb_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
+extern int dvb_usb_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16,int);
 extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16);
 
 /* common used remote control parsing */
diff --git a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 2ceeead94..d51dfaf5e 100644
--- a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -84,7 +84,7 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 	int i;
 	struct dibusb_state *st = d->priv;
 
-	dvb_usb_generic_rw(d,cmd,2,key,5);
+	dvb_usb_generic_rw(d,cmd,2,key,5,0);
 
 	*state = REMOTE_NO_KEY_PRESSED;
 	switch (key[0]) {