gandro-patch1.patch (4,70 KB)

Klartext PHP und ähnliche Sprachen

diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
index 5104c80..1ee259c 100644
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@@ -29,6 +29,8 @@ config VIDEO_CX23885
 	select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_TDA10071 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_A8293 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_CX24123 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_MB86A20S if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_MT2063 if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_MT2131 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 6a71a96..add1613 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -574,6 +574,10 @@ struct cx23885_board cx23885_boards[] = {
 		.name		= "Prof Revolution DVB-S2 8000",
 		.portb		= CX23885_MPEG_DVB,
 	},
+	[CX23885_BOARD_HAUPPAUGE_HVR3300] = {
+		.name		= "Hauppauge WinTV-HVR3300",
+		.portb		= CX23885_MPEG_DVB,
+	},
 	[CX23885_BOARD_HAUPPAUGE_HVR4400] = {
 		.name		= "Hauppauge WinTV-HVR4400",
 		.portb		= CX23885_MPEG_DVB,
@@ -824,6 +828,14 @@ struct cx23885_subid cx23885_subids[] = {
 		.card      = CX23885_BOARD_PROF_8000,
 	}, {
 		.subvendor = 0x0070,
+		.subdevice = 0x53f2,
+		.card      = CX23885_BOARD_HAUPPAUGE_HVR3300,
+	}, {
+		.subvendor = 0x0070,
+		.subdevice = 0x5340,
+		.card      = CX23885_BOARD_HAUPPAUGE_HVR3300,
+	}, {
+		.subvendor = 0x0070,
 		.subdevice = 0xc108,
 		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400,
 	}, {
@@ -1359,8 +1371,9 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
 		/* enable irq */
 		cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/
 		break;
+	case CX23885_BOARD_HAUPPAUGE_HVR3300:
 	case CX23885_BOARD_HAUPPAUGE_HVR4400:
-		/* GPIO-8 tda10071 demod reset */
+		/* GPIO-8 demod reset */ //TODO ist das für tda10071 gewesen?
 
 		/* Put the parts into reset and back */
 		cx23885_gpio_enable(dev, GPIO_8, 1);
@@ -1606,6 +1619,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 	case CX23885_BOARD_HAUPPAUGE_HVR1210:
 	case CX23885_BOARD_HAUPPAUGE_HVR1850:
 	case CX23885_BOARD_HAUPPAUGE_HVR1290:
+	case CX23885_BOARD_HAUPPAUGE_HVR3300:
 	case CX23885_BOARD_HAUPPAUGE_HVR4400:
 		if (dev->i2c_bus[0].i2c_rc == 0)
 			hauppauge_eeprom(dev, eeprom+0xc0);
@@ -1691,6 +1705,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 		ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
 		ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
 		break;
+	case CX23885_BOARD_HAUPPAUGE_HVR3300: //TODO: ist es vielleicht doch ts2?
 	case CX23885_BOARD_HAUPPAUGE_HVR4400:
 		ts1->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
 		ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 971e4ff..cb7d083 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -71,6 +71,9 @@
 #include "a8293.h"
 #include "mb86a20s.h"
 
+#include "cx24123.h"
+#include "isl6421.h"
+
 static unsigned int debug;
 
 #define dprintk(level, fmt, arg...)\
@@ -692,6 +695,11 @@ static const struct tda10071_config hauppauge_tda10071_config = {
 	.pll_multiplier = 20,
 };
 
+static const struct cx24123_config hauppauge_cx24123_config = {
+	.demod_address = 0x55, //TODO evtl 0x15? 0x05?
+	.set_ts_params = cx24123_set_ts_param,
+};
+
 static const struct a8293_config hauppauge_a8293_config = {
 	.i2c_addr = 0x0b,
 };
@@ -1304,6 +1312,18 @@ static int dvb_register(struct cx23885_tsport *port)
 			fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
 		}
 		break;
+	case CX23885_BOARD_HAUPPAUGE_HVR3300:
+		i2c_bus = &dev->i2c_bus[0];
+		fe0->dvb.frontend = dvb_attach(cx24123_attach,
+					&hauppauge_cx24123_config,
+					&i2c_bus->i2c_adap);
+		if (fe0->dvb.frontend != NULL) {
+			dvb_attach(isl6421_attach,
+					fe0->dvb.frontend,
+					&i2c_bus->i2c_adap,
+					0x08, ISL6421_DCL, 0x00, false);
+		}
+		break;
 	case CX23885_BOARD_HAUPPAUGE_HVR4400:
 		i2c_bus = &dev->i2c_bus[0];
 		fe0->dvb.frontend = dvb_attach(tda10071_attach,
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 038caf5..ee218c6 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -93,6 +93,7 @@
 #define CX23885_BOARD_PROF_8000                37
 #define CX23885_BOARD_HAUPPAUGE_HVR4400        38
 #define CX23885_BOARD_AVERMEDIA_HC81R          39
+#define CX23885_BOARD_HAUPPAUGE_HVR3300        40
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002