*tuner-core.c:

        - some tuner_info msgs will be generated only if insmod opt
          tuner_debug enabled.

        *tea5767.c:
        - tuner_info msgs will be generated only if insmod tuner option
          tuner_debug enabled.
        - some cleanups for better reading.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

1 files changed, 77 insertions, 89 deletions

diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index c77e4f5ae..fb0e1616a 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
  * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
  * I2C address is allways 0xC0.
  *
- * $Id: tea5767.c,v 1.10 2005/06/19 23:52:22 mchehab Exp $
+ * $Id: tea5767.c,v 1.11 2005/06/21 15:40:33 mchehab Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -31,9 +31,16 @@
 #include <media/tuner.h>
 #endif
 
+/* Declared at tuner-core.c */
+extern unsigned int tuner_debug;
+
 #define PREFIX "TEA5767 "
 
-/* Write mode register values */
+/*****************************************************************************/
+
+/******************************
+ * Write mode register values *
+ ******************************/
 
 /* First register */
 #define TEA5767_MUTE		0x80 /* Mutes output */
@@ -101,7 +108,11 @@
 
 /* By activating, deemphasis=50, or else, deemphasis of 50us */
 #define TEA5767_DEEMPH_75	0X40
-/* Read mode register values */
+
+/*****************************
+ * Read mode register values *
+ *****************************/
+
 /* First register */
 #define TEA5767_READY_FLAG_MASK	0x80
 #define TEA5767_BAND_LIMIT_MASK	0X40
@@ -124,6 +135,7 @@
 /* Reserved for future extensions */
 #define TEA5767_RESERVED_MASK	0xff
 
+/*****************************************************************************/
 
 static void set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
@@ -132,6 +144,57 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
 	tuner_warn("This tuner doesn't support TV freq.\n");
 }
 
+static void tea5767_status_dump(unsigned char *buffer)
+{
+	unsigned int div, frq;
+	
+	if (TEA5767_READY_FLAG_MASK & buffer[0])
+		printk(PREFIX "Ready Flag ON\n");
+	else
+		printk(PREFIX "Ready Flag OFF\n");
+	
+	if (TEA5767_BAND_LIMIT_MASK & buffer[0])
+		printk(PREFIX "Tuner at band limit\n");
+	else
+		printk(PREFIX "Tuner not at band limit\n");
+
+	div=((buffer[0]&0x3f)<<8) | buffer[1];
+
+	switch (TEA5767_HIGH_LO_32768) {
+	case TEA5767_HIGH_LO_13MHz:
+		frq = 1000*(div*50-700-225)/4; /* Freq in KHz */
+		break;
+	case TEA5767_LOW_LO_13MHz:
+		frq = 1000*(div*50+700+225)/4; /* Freq in KHz */
+		break;
+	case TEA5767_LOW_LO_32768:
+		frq = 1000*(div*32768/1000+700+225)/4; /* Freq in KHz */
+		break;
+	case TEA5767_HIGH_LO_32768:
+	default:
+		frq = 1000*(div*32768/1000-700-225)/4; /* Freq in KHz */
+		break;
+	}
+        buffer[0] = (div>>8) & 0x3f;
+        buffer[1] = div      & 0xff;
+	
+	printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
+						frq/1000,frq%1000,div);
+
+	if (TEA5767_STEREO_MASK & buffer[2])
+		printk(PREFIX "Stereo\n");
+	else
+		printk(PREFIX "Mono\n");
+
+	printk(PREFIX "IF Counter = %d\n",buffer[2] & TEA5767_IF_CNTR_MASK);
+	
+	printk(PREFIX "ADC Level = %d\n",(buffer[3] & TEA5767_ADC_LEVEL_MASK)>>4);
+
+	printk(PREFIX "Chip ID = %d\n",(buffer[3] & TEA5767_CHIP_ID_MASK));
+
+	printk(PREFIX "Reserved = 0x%02x\n",(buffer[4] & TEA5767_RESERVED_MASK));
+}
+
 /* Freq should be specifyed at 62.5 Hz */
 static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 {
@@ -140,8 +203,8 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 	unsigned div;
 	int rc;
 
-	printk(PREFIX "radio freq counter %d\n",frq);
-
+	if ( tuner_debug )
+		printk(PREFIX "radio freq counter %d\n",frq);
 
 	/* Rounds freq to next decimal value - for 62.5 KHz step */
 	/* frq = 20*(frq/16)+radio_frq[frq%16]; */
@@ -150,7 +213,6 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 	buffer[3] = TEA5767_PORT2_HIGH | TEA5767_HIGH_CUT_CTRL | TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND;
 	buffer[4]=0;
 
-
 	if (t->audmode == V4L2_TUNER_MODE_MONO) {
 		tuner_dbg("TEA5767 set to mono\n");
 		buffer[2] |= TEA5767_MONO;
@@ -162,14 +224,12 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 		tuner_dbg("TEA5767 radio HIGH LO inject xtal @ 13 MHz\n");
 		buffer[2] |= TEA5767_HIGH_LO_INJECT;
 		buffer[4] |= TEA5767_PLLREF_ENABLE;
-/*		div = (frq*4000/20+225+25)/50; */
 		div = (frq*4/16+700+225+25)/50;
 		break;
 	case TEA5767_LOW_LO_13MHz:
 		tuner_dbg("TEA5767 radio LOW LO inject xtal @ 13 MHz\n");
 		
 		buffer[4] |= TEA5767_PLLREF_ENABLE;
-/*		div = (frq*4000/20-225+25)/50; */
 		div = (frq*4/16-700-225+25)/50;
 		break;
 	case TEA5767_LOW_LO_32768:
@@ -177,7 +237,6 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 		buffer[3] |= TEA5767_XTAL_32768;
 		/* const 700=4000*175 Khz - to adjust freq to right value */
 		div = (1000*(frq*4/16-700-225)+16384)>>15;
-/*		div = (1000*(frq*4000/20-700-225)+16384)>>15; */
 		break;
 	case TEA5767_HIGH_LO_32768:
 	default:
@@ -185,87 +244,19 @@ static void set_radio_freq(struct i2c_client *c, unsigned int frq)
 		
 		buffer[2] |= TEA5767_HIGH_LO_INJECT;
 		buffer[3] |= TEA5767_XTAL_32768;
-/*		div = (1000*(frq*4000/20+700+225)+16384)/32768; */
 		div = (1000*(frq*4/16+700+225)+16384)>>15;
 		break;
 	}
         buffer[0] = (div>>8) & 0x3f;
         buffer[1] = div      & 0xff;
 
-/*	tuner_dbg("TEA5767 radio SET 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
-	       buffer[0],buffer[1],buffer[2],buffer[3],buffer[4]); */
+	if ( tuner_debug )
+		tea5767_status_dump(buffer);
 
         if (5 != (rc = i2c_master_send(c,buffer,5)))
 		tuner_warn("i2c i/o error: rc == %d (should be 5)\n",rc);
 }
 
-static int tea5767_set_tuner(struct i2c_client *c, struct v4l2_tuner *vt)
-{
-        struct tuner *t = i2c_get_clientdata(c);
-
-	if (vt->audmode == V4L2_TUNER_MODE_MONO)
-		t->audmode = V4L2_TUNER_MODE_MONO;
-        else
-		t->audmode = V4L2_TUNER_MODE_STEREO;
-
-	set_radio_freq(c, t->freq);
-
-	return 0;
-}
-
-static void tea5767_status_dump(unsigned char *buffer)
-{
-	unsigned int div, frq;
-	
-	if (TEA5767_READY_FLAG_MASK & buffer[0])
-		printk(PREFIX "Ready Flag ON\n");
-	else
-		printk(PREFIX "Ready Flag OFF\n");
-	
-	if (TEA5767_BAND_LIMIT_MASK & buffer[0])
-		printk(PREFIX "Tuner at band limit\n");
-	else
-		printk(PREFIX "Tuner not at band limit\n");
-
-	div=((buffer[0]&0x3f)<<8) | buffer[1];
-
-	switch (TEA5767_HIGH_LO_32768) {
-	case TEA5767_HIGH_LO_13MHz:
-		frq = 1000*(div*50-700-225)/4; /* Freq in KHz */
-		break;
-	case TEA5767_LOW_LO_13MHz:
-		frq = 1000*(div*50+700+225)/4; /* Freq in KHz */
-		break;
-	case TEA5767_LOW_LO_32768:
-		frq = 1000*(div*32768/1000+700+225)/4; /* Freq in KHz */
-		break;
-	case TEA5767_HIGH_LO_32768:
-	default:
-//		div = (1000*(frq*4/20+700+225)+16384)>>15;
-		frq = 1000*(div*32768/1000-700-225)/4; /* Freq in KHz */
-		break;
-	}
-        buffer[0] = (div>>8) & 0x3f;
-        buffer[1] = div      & 0xff;
-
-	
-	printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
-			frq/1000,frq%1000,div);
-
-	if (TEA5767_STEREO_MASK & buffer[2])
-		printk(PREFIX "Stereo\n");
-	else
-		printk(PREFIX "Mono\n");
-
-	printk(PREFIX "IF Counter = %d\n",buffer[2] & TEA5767_IF_CNTR_MASK);
-	
-	printk(PREFIX "ADC Level = %d\n",(buffer[3] & TEA5767_ADC_LEVEL_MASK) >> 4);
-
-	printk(PREFIX "Chip ID = %d\n",(buffer[3] & TEA5767_CHIP_ID_MASK));
-
-	printk(PREFIX "Reserved = 0x%02x\n",(buffer[4] & TEA5767_RESERVED_MASK));
-}
-
 static int tea5767_signal(struct i2c_client *c)
 {
 	unsigned char buffer[5];
@@ -276,10 +267,6 @@ static int tea5767_signal(struct i2c_client *c)
         if (5 != (rc = i2c_master_recv(c,buffer,5)))
                 tuner_warn ( "i2c i/o error: rc == %d (should be 5)\n",rc);
 		
-/*	tuner_dbg("TEA5767 radio SIG GET 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
-	       buffer[0],buffer[1],buffer[2],buffer[3],buffer[4]); */
-
-	/* tea5767_status_dump(buffer); */
 	return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) <<(13-4));
 }
 
@@ -295,14 +282,15 @@ static int tea5767_stereo(struct i2c_client *c)
 	
 	rc = buffer[2] & TEA5767_STEREO_MASK;
 
-/*	tuner_dbg("TEA5767 radio ST GET = %02x\n", rc); */
+	if ( tuner_debug )
+		tuner_dbg("TEA5767 radio ST GET = %02x\n", rc);
 	
 	return ( (buffer[2] & TEA5767_STEREO_MASK) ? V4L2_TUNER_SUB_STEREO: 0);
 }
 
 int tea_detection(struct i2c_client *c)
 {
-	unsigned char buffer[7]= { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+	unsigned char buffer[5]= { 0xff, 0xff, 0xff, 0xff, 0xff };
 	int rc;
 	struct tuner *t = i2c_get_clientdata(c);
 
@@ -319,9 +307,10 @@ int tea_detection(struct i2c_client *c)
 	}
 
 	/*  Status bytes:
-	    Byte 4: bit 3:1 : CI (Chip Identification) == 0
-		    bit 0   : internally set to 0
-	    Byte 5: bit 7:0 : == 0 */
+	 *  Byte 4: bit 3:1 : CI (Chip Identification) == 0
+	 *	    bit 0   : internally set to 0
+	 *  Byte 5: bit 7:0 : == 0 
+	 */
 
 	if (!((buffer[3] & 0x0f) == 0x00) && (buffer[4] == 0x00)) {
                 tuner_warn ( "Chip ID is not zero. It is not a TEA5767\n" );
@@ -345,7 +334,6 @@ int tea5767_tuner_init(struct i2c_client *c)
 	t->radio_freq = set_radio_freq;
 	t->has_signal = tea5767_signal;
 	t->is_stereo  = tea5767_stereo;
-	t->set_tuner  = tea5767_set_tuner;
 
 	return (0);
 }