fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / media / video / tda7432.c
index 4365d94..78e043a 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * For the STS-Thompson TDA7432 audio processor chip
- * 
+ *
  * Handles audio functions: volume, balance, tone, loudness
- * This driver will not complain if used with any 
+ * This driver will not complain if used with any
  * other i2c device with the same address.
  *
  * Muting and tone control by Jonathan Isom <jisom@ematic.com>
@@ -48,9 +48,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include "bttv.h"
-#include <media/audiochip.h>
-#include <media/id.h>
+#include <media/v4l2-common.h>
+#include <media/i2c-addr.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32
@@ -60,21 +59,20 @@ MODULE_AUTHOR("Eric Sandeen <eric_sandeen@bigfoot.com>");
 MODULE_DESCRIPTION("bttv driver for the tda7432 audio processor chip");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(debug,"i");
-MODULE_PARM(loudness,"i");
+static int maxvol;
+static int loudness; /* disable loudness by default */
+static int debug;       /* insmod parameter */
+module_param(debug, int, S_IRUGO | S_IWUSR);
+module_param(loudness, int, S_IRUGO);
 MODULE_PARM_DESC(maxvol,"Set maximium volume to +20db (0), default is 0db(1)");
-MODULE_PARM(maxvol,"i");
-static int maxvol = 0;
-static int loudness = 0; /* disable loudness by default */
-static int debug = 0;   /* insmod parameter */
+module_param(maxvol, int, S_IRUGO | S_IWUSR);
 
 
 /* Address to scan (I2C address of this chip) */
 static unsigned short normal_i2c[] = {
-       I2C_TDA7432 >> 1,
+       I2C_ADDR_TDA7432 >> 1,
        I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 /* Structure of address and subaddresses for the tda7432 */
@@ -92,9 +90,6 @@ struct tda7432 {
 static struct i2c_driver driver;
 static struct i2c_client client_template;
 
-#define dprintk  if (debug) printk
-#define d2printk if (debug > 1) printk
-
 /* The TDA7432 is made by STS-Thompson
  * http://www.st.com
  * http://us.st.com/stonline/books/pdf/docs/4056.pdf
@@ -106,7 +101,7 @@ static struct i2c_client client_template;
  * output (for front and rear).  Since most vidcap cards probably
  * don't have 4 channel output, this driver will set front & rear
  * together (no independent control).
- */ 
+ */
 
                /* Subaddresses for TDA7432 */
 
@@ -132,13 +127,13 @@ static struct i2c_client client_template;
  * 0x03 - Mute  (Using Attenuators Plays better with modules)
  * Mono probably isn't used - I'm guessing only the stereo
  * input is connected on most cards, so we'll set it to stereo.
- * 
+ *
  * Bit 3 controls bass cut: 0/1 is non-symmetric/symmetric bass cut
  * Bit 4 controls bass range: 0/1 is extended/standard bass range
- * 
+ *
  * Highest 3 bits not used
  */
+
 #define TDA7432_STEREO_IN      0
 #define TDA7432_MONO_IN                2       /* Probably won't be used */
 #define TDA7432_BASS_SYM       1 << 3
@@ -161,7 +156,7 @@ static struct i2c_client client_template;
 #define TDA7432_LD_ON          1 << 7
 
 
-/* Subaddress 0x02 - Tone control */ 
+/* Subaddress 0x02 - Tone control */
 
 /* Bits 0,1,2 control absolute treble gain from 0dB to 14dB
  * 0x0 is 14dB, 0x7 is 0dB
@@ -173,23 +168,23 @@ static struct i2c_client client_template;
  * Bits 4,5,6 control absolute bass gain from 0dB to 14dB
  * (This is only true for normal base range, set in 0x00)
  * 0x0 << 4 is 14dB, 0x7 is 0dB
- * 
+ *
  * Bit 7 controls bass attenuation/gain (sign)
  * 1 << 7 = gain (+)
- * 0 << 7 = attenuation (-) 
+ * 0 << 7 = attenuation (-)
  *
  * Example:
  * 1 1 0 1 0 1 0 1 is +4dB bass, -4dB treble
  */
 
-#define TDA7432_TREBLE_0DB             0xf 
+#define TDA7432_TREBLE_0DB             0xf
 #define TDA7432_TREBLE                 7
 #define TDA7432_TREBLE_GAIN            1 << 3
 #define TDA7432_BASS_0DB               0xf
 #define TDA7432_BASS                   7 << 4
 #define TDA7432_BASS_GAIN              1 << 7
 
+
 /* Subaddress 0x03 - Left  Front attenuation */
 /* Subaddress 0x04 - Left  Rear  attenuation */
 /* Subaddress 0x05 - Right Front attenuation */
@@ -202,7 +197,7 @@ static struct i2c_client client_template;
  * 0x1f is -37.5dB
  *
  * Bit 5 mutes that channel when set (1 = mute, 0 = unmute)
- * We'll use the mute on the input, though (above) 
+ * We'll use the mute on the input, though (above)
  * Bits 6,7 unused
  */
 
@@ -223,20 +218,20 @@ static struct i2c_client client_template;
  *
  * Bits 5,6,7 unused
  */
+
+
 
 /* Begin code */
 
 static int tda7432_write(struct i2c_client *client, int subaddr, int val)
 {
        unsigned char buffer[2];
-       d2printk("tda7432: In tda7432_write\n");
-       dprintk("tda7432: Writing %d 0x%x\n", subaddr, val);
+       v4l_dbg(2, debug,client,"In tda7432_write\n");
+       v4l_dbg(1, debug,client,"Writing %d 0x%x\n", subaddr, val);
        buffer[0] = subaddr;
        buffer[1] = val;
        if (2 != i2c_master_send(client,buffer,2)) {
-               printk(KERN_WARNING "tda7432: I/O error, trying (write %d 0x%x)\n",
+               v4l_err(client,"I/O error, trying (write %d 0x%x)\n",
                       subaddr, val);
                return -1;
        }
@@ -244,27 +239,14 @@ static int tda7432_write(struct i2c_client *client, int subaddr, int val)
 }
 
 /* I don't think we ever actually _read_ the chip... */
-#if 0
-static int tda7432_read(struct i2c_client *client)
-{
-       unsigned char buffer;
-       d2printk("tda7432: In tda7432_read\n");
-       if (1 != i2c_master_recv(client,&buffer,1)) {
-               printk(KERN_WARNING "tda7432: I/O error, trying (read)\n");
-               return -1;
-       }
-       dprintk("tda7432: Read 0x%02x\n", buffer); 
-       return buffer;
-}
-#endif
 
 static int tda7432_set(struct i2c_client *client)
 {
        struct tda7432 *t = i2c_get_clientdata(client);
        unsigned char buf[16];
-       d2printk("tda7432: In tda7432_set\n");
-       
-       dprintk(KERN_INFO 
+       v4l_dbg(2, debug,client,"In tda7432_set\n");
+
+       v4l_dbg(1, debug,client,
                "tda7432: 7432_set(0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n",
                t->input,t->volume,t->bass,t->treble,t->lf,t->lr,t->rf,t->rr,t->loud);
        buf[0]  = TDA7432_IN;
@@ -278,7 +260,7 @@ static int tda7432_set(struct i2c_client *client)
        buf[8]  = t->rr;
        buf[9]  = t->loud;
        if (10 != i2c_master_send(client,buf,10)) {
-               printk(KERN_WARNING "tda7432: I/O error, trying tda7432_set\n");
+               v4l_err(client,"I/O error, trying tda7432_set\n");
                return -1;
        }
 
@@ -288,14 +270,14 @@ static int tda7432_set(struct i2c_client *client)
 static void do_tda7432_init(struct i2c_client *client)
 {
        struct tda7432 *t = i2c_get_clientdata(client);
-       d2printk("tda7432: In tda7432_init\n");
+       v4l_dbg(2, debug,client,"In tda7432_init\n");
 
        t->input  = TDA7432_STEREO_IN |  /* Main (stereo) input   */
                    TDA7432_BASS_SYM  |  /* Symmetric bass cut    */
-                   TDA7432_BASS_NORM;   /* Normal bass range     */ 
+                   TDA7432_BASS_NORM;   /* Normal bass range     */
        t->volume =  0x3b ;                              /* -27dB Volume            */
        if (loudness)                    /* Turn loudness on?     */
-               t->volume |= TDA7432_LD_ON;     
+               t->volume |= TDA7432_LD_ON;
        t->muted    = VIDEO_AUDIO_MUTE;
        t->treble   = TDA7432_TREBLE_0DB; /* 0dB Treble            */
        t->bass         = TDA7432_BASS_0DB;      /* 0dB Bass              */
@@ -316,35 +298,28 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
 {
        struct tda7432 *t;
        struct i2c_client *client;
-       d2printk("tda7432: In tda7432_attach\n");
 
-       t = kmalloc(sizeof *t,GFP_KERNEL);
+       t = kzalloc(sizeof *t,GFP_KERNEL);
        if (!t)
                return -ENOMEM;
-       memset(t,0,sizeof *t);
 
        client = &t->c;
-        memcpy(client,&client_template,sizeof(struct i2c_client));
-        client->adapter = adap;
-        client->addr = addr;
+       memcpy(client,&client_template,sizeof(struct i2c_client));
+       client->adapter = adap;
+       client->addr = addr;
        i2c_set_clientdata(client, t);
-       
-       do_tda7432_init(client);
-       printk(KERN_INFO "tda7432: init\n");
 
+       do_tda7432_init(client);
        i2c_attach_client(client);
+
+       v4l_info(client, "chip found @ 0x%x (%s)\n", addr << 1, adap->name);
        return 0;
 }
 
 static int tda7432_probe(struct i2c_adapter *adap)
 {
-#ifdef I2C_CLASS_TV_ANALOG
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tda7432_attach);
-#else
-       if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
-               return i2c_probe(adap, &addr_data, tda7432_attach);
-#endif
        return 0;
 }
 
@@ -354,7 +329,7 @@ static int tda7432_detach(struct i2c_client *client)
 
        do_tda7432_init(client);
        i2c_detach_client(client);
-       
+
        kfree(t);
        return 0;
 }
@@ -363,18 +338,19 @@ static int tda7432_command(struct i2c_client *client,
                           unsigned int cmd, void *arg)
 {
        struct tda7432 *t = i2c_get_clientdata(client);
-       d2printk("tda7432: In tda7432_command\n");
+       v4l_dbg(2, debug,client,"In tda7432_command\n");
+       if (debug>1)
+               v4l_i2c_print_ioctl(client,cmd);
 
        switch (cmd) {
        /* --- v4l ioctls --- */
        /* take care: bttv does userspace copying, we'll get a
           kernel pointer here... */
-       
+
        /* Query card - scale from TDA7432 settings to V4L settings */
        case VIDIOCGAUDIO:
        {
                struct video_audio *va = arg;
-               dprintk("tda7432: VIDIOCGAUDIO\n");
 
                va->flags |= VIDEO_AUDIO_VOLUME |
                        VIDEO_AUDIO_BASS |
@@ -385,7 +361,7 @@ static int tda7432_command(struct i2c_client *client,
                va->mode |= VIDEO_SOUND_STEREO;
                /* Master volume control
                 * V4L volume is min 0, max 65535
-                * TDA7432 Volume: 
+                * TDA7432 Volume:
                 * Min (-79dB) is 0x6f
                 * Max (+20dB) is 0x07 (630)
                 * Max (0dB) is 0x20 (829)
@@ -396,7 +372,7 @@ static int tda7432_command(struct i2c_client *client,
                } else {       /* max 0db   */
                        va->volume = ( 0x6f - (t->volume & 0x7F) ) * 829;
                }
-               
+
                /* Balance depends on L,R attenuation
                 * V4L balance is 0 to 65535, middle is 32768
                 * TDA7432 attenuation: min (0dB) is 0, max (-37.5dB) is 0x1f
@@ -404,15 +380,15 @@ static int tda7432_command(struct i2c_client *client,
                 * attenuation exists for lf, lr, rf, rr
                 * we use only lf and rf (front channels)
                 */
-               
+
                if ( (t->lf) < (t->rf) )
                        /* right is attenuated, balance shifted left */
                        va->balance = (32768 - 1057*(t->rf));
                else
                        /* left is attenuated, balance shifted right */
                        va->balance = (32768 + 1057*(t->lf));
-               
-               /* Bass/treble 4 bits each */   
+
+               /* Bass/treble 4 bits each */
                va->bass=t->bass;
                if(va->bass >= 0x8)
                        va->bass = ~(va->bass - 0x8) & 0xf;
@@ -421,7 +397,7 @@ static int tda7432_command(struct i2c_client *client,
                if(va->treble >= 0x8)
                        va->treble = ~(va->treble - 0x8) & 0xf;
                va->treble = (va->treble << 12)+(va->treble << 8)+(va->treble << 4)+(va->treble);
-                                                               
+
                break; /* VIDIOCGAUDIO case */
        }
 
@@ -429,7 +405,6 @@ static int tda7432_command(struct i2c_client *client,
        case VIDIOCSAUDIO:
        {
                struct video_audio *va = arg;
-               dprintk("tda7432: VIDEOCSAUDIO\n");
 
                if(va->flags & VIDEO_AUDIO_VOLUME){
                        if(!maxvol){ /* max +20db */
@@ -437,13 +412,13 @@ static int tda7432_command(struct i2c_client *client,
                        } else {    /* max 0db   */
                                t->volume = 0x6f - ((va->volume)/829);
                        }
-               
+
                if (loudness)           /* Turn on the loudness bit */
                        t->volume |= TDA7432_LD_ON;
-               
+
                        tda7432_write(client,TDA7432_VL, t->volume);
                }
-               
+
                if(va->flags & VIDEO_AUDIO_BASS)
                {
                        t->bass = va->bass >> 12;
@@ -458,15 +433,15 @@ static int tda7432_command(struct i2c_client *client,
                }
                if(va->flags & (VIDEO_AUDIO_TREBLE| VIDEO_AUDIO_BASS))
                        tda7432_write(client,TDA7432_TN, 0x10 | (t->bass << 4) | t->treble );
-               
+
                if(va->flags & VIDEO_AUDIO_BALANCE)     {
-               if (va->balance < 32768) 
+               if (va->balance < 32768)
                {
                        /* shifted to left, attenuate right */
                        t->rr = (32768 - va->balance)/1057;
                        t->rf = t->rr;
                        t->lr = TDA7432_ATTEN_0DB;
-                       t->lf = TDA7432_ATTEN_0DB;      
+                       t->lf = TDA7432_ATTEN_0DB;
                }
                else if(va->balance > 32769)
                {
@@ -474,22 +449,22 @@ static int tda7432_command(struct i2c_client *client,
                        t->lf = (va->balance - 32768)/1057;
                        t->lr = t->lf;
                        t->rr = TDA7432_ATTEN_0DB;
-                       t->rf = TDA7432_ATTEN_0DB;              
+                       t->rf = TDA7432_ATTEN_0DB;
                }
-               else 
+               else
                {
-                       /* centered */          
+                       /* centered */
                        t->rr = TDA7432_ATTEN_0DB;
                        t->rf = TDA7432_ATTEN_0DB;
                        t->lf = TDA7432_ATTEN_0DB;
                        t->lr = TDA7432_ATTEN_0DB;
                }
                }
-                                       
-               t->muted=(va->flags & VIDEO_AUDIO_MUTE);        
+
+               t->muted=(va->flags & VIDEO_AUDIO_MUTE);
                if (t->muted)
                {
-                       /* Mute & update balance*/      
+                       /* Mute & update balance*/
                        tda7432_write(client,TDA7432_LF, t->lf | TDA7432_MUTE);
                        tda7432_write(client,TDA7432_LR, t->lr | TDA7432_MUTE);
                        tda7432_write(client,TDA7432_RF, t->rf | TDA7432_MUTE);
@@ -500,49 +475,43 @@ static int tda7432_command(struct i2c_client *client,
                        tda7432_write(client,TDA7432_RF, t->rf);
                        tda7432_write(client,TDA7432_RR, t->rr);
                }
-                                                       
+
                break;
 
        } /* end of VIDEOCSAUDIO case */
 
-       default: /* Not VIDEOCGAUDIO or VIDEOCSAUDIO */
-
-               /* nothing */
-               d2printk("tda7432: Default\n");
-
        } /* end of (cmd) switch */
 
        return 0;
 }
 
 static struct i2c_driver driver = {
-       .owner           = THIS_MODULE,
-        .name            = "i2c tda7432 driver",
+       .driver = {
+               .name    = "tda7432",
+       },
        .id              = I2C_DRIVERID_TDA7432,
-        .flags           = I2C_DF_NOTIFY,
        .attach_adapter  = tda7432_probe,
-        .detach_client   = tda7432_detach,
-        .command         = tda7432_command,
+       .detach_client   = tda7432_detach,
+       .command         = tda7432_command,
 };
 
 static struct i2c_client client_template =
 {
-       I2C_DEVNAME("tda7432"),
-        .id         = -1,
-       .driver     = &driver, 
+       .name       = "tda7432",
+       .driver     = &driver,
 };
 
-static int tda7432_init(void)
+static int __init tda7432_init(void)
 {
        if ( (loudness < 0) || (loudness > 15) ) {
-               printk(KERN_ERR "tda7432: loudness parameter must be between 0 and 15\n");
+               printk(KERN_ERR "loudness parameter must be between 0 and 15\n");
                return -EINVAL;
        }
-       i2c_add_driver(&driver);
-       return 0;
+
+       return i2c_add_driver(&driver);
 }
 
-static void tda7432_fini(void)
+static void __exit tda7432_fini(void)
 {
        i2c_del_driver(&driver);
 }