---

yaml --- r: 250146 b: refs/heads/master c: a43be98 h: refs/heads/master v: v3
git-mirror · May 20, 2011 · baaa839 · baaa839
1 parent d199c59
commit baaa839
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72ffd2b822b4ff589432df0f56e3d2cd60c10447
+refs/heads/master: a43be980b3cf9c72f4bac4c7ce043e52004c6d90
diff --git a/trunk/drivers/media/dvb/dvb-usb/anysee.c b/trunk/drivers/media/dvb/dvb-usb/anysee.c
@@ -505,6 +505,66 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 				break;
 		}
 		break;
+	case ANYSEE_HW_508TC: /* 18 */
+		/* E7 TC */
+
+		/* enable transport stream on IOA[7] */
+		ret = anysee_wr_reg_mask(adap->dev, REG_IOA, (1 << 7), 0x80);
+		if (ret)
+			goto error;
+
+		if (dvb_usb_anysee_delsys) {
+			/* disable DVB-C demod on IOD[5] */
+			ret = anysee_wr_reg_mask(adap->dev, REG_IOD, (0 << 5),
+				0x20);
+			if (ret)
+				goto error;
+
+			/* enable DVB-T demod on IOD[6] */
+			ret = anysee_wr_reg_mask(adap->dev, REG_IOD, (1 << 6),
+				0x40);
+			if (ret)
+				goto error;
+
+			/* enable IF route on IOE[0] */
+			ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (0 << 0),
+				0x01);
+			if (ret)
+				goto error;
+
+			/* attach demod */
+			adap->fe = dvb_attach(zl10353_attach,
+				&anysee_zl10353_tda18212_config,
+				&adap->dev->i2c_adap);
+			if (adap->fe)
+				break;
+		} else {
+			/* disable DVB-T demod on IOD[6] */
+			ret = anysee_wr_reg_mask(adap->dev, REG_IOD, (0 << 6),
+				0x40);
+			if (ret)
+				goto error;
+
+			/* enable DVB-C demod on IOD[5] */
+			ret = anysee_wr_reg_mask(adap->dev, REG_IOD, (1 << 5),
+				0x20);
+			if (ret)
+				goto error;
+
+			/* enable IF route on IOE[0] */
+			ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 0),
+				0x01);
+			if (ret)
+				goto error;
+
+			/* attach demod */
+			adap->fe = dvb_attach(tda10023_attach,
+				&anysee_tda10023_tda18212_config,
+				&adap->dev->i2c_adap, 0x48);
+			if (adap->fe)
+				break;
+		}
+		break;
 	}
 
 	if (!adap->fe) {
@@ -590,6 +650,22 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
 			&adap->dev->i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A);
 
 		break;
+	case ANYSEE_HW_508TC: /* 18 */
+		/* E7 TC */
+
+		/* enable tuner on IOE[4] */
+		ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 4), 0x10);
+		if (ret)
+			goto error;
+
+		/* attach tuner */
+		fe = dvb_attach(tda18212_attach, adap->fe, &adap->dev->i2c_adap,
+			&anysee_tda18212_config);
+		if (!fe)
+			ret = -ENODEV;
+
+		break;
+
 	default:
 		ret = -ENODEV;
 	}

diff --git a/trunk/drivers/media/dvb/dvb-usb/anysee.h b/trunk/drivers/media/dvb/dvb-usb/anysee.h
@@ -66,6 +66,7 @@ struct anysee_state {
 #define ANYSEE_HW_507DC 10 /* E30 C Plus */
 #define ANYSEE_HW_507SI 11 /* E30 S2 Plus */
 #define ANYSEE_HW_507FA 15 /* E30 Combo Plus / E30 C Plus */
+#define ANYSEE_HW_508TC 18 /* E7 TC */
 
 #define REG_IOA       0x80 /* Port A (bit addressable) */
 #define REG_IOB       0x90 /* Port B (bit addressable) */