* ../linux/drivers/media/video/cx88/cx88-cards.c:

	* ../linux/drivers/media/video/cx88/cx88-cards.h:
	* ../linux/Documentation/video4linux/CARDLIST.cx88:
	- New Avermedia 303 card (without radio).

	Signed-off-by: Lubomir Bulej <bulej@nenya.ms.mff.cuni.cz>

5 files changed, 58 insertions, 13 deletions

diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index 12e9e3938..a1017d1a8 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -34,3 +34,4 @@
  33 -> Kworld V-Stream Xpert DVD
  34 -> ATI HDTV Wonder                                     [1002:a101]
  35 -> WinFast DTV1000-T                                   [107d:665f]
+ 36 -> AVerTV 303 (M126)                                   [1461:000a]
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c
index 2b7980039..cfd8250af 100644
--- a/linux/drivers/media/video/bttv-i2c.c
+++ b/linux/drivers/media/video/bttv-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-i2c.c,v 1.34 2005/10/31 13:31:09 rmcc Exp $
+    $Id: bttv-i2c.c,v 1.35 2005/10/31 16:13:15 nsh Exp $
 
     bttv-i2c.c  --  all the i2c code is here
 
@@ -300,9 +300,9 @@ static int attach_inform(struct i2c_client *client)
 	struct bttv *btv = i2c_get_adapdata(client->adapter);
 	int addr=ADDR_UNSET;
 
-	
-        if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
-        	addr = bttv_tvcards[btv->c.type].tuner_addr;
+
+	if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
+		addr = bttv_tvcards[btv->c.type].tuner_addr;
 
 
 	if (bttv_debug)
@@ -315,13 +315,13 @@ static int attach_inform(struct i2c_client *client)
 	if (btv->tuner_type != UNSET) {
 		struct tuner_setup tun_setup;
 
-		if ((addr==ADDR_UNSET) || 
+		if ((addr==ADDR_UNSET) ||
 				(addr==client->addr)) {
 
-               		tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
-               		tun_setup.type = btv->tuner_type;
+			tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
+			tun_setup.type = btv->tuner_type;
 			tun_setup.addr = addr;
-                	bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
+			bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
 		}
 
 	}
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 959390c1a..a4994c596 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-cards.c,v 1.102 2005/10/27 04:33:27 mkrufky Exp $
+ * $Id: cx88-cards.c,v 1.103 2005/10/31 16:13:15 nsh Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -176,7 +176,7 @@ struct cx88_board cx88_boards[] = {
 			.gpio3  = 0x02000000,
 		},
 	},
-	[CX88_BOARD_AVERTV_303] = {
+	[CX88_BOARD_AVERTV_STUDIO_303] = {
 		.name           = "AverTV Studio 303 (M126)",
 		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
 		.radio_type     = UNSET,
@@ -867,6 +867,36 @@ struct cx88_board cx88_boards[] = {
 		}},
 		.dvb            = 1,
 	},
+	[CX88_BOARD_AVERTV_303] = {
+		.name           = "AVerTV 303 (M126)",
+		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+		.radio_type     = UNSET,
+		.tuner_addr	= ADDR_UNSET,
+		.radio_addr	= ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT,
+		.input          = {{
+			.type   = CX88_VMUX_TELEVISION,
+			.vmux   = 0,
+			.gpio0  = 0x00ff,
+			.gpio1  = 0xe09f,
+			.gpio2  = 0x0010,
+			.gpio3  = 0x0000,
+		},{
+			.type   = CX88_VMUX_COMPOSITE1,
+			.vmux   = 1,
+			.gpio0  = 0x00ff,
+			.gpio1  = 0xe05f,
+			.gpio2  = 0x0010,
+			.gpio3  = 0x0000,
+		},{
+			.type   = CX88_VMUX_SVIDEO,
+			.vmux   = 2,
+			.gpio0  = 0x00ff,
+			.gpio1  = 0xe05f,
+			.gpio2  = 0x0010,
+			.gpio3  = 0x0000,
+		}},
+	},
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -917,7 +947,7 @@ struct cx88_subid cx88_subids[] = {
 	},{
 		.subvendor = 0x1461,
 		.subdevice = 0x000b,
-		.card      = CX88_BOARD_AVERTV_303,
+		.card      = CX88_BOARD_AVERTV_STUDIO_303,
 	},{
 		.subvendor = 0x1462,
 		.subdevice = 0x8606,
@@ -1010,6 +1040,10 @@ struct cx88_subid cx88_subids[] = {
 		.subvendor = 0x107d,
 		.subdevice = 0x665f,
 		.card      = CX88_BOARD_WINFAST_DTV1000,
+	},{
+		.subvendor = 0x1461,
+		.subdevice = 0x000a,
+		.card      = CX88_BOARD_AVERTV_303,
 	},
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 649c8b117..1eb7af392 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.87 2005/10/16 12:13:58 mchehab Exp $
+ * $Id: cx88.h,v 1.88 2005/10/31 16:13:15 nsh Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -155,7 +155,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_PIXELVIEW                3
 #define CX88_BOARD_ATI_WONDER_PRO           4
 #define CX88_BOARD_WINFAST2000XP_EXPERT     5
-#define CX88_BOARD_AVERTV_303               6
+#define CX88_BOARD_AVERTV_STUDIO_303        6
 #define CX88_BOARD_MSI_TVANYWHERE_MASTER    7
 #define CX88_BOARD_WINFAST_DV2000           8
 #define CX88_BOARD_LEADTEK_PVR2000          9
@@ -185,6 +185,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD 33
 #define CX88_BOARD_ATI_HDTVWONDER          34
 #define CX88_BOARD_WINFAST_DTV1000         35
+#define CX88_BOARD_AVERTV_303              36
 
 enum cx88_itype {
 	CX88_VMUX_COMPOSITE1 = 1,
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 72c750449..50d8dd181 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-31 16:09  nshmyrev
+
+	* ../linux/drivers/media/video/cx88/cx88-cards.c:
+	* ../linux/drivers/media/video/cx88/cx88-cards.h:
+	* ../linux/Documentation/video4linux/CARDLIST.cx88:
+	- New Avermedia 303 card (without radio).
+	
+	Signed-off-by: Lubomir Bulej <bulej@nenya.ms.mff.cuni.cz>
+
 2005-10-31 13:34  rmcc
 
 	* ../linux/drivers/media/video/bttv-cards.c: