[Fwd: Re: Another patch for hvr1110]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




--- Begin Message ---
Sorry, i forgot the patch

Tom
New card : HVR1110 with TV, radio and TNT
Signed off by : Thomas Genty <tomlohave@xxxxxxxxx>



Seulement dans v4l-dvb-modif/linux/drivers/media/video/saa7134/: hvr1110.diff
diff -ur v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134-cards.c
--- v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	2006-10-22 16:12:24.000000000 +0200
+++ v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134-cards.c	2006-10-29 19:33:12.000000000 +0100
@@ -3098,6 +3098,40 @@
 			.gpio   = 0x0200000,
 		},
 	},
+	[SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
+		/* Thomas Genty <tomlohave@xxxxxxxxx> */
+		.name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TDA8290,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.gpiomask       = 0x000200000,
+		.inputs         = {{
+			.name = name_tv,
+			.vmux = 1,
+			.amux = TV,
+			.tv   = 1,
+		}/*,{				// need test
+			.name = name_comp1,
+			.vmux = 2,
+			.amux = LINE2,
+		},{
+			.name = name_comp2,
+			.vmux = 0,
+			.amux = LINE2,
+		},{
+			.name = name_svideo,
+			.vmux = 8,
+			.amux = LINE2,
+		}*/},
+		.radio = {
+			.name = name_radio,
+			.amux   = TV,
+			.gpio   = 0x0200000,
+		},
+	},
 	[SAA7134_BOARD_AVERMEDIA_STUDIO_507] = {
 		/* Mikhail Fedotov <mo_fedotov@xxxxxxx> */
 		.name           = "Avermedia AVerTV Studio 507",
@@ -3758,6 +3792,12 @@
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+		.subvendor    = 0x0070,
+		.subdevice    = 0x6701,
+		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
 		.subvendor    = 0x1461, /* Avermedia Technologies Inc */
 		.subdevice    = 0x9715,
 		.driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_507,
@@ -3909,6 +3949,7 @@
 	case SAA7134_BOARD_FLYDVBT_LR301:
 	case SAA7134_BOARD_FLYDVBTDUO:
 	case SAA7134_BOARD_PROTEUS_2309:
+	/*case SAA7134_BOARD_HAUPPAUGE_HVR1110:*/ //Todo
 		dev->has_remote = SAA7134_REMOTE_GPIO;
 		break;
 	case SAA7134_BOARD_FLYDVBS_LR300:
Seulement dans v4l-dvb-modif/linux/drivers/media/video/saa7134/: saa7134-cards.c~
diff -ur v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134-dvb.c
--- v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c	2006-10-22 16:12:24.000000000 +0200
+++ v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134-dvb.c	2006-10-27 13:40:36.000000000 +0200
@@ -895,6 +895,18 @@
 
 /* ------------------------------------------------------------------ */
 
+static struct tda1004x_config hauppauge_hvr_1110_config = {
+	.demod_address = 0x08,
+	.invert        = 1,
+	.invert_oclk   = 0,
+	.xtal_freq     = TDA10046_XTAL_16M,
+	.agc_config    = TDA10046_AGC_TDA827X,
+	.if_freq       = TDA10046_FREQ_045,
+	.request_firmware = philips_tda1004x_request_firmware,
+};
+
+/* ------------------------------------------------------------------ */
+
 static struct tda1004x_config asus_p7131_dual_config = {
 	.demod_address = 0x08,
 	.invert        = 1,
@@ -1216,6 +1228,17 @@
 			dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params;
 		}
 		break;
+	case SAA7134_BOARD_HAUPPAUGE_HVR1110:
+		dev->dvb.frontend = dvb_attach(tda10046_attach,
+					       &hauppauge_hvr_1110_config,
+					       &dev->i2c_adap);
+		if (dev->dvb.frontend) {
+			dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
+			dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
+			dev->dvb.frontend->ops.tuner_ops.sleep = philips_tiger_tuner_sleep;
+			dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params;
+		}
+		break;
 	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
 		dev->dvb.frontend = dvb_attach(tda10046_attach,
 					       &asus_p7131_dual_config,
Seulement dans v4l-dvb-modif/linux/drivers/media/video/saa7134/: saa7134-dvb.c~
diff -ur v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134.h
--- v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h	2006-10-22 16:12:24.000000000 +0200
+++ v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134.h	2006-10-24 00:59:08.000000000 +0200
@@ -238,6 +238,7 @@
 #define SAA7134_BOARD_ASUS_EUROPA2_HYBRID 100
 #define SAA7134_BOARD_PINNACLE_PCTV_310i  101
 #define SAA7134_BOARD_AVERMEDIA_STUDIO_507 102
+#define SAA7134_BOARD_HAUPPAUGE_HVR1110 103
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
Seulement dans v4l-dvb-modif/linux/drivers/media/video/saa7134/: saa7134.h~
diff -ur v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134-input.c
--- v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c	2006-10-22 16:12:24.000000000 +0200
+++ v4l-dvb-modif/linux/drivers/media/video/saa7134/saa7134-input.c	2006-10-29 19:37:29.000000000 +0100
@@ -223,6 +223,8 @@
 		mask_keydown = 0x000010;
 		polling	     = 50; // ms
 		break;
+	/*case SAA7134_BOARD_HAUPPAUGE_HVR1110:
+		break;*/ // Todo
 	case SAA7134_BOARD_VIDEOMATE_TV_PVR:
 	case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
 	case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
Seulement dans v4l-dvb-modif/linux/drivers/media/video/saa7134/: saa7134-input.c~

--- End Message ---
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb

[Index of Archives]     [Linux Media]     [Video 4 Linux]     [Asterisk]     [Samba]     [Xorg]     [Xfree86]     [Linux USB]

  Powered by Linux