(maybe) new working device : HVR1100 + saa7134 correct diff

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

 



here a correct diff i think

but the remote control do nothing ...

dmesg :

[17180679.380000] Linux video capture interface: v2.00
[17180679.840000] saa7130/34: v4l2 driver version 0.2.14 loaded
[17180679.844000] ACPI: PCI Interrupt 0000:00:12.0[A] -> Link [LNKB] -> GSI 12 (level, low) -> IRQ 12 [17180679.844000] saa7133[0]: found at 0000:00:12.0, rev: 209, irq: 12, latency: 32, mmio: 0xe7101000 [17180679.844000] saa7133[0]: subsystem: 0070:6701, board: Hauppauge WinTV-HVR1100 DVB-T/Hybrid rev1108 [card=103,autodetected]
[17180679.844000] saa7133[0]: board init: gpio is 6400000
[17180679.844000] input: saa7134 IR (Hauppauge WinTV-HVR as /class/input/input3
[17180680.080000] tuner 0-004b: chip found @ 0x96 (saa7133[0])
[17180680.128000] tuner 0-004b: setting tuner address to 61
[17180680.168000] tuner 0-004b: type set to tda8290+75a
[17180680.268000] saa7133[0]: i2c eeprom 00: 70 00 01 67 54 20 1c 00 43 43 a9 1c 55 d2 b2 92 [17180680.268000] saa7133[0]: i2c eeprom 10: ff ff ff 0e ff 20 ff ff ff ff ff ff ff ff ff ff [17180680.268000] saa7133[0]: i2c eeprom 20: 01 40 01 32 32 01 01 33 88 ff 00 aa ff ff ff ff [17180680.268000] saa7133[0]: i2c eeprom 30: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [17180680.268000] saa7133[0]: i2c eeprom 40: ff 21 00 c2 96 10 03 32 15 60 ff ff ff ff ff ff [17180680.268000] saa7133[0]: i2c eeprom 50: ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [17180680.268000] saa7133[0]: i2c eeprom 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [17180680.272000] saa7133[0]: i2c eeprom 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[17180682.724000] saa7133[0]: registered device video0 [v4l2]
[17180682.724000] saa7133[0]: registered device vbi0
[17180682.724000] saa7133[0]: registered device radio0
[17180682.848000] saa7134_alsa: disagrees about version of symbol saa_dsp_writel
[17180682.852000] saa7134_alsa: Unknown symbol saa_dsp_writel
[17180682.852000] saa7134_alsa: Unknown symbol videobuf_dma_pci_unmap
[17180682.852000] saa7134_alsa: Unknown symbol videobuf_dma_pci_map
[17180682.852000] saa7134_alsa: Unknown symbol dmasound_exit
[17180682.852000] saa7134_alsa: Unknown symbol dmasound_init
[17180682.852000] saa7134_alsa: disagrees about version of symbol saa7134_set_dmabits
[17180682.852000] saa7134_alsa: Unknown symbol saa7134_set_dmabits

Any idea ?

Thanks

Seulement dans .: hvr1100_saa7134.diff
diff -u -r ./saa7134-cards.c ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
--- ./saa7134-cards.c	2006-10-22 22:38:57.000000000 +0200
+++ ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	2006-10-22 16:12:24.000000000 +0200
@@ -3098,39 +3098,6 @@
 			.gpio   = 0x0200000,
 		},
 	},
-	[SAA7134_BOARD_HAUPPAUGE_HVR1100_REV1108] = {
-		.name           = "Hauppauge WinTV-HVR1100 DVB-T/Hybrid rev1108",
-		.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 = 4,
-			.amux = TV,
-			.tv   = 1,
-		},{
-			.name = name_comp1,
-			.vmux = 1,
-			.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",
@@ -3791,12 +3758,6 @@
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
-		.subvendor    = 0x0070,
-		.subdevice    = 0x6701,
-		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1100_REV1108,
-	},{
-		.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,
@@ -3948,7 +3909,6 @@
 	case SAA7134_BOARD_FLYDVBT_LR301:
 	case SAA7134_BOARD_FLYDVBTDUO:
 	case SAA7134_BOARD_PROTEUS_2309:
-	case SAA7134_BOARD_HAUPPAUGE_HVR1100_REV1108 :
 		dev->has_remote = SAA7134_REMOTE_GPIO;
 		break;
 	case SAA7134_BOARD_FLYDVBS_LR300:
@@ -4140,7 +4100,6 @@
 		break;
 	case SAA7134_BOARD_PHILIPS_TIGER:
 	case SAA7134_BOARD_PINNACLE_PCTV_310i:
-	case SAA7134_BOARD_HAUPPAUGE_HVR1100_REV1108 :
 	case SAA7134_BOARD_TEVION_DVBT_220RF:
 	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
 	case SAA7134_BOARD_MEDION_MD8800_QUADRO:
Seulement dans .: saa7134-cards.c~
diff -u -r ./saa7134-dvb.c ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c
--- ./saa7134-dvb.c	2006-10-22 15:23:06.000000000 +0200
+++ ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134-dvb.c	2006-10-22 16:12:24.000000000 +0200
@@ -895,18 +895,6 @@
 
 /* ------------------------------------------------------------------ */
 
-static struct tda1004x_config hauppauge_hvr_1100_rev1108_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,
@@ -1228,17 +1216,6 @@
 			dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params;
 		}
 		break;
-	case SAA7134_BOARD_HAUPPAUGE_HVR1100_REV1108:
-		dev->dvb.frontend = dvb_attach(tda10046_attach,
-					       &hauppauge_hvr_1100_rev1108_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 .: saa7134-dvb.c~
diff -u -r ./saa7134.h ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h
--- ./saa7134.h	2006-10-22 15:25:59.000000000 +0200
+++ ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h	2006-10-22 16:12:24.000000000 +0200
@@ -238,7 +238,6 @@
 #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_HVR1100_REV1108 103
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
Seulement dans .: saa7134.h~
diff -u -r ./saa7134-input.c ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c
--- ./saa7134-input.c	2006-10-22 20:49:59.000000000 +0200
+++ ../../../../../../v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c	2006-10-22 16:12:24.000000000 +0200
@@ -223,10 +223,6 @@
 		mask_keydown = 0x000010;
 		polling	     = 50; // ms
 		break;
-	case SAA7134_BOARD_HAUPPAUGE_HVR1100_REV1108:
-		ir_codes     = ir_codes_gotview7135;
-		mask_keycode = 0;
-		break;
 	case SAA7134_BOARD_VIDEOMATE_TV_PVR:
 	case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
 	case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
Seulement dans .: saa7134-input.c~
_______________________________________________
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