Skip to contentSkip to conversation

V4L(906) Remote and more info for pctv cardbus whitespace cleanup

PATCH New [email protected] 1 participant 1 message Nov 7, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 6/20 V4L(906) Remote and more info for pctv cardbus whitespace cleanup

From: Pavel Mihaylov <[email protected]>

- Remote and more info for PCTV Cardbus. Whitespace cleanup.

-----------------

 Documentation/video4linux/CARDLIST.saa7134  |    1 
 drivers/media/video/saa7134/saa7134-cards.c |   23 ++++++++++++---
 drivers/media/video/saa7134/saa7134-dvb.c   |    8 ++---
 drivers/media/video/saa7134/saa7134-input.c |   42 ++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 8 deletions(-)
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -79,3 +79,4 @@
  78 -> ASUSTeK P7131 Dual                       [1043:4862]
  79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B)
  80 -> ASUS Digimatrix TV                       [1043:0210]
+ 81 -> Philips Tiger reference design           [1131:2018]
drivers/media/video/saa7134/saa7134-cards.c +19 -4
@@ -2453,18 +2453,33 @@ struct saa7134_board saa7134_boards[] = 
 	},
 	[SAA7134_BOARD_PCTV_CARDBUS] = {
 		/* Paul Tom Zalac <[email protected]> */
-		/* tda8275a tuner doesnt work yet */
+		/* Pavel Mihaylov <[email protected]> */
 		.name           = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)",
+				/* Sedna Cardbus TV Tuner */
 		.audio_clock    = 0x00187de7,
-		.tuner_type     = TUNER_ABSENT,
+		.tuner_type     = TUNER_PHILIPS_TDA8290,
 		.radio_type     = UNSET,
 		.tuner_addr     = ADDR_UNSET,
 		.radio_addr     = ADDR_UNSET,
+		.gpiomask       = 0xe880c0,
 		.inputs         = {{
+			.name = name_tv,
+			.vmux = 3,
+			.amux = TV,
+			.tv   = 1,
+		},{
 			.name = name_comp1,
 			.vmux = 1,
-			.amux = LINE2,
+			.amux = LINE1,
+		},{
+			.name = name_svideo,
+			.vmux = 6,
+			.amux = LINE1,
 		}},
+		.radio = {
+			.name = name_radio,
+			.amux = LINE2,
+		},
 	},
 	[SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV] = {
 		/* "Cyril Lacoux (Yack)" <[email protected]> */
@@ -2942,7 +2957,7 @@ struct pci_device_id saa7134_pci_tbl[] =
 		.subvendor    = 0x1043,
 		.subdevice    = 0x4862,
 		.driver_data  = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
- 	},{
+	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
 		.subvendor    = PCI_VENDOR_ID_PHILIPS,
drivers/media/video/saa7134/saa7134-dvb.c +4 -4
@@ -667,7 +667,7 @@ static struct tda827xa_data tda827xa_dvb
 	{ .lomax = 911000000, .svco = 3, .spd = 0, .scr = 2, .sbs = 4, .gc3 = 0},
 	{ .lomax =         0, .svco = 0, .spd = 0, .scr = 0, .sbs = 0, .gc3 = 0}};
 
-			
+
 static int philips_tda827xa_pll_set(u8 addr, struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
 	struct saa7134_dev *dev = fe->dvb->priv;
@@ -677,7 +677,7 @@ static int philips_tda827xa_pll_set(u8 a
 	struct i2c_msg msg = {.addr = addr,.flags = 0,.buf = tuner_buf};
 	int i, tuner_freq, if_freq;
 	u32 N;
-	
+
 	switch (params->u.ofdm.bandwidth) {
 	case BANDWIDTH_6_MHZ:
 		if_freq = 4000000;
@@ -749,9 +749,9 @@ static void philips_tda827xa_pll_sleep(u
 	struct saa7134_dev *dev = fe->dvb->priv;
 	static u8 tda827xa_sleep[] = { 0x30, 0x90};
 	struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tda827xa_sleep,
-	                            .len = sizeof(tda827xa_sleep) };
+		                    .len = sizeof(tda827xa_sleep) };
 	i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
-	
+
 }
 
 /* ------------------------------------------------------------------ */
drivers/media/video/saa7134/saa7134-input.c +42 -0

54 lines not on this page · raw message

_______________________________________________________
Yahoo! Acesso Gr�tis: Internet r�pida e gr�tis. Instale o discador agora!
http://br.acesso.yahoo.com/