diff options
Diffstat (limited to 'linux/drivers')
-rw-r--r-- | linux/drivers/media/video/bt832.c | 2 | ||||
-rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 24 | ||||
-rw-r--r-- | linux/drivers/media/video/cx25840/cx25840.h | 1 | ||||
-rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 6 | ||||
-rw-r--r-- | linux/drivers/media/video/tda7432.c | 28 | ||||
-rw-r--r-- | linux/drivers/media/video/tda9875.c | 54 | ||||
-rw-r--r-- | linux/drivers/media/video/tda9887.c | 2 | ||||
-rw-r--r-- | linux/drivers/media/video/tuner-core.c | 6 | ||||
-rw-r--r-- | linux/drivers/media/video/tvmixer.c | 20 | ||||
-rw-r--r-- | linux/drivers/media/video/tvp5150.c | 14 | ||||
-rw-r--r-- | linux/drivers/media/video/wm8775.c | 22 |
11 files changed, 95 insertions, 84 deletions
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c index 83d67b2c1..589afb41b 100644 --- a/linux/drivers/media/video/bt832.c +++ b/linux/drivers/media/video/bt832.c @@ -243,7 +243,7 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg) struct bt832 *t = i2c_get_clientdata(client); if (debug>1) - v4l_client_print_ioctl(t->client,cmd); + v4l_i2c_print_ioctl(t->client,cmd); switch (cmd) { case BT832_HEXDUMP: { diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index cffc34c34..af2ce2d28 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.39 2006/01/07 20:43:23 mchehab Exp $ + $Id: bttv-i2c.c,v 1.40 2006/01/08 12:05:34 mchehab Exp $ bttv-i2c.c -- all the i2c code is here @@ -108,13 +108,19 @@ static struct i2c_algo_bit_data bttv_i2c_algo_bit_template = { }; static struct i2c_adapter bttv_i2c_adap_sw_template = { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) .owner = THIS_MODULE, #endif #ifdef I2C_CLASS_TV_ANALOG .class = I2C_CLASS_TV_ANALOG, #endif - .name = "bt848", +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + .name = "bt878", +#else + .driver = { + .name = "bt878", + }, +#endif .id = I2C_HW_B_BT848, .client_register = attach_inform, }; @@ -281,13 +287,19 @@ static struct i2c_algorithm bttv_algo = { }; static struct i2c_adapter bttv_i2c_adap_hw_template = { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) .owner = THIS_MODULE, #endif #ifdef I2C_CLASS_TV_ANALOG .class = I2C_CLASS_TV_ANALOG, #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .name = "bt878", +#else + .driver = { + .name = "bt878", + }, +#endif .id = I2C_HW_B_BT848 /* FIXME */, .algo = &bttv_algo, .client_register = attach_inform, @@ -308,8 +320,8 @@ static int attach_inform(struct i2c_client *client) if (bttv_debug) printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n", -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - btv->c.nr,client->driver->name,client->addr, +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + btv->c.nr, client->driver->name, client->addr, #else btv->c.nr, client->driver->driver.name, client->addr, #endif diff --git a/linux/drivers/media/video/cx25840/cx25840.h b/linux/drivers/media/video/cx25840/cx25840.h index 1cc52be79..9192eb7a6 100644 --- a/linux/drivers/media/video/cx25840/cx25840.h +++ b/linux/drivers/media/video/cx25840/cx25840.h @@ -22,7 +22,6 @@ #include "compat.h" - #include <linux/videodev2.h> #include <linux/i2c.h> diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index bb470fc83..fafaccd60 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -125,10 +125,8 @@ static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif - I2C_CLIENT_INSMOD; - /* ----------------------------------------------------------------------- */ /* functions for talking to the MSP3400C Sound processor */ @@ -1046,7 +1044,9 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) client->addr = address; client->adapter = adapter; client->driver = &i2c_driver; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) client->flags = I2C_CLIENT_ALLOW_USE; +#endif snprintf(client->name, sizeof(client->name) - 1, "msp3400"); if (msp_reset(client) == -1) { @@ -1231,7 +1231,7 @@ static struct i2c_driver i2c_driver = { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) .driver = { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - .name = "msp3400", + .name = "msp3400", #endif .suspend = msp_suspend, .resume = msp_resume, diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c index 7b68530b1..7e050b5b5 100644 --- a/linux/drivers/media/video/tda7432.c +++ b/linux/drivers/media/video/tda7432.c @@ -96,9 +96,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 @@ -235,12 +232,12 @@ static struct i2c_client client_template; 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,client,"In tda7432_write\n"); + v4l_dbg(1,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; } @@ -252,12 +249,12 @@ static int tda7432_write(struct i2c_client *client, int subaddr, int val) static int tda7432_read(struct i2c_client *client) { unsigned char buffer; - d2printk("tda7432: In tda7432_read\n"); + v4l_dbg(2,client,"In tda7432_read\n"); if (1 != i2c_master_recv(client,&buffer,1)) { - printk(KERN_WARNING "tda7432: I/O error, trying (read)\n"); + v4l_err(client,"I/O error, trying (read)\n"); return -1; } - dprintk("tda7432: Read 0x%02x\n", buffer); + v4l_dbg(1,client,"Read 0x%02x\n", buffer); return buffer; } #endif @@ -266,9 +263,9 @@ 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"); + v4l_dbg(2,client,"In tda7432_set\n"); - dprintk(KERN_INFO + v4l_dbg(1,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; @@ -282,7 +279,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; } @@ -292,7 +289,7 @@ 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,client,"In tda7432_init\n"); t->input = TDA7432_STEREO_IN | /* Main (stereo) input */ TDA7432_BASS_SYM | /* Symmetric bass cut */ @@ -325,7 +322,6 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, { struct tda7432 *t; struct i2c_client *client; - d2printk("tda7432: In tda7432_attach\n"); t = kmalloc(sizeof *t,GFP_KERNEL); if (!t) @@ -342,9 +338,9 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) MOD_INC_USE_COUNT; #endif - printk(KERN_INFO "tda7432: init\n"); - i2c_attach_client(client); + + v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name); return 0; } diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c index 95665fb44..f71784720 100644 --- a/linux/drivers/media/video/tda9875.c +++ b/linux/drivers/media/video/tda9875.c @@ -62,8 +62,6 @@ struct tda9875 { static struct i2c_driver driver; static struct i2c_client client_template; -#define dprintk if (debug) printk - /* The TDA9875 is made by Philips Semiconductor * http://www.semiconductors.philips.com * TDA9875: I2C-bus controlled DSP audio processor, FM demodulator @@ -116,12 +114,12 @@ static struct i2c_client client_template; static int tda9875_write(struct i2c_client *client, int subaddr, unsigned char val) { unsigned char buffer[2]; - dprintk("In tda9875_write\n"); - dprintk("Writing %d 0x%x\n", subaddr, val); + v4l_dbg(2,client,"In tda9875_write\n"); + v4l_dbg(1,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 "tda9875: 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; } @@ -132,12 +130,12 @@ static int tda9875_write(struct i2c_client *client, int subaddr, unsigned char v static int tda9875_read(struct i2c_client *client) { unsigned char buffer; - dprintk("In tda9875_read\n"); + v4l_dbg(2,client,"In tda9875_read\n"); if (1 != i2c_master_recv(client,&buffer,1)) { - printk(KERN_WARNING "tda9875: I/O error, trying (read)\n"); + v4l_err(client,"I/O error, trying (read)\n"); return -1; } - dprintk("Read 0x%02x\n", buffer); + v4l_dbg(1,client,"Read 0x%02x\n", buffer); return buffer; } #endif @@ -153,10 +151,10 @@ static int i2c_read_register(struct i2c_adapter *adap, int addr, int reg) write[0] = reg; if (2 != i2c_transfer(adap,msgs,2)) { - printk(KERN_WARNING "tda9875: I/O error (read2)\n"); + v4l_err(client,"I/O error (read2)\n"); return -1; } - dprintk("tda9875: chip_read2: reg%d=0x%x\n",reg,read[0]); + v4l_dbg(1,client,"chip_read2: reg%d=0x%x\n",reg,read[0]); return read[0]; } @@ -165,7 +163,7 @@ static void tda9875_set(struct i2c_client *client) struct tda9875 *tda = i2c_get_clientdata(client); unsigned char a; - dprintk(KERN_DEBUG "tda9875_set(%04x,%04x,%04x,%04x)\n", + v4l_dbg(1,client,"tda9875_set(%04x,%04x,%04x,%04x)\n", tda->lvol,tda->rvol,tda->bass,tda->treble); @@ -182,7 +180,7 @@ static void tda9875_set(struct i2c_client *client) static void do_tda9875_init(struct i2c_client *client) { struct tda9875 *t = i2c_get_clientdata(client); - dprintk("In tda9875_init\n"); + v4l_dbg(2,client,"In tda9875_init\n"); tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/ tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/ tda9875_write(client, TDA9875_C1MSB, 0x00 ); /*Car1(FM) MSB XMHz*/ @@ -237,11 +235,11 @@ static int tda9875_checkit(struct i2c_adapter *adap, int addr) rev=i2c_read_register(adap,addr,255); if(dic==0 || dic==2) { // tda9875 and tda9875A - printk("tda9875: TDA9875%s Rev.%d detected at 0x%x\n", + v4l_info(client,"TDA9875%s Rev.%d detected at 0x%x\n", dic==0?"":"A", rev,addr<<1); return 1; } - printk("tda9875: no such chip at 0x%x (dic=0x%x rev=0x%x)\n",addr<<1,dic,rev); + v4l_err(client,"no such chip at 0x%x (dic=0x%x rev=0x%x)\n",addr<<1,dic,rev); return(0); } @@ -254,7 +252,6 @@ static int tda9875_attach(struct i2c_adapter *adap, int addr, { struct tda9875 *t; struct i2c_client *client; - dprintk("In tda9875_attach\n"); t = kmalloc(sizeof *t,GFP_KERNEL); if (!t) @@ -276,9 +273,9 @@ static int tda9875_attach(struct i2c_adapter *adap, int addr, #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) MOD_INC_USE_COUNT; #endif - printk(KERN_INFO "tda9875: init\n"); - i2c_attach_client(client); + + v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name); return 0; } @@ -313,8 +310,9 @@ static int tda9875_command(struct i2c_client *client, { struct tda9875 *t = i2c_get_clientdata(client); - dprintk("In tda9875_command...\n"); - + v4l_dbg(2,client,"In tda9875_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 @@ -324,8 +322,6 @@ static int tda9875_command(struct i2c_client *client, struct video_audio *va = arg; int left,right; - dprintk("VIDIOCGAUDIO\n"); - va->flags |= VIDEO_AUDIO_VOLUME | VIDEO_AUDIO_BASS | VIDEO_AUDIO_TREBLE; @@ -350,7 +346,6 @@ static int tda9875_command(struct i2c_client *client, struct video_audio *va = arg; int left,right; - dprintk("VIDEOCSAUDIO...\n"); left = (min(65536 - va->balance,32768) * va->volume) / 32768; right = (min(va->balance,(__u16)32768) * @@ -379,10 +374,8 @@ static int tda9875_command(struct i2c_client *client, if (t->treble < -12) t->treble = -12 & 0xff; - - -//printk("tda9875 bal:%04x vol:%04x bass:%04x treble:%04x\n",va->balance,va->volume,va->bass,va->treble); - + v4l_dbg(2,"bal:%04x vol:%04x bass:%04x treble:%04x\n", + va->balance,va->volume,va->bass,va->treble); tda9875_set(client); @@ -390,11 +383,6 @@ static int tda9875_command(struct i2c_client *client, } /* end of VIDEOCSAUDIO case */ - default: /* Not VIDEOCGAUDIO or VIDEOCSAUDIO */ - - /* nothing */ - dprintk("Default\n"); - } /* end of (cmd) switch */ return 0; @@ -406,11 +394,11 @@ static struct i2c_driver driver = { .owner = THIS_MODULE, #endif #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - .name = "i2c tda9875 driver", + .name = "tda9875", .flags = I2C_DF_NOTIFY, #else .driver = { - .name = "i2c tda9875 driver", + .name = "tda9875", }, #endif .id = I2C_DRIVERID_TDA9875, diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index ce31ad9fd..38b9bfa85 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -948,7 +948,7 @@ static struct i2c_driver driver = { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) .driver = { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - .name = "tda9887", + .name = "tda9887", #endif .suspend = tda9887_suspend, .resume = tda9887_resume, diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 1062f770c..5a49737eb 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.94 2006/01/07 20:43:23 mchehab Exp $ + * $Id: tuner-core.c,v 1.95 2006/01/08 12:05:34 mchehab Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -875,10 +875,10 @@ static struct i2c_driver driver = { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) .driver = { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - .name = "tuner", + .name = "tuner", #endif .suspend = tuner_suspend, - .resume = tuner_resume, + .resume = tuner_resume, }, #endif }; diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index 42c586beb..54927dd1b 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -1,5 +1,5 @@ /* - * $Id: tvmixer.c,v 1.13 2005/12/25 19:06:18 mkrufky Exp $ + * $Id: tvmixer.c,v 1.14 2006/01/08 12:05:34 mchehab Exp $ */ #include <linux/module.h> @@ -242,15 +242,19 @@ static int tvmixer_release(struct inode *inode, struct file *file) } static struct i2c_driver driver = { -#ifdef I2C_PEC - .owner = THIS_MODULE, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) + .owner = THIS_MODULE, #endif - .name = "tv card mixer driver", - .id = I2C_DRIVERID_TVMIXER, -#ifdef I2C_DF_DUMMY - .flags = I2C_DF_DUMMY, -#else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + .name = "tvmixer", .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "tvmixer", + }, +#endif + .id = I2C_DRIVERID_TVMIXER, +#ifndef I2C_DF_DUMMY .detach_adapter = tvmixer_adapters, #endif .attach_adapter = tvmixer_adapters, diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index a758caea2..8dff50ff5 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -1091,7 +1091,9 @@ static struct i2c_driver driver; static struct i2c_client client_template = { .name = "(unset)", +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .flags = I2C_CLIENT_ALLOW_USE, +#endif .driver = &driver, }; @@ -1190,14 +1192,18 @@ static int tvp5150_detach_client(struct i2c_client *c) /* ----------------------------------------------------------------------- */ static struct i2c_driver driver = { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) .owner = THIS_MODULE, #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .name = "tvp5150", - - /* FIXME */ - .id = I2C_DRIVERID_SAA7110, .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "tvp5150", + }, +#endif + .id = I2C_DRIVERID_TVP5150, .attach_adapter = tvp5150_attach_adapter, .detach_client = tvp5150_detach_client, diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c index 30e5ce058..4fa692129 100644 --- a/linux/drivers/media/video/wm8775.c +++ b/linux/drivers/media/video/wm8775.c @@ -187,7 +187,9 @@ static int wm8775_attach(struct i2c_adapter *adapter, int address, client->addr = address; client->adapter = adapter; client->driver = &i2c_driver; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) client->flags = I2C_CLIENT_ALLOW_USE; +#endif snprintf(client->name, sizeof(client->name) - 1, "wm8775"); v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name); @@ -258,17 +260,21 @@ static int wm8775_detach(struct i2c_client *client) /* i2c implementation */ static struct i2c_driver i2c_driver = { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) + .owner = THIS_MODULE, +#endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .name = "wm8775", - - .id = I2C_DRIVERID_WM8775, .flags = I2C_DF_NOTIFY, - - .attach_adapter = wm8775_probe, - .detach_client = wm8775_detach, - .command = wm8775_command, -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - .owner = THIS_MODULE, +#else + .driver = { + .name = "wm8775", + }, #endif + .id = I2C_DRIVERID_WM8775, + .attach_adapter = wm8775_probe, + .detach_client = wm8775_detach, + .command = wm8775_command, }; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) |