- bttv: dark red image fixed (thanks to jeremy smith).

- misc cx88 tweaks.

3 files changed, 13 insertions, 20 deletions

diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 423a13517..44e8c00cc 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.14 2004/09/15 16:15:24 kraxel Exp $
+    $Id: bttv-driver.c,v 1.15 2004/09/20 11:39:43 kraxel Exp $
 
     bttv - Bt848 frame grabber driver
     
@@ -1054,11 +1054,6 @@ static void init_bt848(struct bttv *btv)
 	btwrite(whitecrush_upper, BT848_WC_UP);
 	btwrite(whitecrush_lower, BT848_WC_DOWN);
 
-	bt848_bright(btv,   btv->bright);
-	bt848_hue(btv,      btv->hue);
-	bt848_contrast(btv, btv->contrast);
-	bt848_sat(btv,      btv->saturation);
-
 	if (btv->opt_lumafilter) {
 		btwrite(0, BT848_E_CONTROL);
 		btwrite(0, BT848_O_CONTROL);
@@ -1067,6 +1062,11 @@ static void init_bt848(struct bttv *btv)
 		btwrite(BT848_CONTROL_LDEC, BT848_O_CONTROL);
 	}
 
+	bt848_bright(btv,   btv->bright);
+	bt848_hue(btv,      btv->hue);
+	bt848_contrast(btv, btv->contrast);
+	bt848_sat(btv,      btv->saturation);
+	
         /* interrupt */
 	init_irqreg(btv);
 }
@@ -3859,10 +3859,12 @@ static int __devinit bttv_probe(struct pci_dev *dev,
         /* register video4linux + input */
 	if (!bttv_tvcards[btv->c.type].no_video) {
 		bttv_register_video(btv);
+#if 0
 		bt848_bright(btv,32768);
 		bt848_contrast(btv,32768);
 		bt848_hue(btv,32768);
 		bt848_sat(btv,32768);
+#endif
 		audio_mux(btv,AUDIO_MUTE);
 		set_input(btv,0);
 	}
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 4c5b05339..ea8c9466a 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.37 2004/09/16 15:38:41 kraxel Exp $
+ * $Id: cx88-cards.c,v 1.38 2004/09/20 11:39:43 kraxel Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -189,7 +189,7 @@ struct cx88_board cx88_boards[] = {
 			.gpio2  = 0x0000ff40,
                 }},
                 .radio = {
-                        .type   = CX88_RADIO,
+			 .type   = CX88_RADIO,
                 },
 	},
 	[CX88_BOARD_WINFAST_DV2000] = {
@@ -746,11 +746,6 @@ void cx88_card_setup(struct cx88_core *core)
 			i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
 		leadtek_eeprom(core,eeprom);
 		break;
-        case CX88_BOARD_ASUS_PVR_416:
-	case CX88_BOARD_MSI_TVANYWHERE_MASTER:
-	case CX88_BOARD_KWORLD_LTV883:
-		core->has_radio = 1;
-                break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
 		/* Tuner reset is hooked to  the tuner out of reset */
 		cx_set(MO_GP0_IO, 0x00000101);
@@ -766,6 +761,8 @@ void cx88_card_setup(struct cx88_core *core)
 	}
 	if (frontend)
 		request_module(frontend);
+	if (cx88_boards[core->board].radio.type == CX88_RADIO)
+		core->has_radio = 1;
 }
 
 /* ------------------------------------------------------------------ */
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index c01317786..64590c5cb 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cx88-i2c.c,v 1.12 2004/09/16 07:05:48 kraxel Exp $
+    $Id: cx88-i2c.c,v 1.13 2004/09/20 11:39:43 kraxel Exp $
     
     cx88-i2c.c  --  all the i2c code is here
 
@@ -38,12 +38,6 @@ MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]");
 #define dprintk(level,fmt, arg...)	if (i2c_debug >= level) \
 	printk(KERN_DEBUG "%s: " fmt, core->name , ## arg)
 
-/* temporary here until new dvb-kernel code is merged ... */
-#ifndef FE_REGISTER
-# define FE_REGISTER           _IO  ('v', 84)
-# define FE_UNREGISTER         _IO  ('v', 85)
-#endif
-
 /* ----------------------------------------------------------------------- */
 
 void cx8800_bit_setscl(void *data, int state)