leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG.

Browse Source 
main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505:
	 Cleanup source.
sunplus: Compilation error when VIDEO_ADV_DEBUG set.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Jean-Francois Moine 2008-07-01 10:03:42 -03:00 committed by Mauro Carvalho Chehab
parent 00528d9c2e
commit 956e42d28f
10 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/gspca/etoms.c
View File

@ -233,7 +233,7 @@ static void Et_RegWrite(struct usb_device *dev,
0, index, buffer, len, 500); 0, index, buffer, len, 500);
} }
static int Et_i2cwrite(struct usb_device *dev, __u8 reg, __u8 * buffer, static int Et_i2cwrite(struct usb_device *dev, __u8 reg, __u8 *buffer,
__u16 length, __u8 mode) __u16 length, __u8 mode)
{ {
/* buffer should be [D0..D7] */ /* buffer should be [D0..D7] */
@ -256,7 +256,7 @@ static int Et_i2cwrite(struct usb_device *dev, __u8 reg, __u8 * buffer,
return 0; return 0;
} }
static int Et_i2cread(struct usb_device *dev, __u8 reg, __u8 * buffer, static int Et_i2cread(struct usb_device *dev, __u8 reg, __u8 *buffer,
__u16 length, __u8 mode) __u16 length, __u8 mode)
{ {
/* buffer should be [D0..D7] */ /* buffer should be [D0..D7] */

8
drivers/media/video/gspca/gspca.c
View File

@ -28,9 +28,9 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include "gspca.h" #include "gspca.h"
@ -45,8 +45,8 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
MODULE_DESCRIPTION("GSPCA USB Camera Driver"); MODULE_DESCRIPTION("GSPCA USB Camera Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 0) #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 1)
static const char version[] = "2.1.0"; static const char version[] = "2.1.1";
static int video_nr = -1; static int video_nr = -1;

6
drivers/media/video/gspca/mars.c
View File

@ -220,13 +220,15 @@ static void sd_start(struct gspca_dev *gspca_dev)
if (0) { /* fixed dark-gain */ if (0) { /* fixed dark-gain */
data[1] = 0; /* reg 94, Y Gain (1.75) */ data[1] = 0; /* reg 94, Y Gain (1.75) */
data[2] = 0; /* reg 95, UV Gain (1.75) */ data[2] = 0; /* reg 95, UV Gain (1.75) */
data[3] = 0x3f; /* reg 96, Y Gain/UV Gain/disable auto dark-gain */ data[3] = 0x3f; /* reg 96, Y Gain/UV Gain/disable
* auto dark-gain */
data[4] = 0; /* reg 97, set fixed dark level */ data[4] = 0; /* reg 97, set fixed dark level */
data[5] = 0; /* reg 98, don't care */ data[5] = 0; /* reg 98, don't care */
} else { /* auto dark-gain */ } else { /* auto dark-gain */
data[1] = 0; /* reg 94, Y Gain (auto) */ data[1] = 0; /* reg 94, Y Gain (auto) */
data[2] = 0; /* reg 95, UV Gain (1.75) */ data[2] = 0; /* reg 95, UV Gain (1.75) */
data[3] = 0x78; /* reg 96, Y Gain/UV Gain/disable auto dark-gain */ data[3] = 0x78; /* reg 96, Y Gain/UV Gain/disable
* auto dark-gain */
switch (gspca_dev->width) { switch (gspca_dev->width) {
/* case 1280: */ /* case 1280: */
/* data[4] = 154; /* data[4] = 154;

24
drivers/media/video/gspca/pac207.c
View File

@ -452,30 +452,30 @@ static void pac207_do_auto_gain(struct gspca_dev *gspca_dev)
for (i = 0; i < steps; i++) { for (i = 0; i < steps; i++) {
if (avg_lum > desired_avg_lum) { if (avg_lum > desired_avg_lum) {
if (sd->gain > PAC207_GAIN_KNEE) { if (sd->gain > PAC207_GAIN_KNEE)
sd->gain--; sd->gain--;
} else if (sd->exposure > PAC207_EXPOSURE_KNEE) { else if (sd->exposure > PAC207_EXPOSURE_KNEE)
sd->exposure--; sd->exposure--;
} else if (sd->gain > PAC207_GAIN_DEFAULT) { else if (sd->gain > PAC207_GAIN_DEFAULT)
sd->gain--; sd->gain--;
} else if (sd->exposure > PAC207_EXPOSURE_MIN) { else if (sd->exposure > PAC207_EXPOSURE_MIN)
sd->exposure--; sd->exposure--;
} else if (sd->gain > PAC207_GAIN_MIN) { else if (sd->gain > PAC207_GAIN_MIN)
sd->gain--; sd->gain--;
} else else
break; break;
} else { } else {
if (sd->gain < PAC207_GAIN_DEFAULT) { if (sd->gain < PAC207_GAIN_DEFAULT)
sd->gain++; sd->gain++;
} else if (sd->exposure < PAC207_EXPOSURE_KNEE) { else if (sd->exposure < PAC207_EXPOSURE_KNEE)
sd->exposure++; sd->exposure++;
} else if (sd->gain < PAC207_GAIN_KNEE) { else if (sd->gain < PAC207_GAIN_KNEE)
sd->gain++; sd->gain++;
} else if (sd->exposure < PAC207_EXPOSURE_MAX) { else if (sd->exposure < PAC207_EXPOSURE_MAX)
sd->exposure++; sd->exposure++;
} else if (sd->gain < PAC207_GAIN_MAX) { else if (sd->gain < PAC207_GAIN_MAX)
sd->gain++; sd->gain++;
} else else
break; break;
} }
} }

3
drivers/media/video/gspca/pac7311.c
View File

@ -714,7 +714,8 @@ static __devinitdata struct usb_device_id device_table[] = {
{USB_DEVICE(0x093a, 0x2601), DVNM("Philips SPC610NC")}, {USB_DEVICE(0x093a, 0x2601), DVNM("Philips SPC610NC")},
{USB_DEVICE(0x093a, 0x2603), DVNM("PAC7312")}, {USB_DEVICE(0x093a, 0x2603), DVNM("PAC7312")},
{USB_DEVICE(0x093a, 0x2608), DVNM("Trust WB-3300p")}, {USB_DEVICE(0x093a, 0x2608), DVNM("Trust WB-3300p")},
{USB_DEVICE(0x093a, 0x260e), DVNM("Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350")}, {USB_DEVICE(0x093a, 0x260e), DVNM("Gigaware VGA PC Camera")},
/* and also ', Trust WB-3350p, SIGMA cam 2350' */
{USB_DEVICE(0x093a, 0x260f), DVNM("SnakeCam")}, {USB_DEVICE(0x093a, 0x260f), DVNM("SnakeCam")},
{USB_DEVICE(0x093a, 0x2621), DVNM("PAC731x")}, {USB_DEVICE(0x093a, 0x2621), DVNM("PAC731x")},
{} {}

2
drivers/media/video/gspca/sonixb.c
View File

@ -831,7 +831,7 @@ static __devinitdata struct usb_device_id device_table[] = {
{USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")}, {USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")},
{USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")}, {USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")},
{USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")}, {USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")},
{USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia-OV6650-SN9C101G")}, {USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia")},
{USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")}, {USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")},
{USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")}, {USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")},
{USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")}, {USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")},

2
drivers/media/video/gspca/sonixj.c
View File

@ -1076,7 +1076,7 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,
| ((expo & 0x0003) << 4); | ((expo & 0x0003) << 4);
i2c_w8(gspca_dev->dev, expoMo10); i2c_w8(gspca_dev->dev, expoMo10);
i2c_w8(gspca_dev->dev, gainMo); i2c_w8(gspca_dev->dev, gainMo);
PDEBUG(D_CONF," set exposure %d", PDEBUG(D_CONF, "set exposure %d",
((expoMo10[3] & 0x07) << 10) ((expoMo10[3] & 0x07) << 10)
| (expoMof[3] << 2) | (expoMof[3] << 2)
| ((expoMo10[3] & 0x30) >> 4)); | ((expoMo10[3] & 0x30) >> 4));

9
drivers/media/video/gspca/spca500.c
View File

@ -336,7 +336,7 @@ static unsigned char qtable_kodak_ez200[2][64] = {
}; };
static unsigned char qtable_pocketdv[2][64] = { static unsigned char qtable_pocketdv[2][64] = {
{ /* Q-table Y-components start registers 0x8800 */ { /* Q-table Y-components start registers 0x8800 */
0x06, 0x04, 0x04, 0x06, 0x0a, 0x10, 0x14, 0x18, 0x06, 0x04, 0x04, 0x06, 0x0a, 0x10, 0x14, 0x18,
0x05, 0x05, 0x06, 0x08, 0x0a, 0x17, 0x18, 0x16, 0x05, 0x05, 0x06, 0x08, 0x0a, 0x17, 0x18, 0x16,
0x06, 0x05, 0x06, 0x0a, 0x10, 0x17, 0x1c, 0x16, 0x06, 0x05, 0x06, 0x0a, 0x10, 0x17, 0x1c, 0x16,
@ -346,7 +346,7 @@ static unsigned char qtable_pocketdv[2][64] = {
0x14, 0x1a, 0x1f, 0x23, 0x29, 0x30, 0x30, 0x28, 0x14, 0x1a, 0x1f, 0x23, 0x29, 0x30, 0x30, 0x28,
0x1d, 0x25, 0x26, 0x27, 0x2d, 0x28, 0x29, 0x28, 0x1d, 0x25, 0x26, 0x27, 0x2d, 0x28, 0x29, 0x28,
}, },
{ /* Q-table C-components start registers 0x8840 */ { /* Q-table C-components start registers 0x8840 */
0x07, 0x07, 0x0a, 0x13, 0x28, 0x28, 0x28, 0x28, 0x07, 0x07, 0x0a, 0x13, 0x28, 0x28, 0x28, 0x28,
0x07, 0x08, 0x0a, 0x1a, 0x28, 0x28, 0x28, 0x28, 0x07, 0x08, 0x0a, 0x1a, 0x28, 0x28, 0x28, 0x28,
0x0a, 0x0a, 0x16, 0x28, 0x28, 0x28, 0x28, 0x28, 0x0a, 0x0a, 0x16, 0x28, 0x28, 0x28, 0x28, 0x28,
@ -833,7 +833,8 @@ static void sd_start(struct gspca_dev *gspca_dev)
* - NWG (Sat 29th March 2003) */ * - NWG (Sat 29th March 2003) */
/* do a full reset */ /* do a full reset */
if ((err = spca500_full_reset(gspca_dev)) < 0) err = spca500_full_reset(gspca_dev);
if (err < 0)
PDEBUG(D_ERR, "spca500_full_reset failed"); PDEBUG(D_ERR, "spca500_full_reset failed");
/* enable drop packet */ /* enable drop packet */
@ -918,7 +919,7 @@ static void sd_start(struct gspca_dev *gspca_dev)
/* Init SDRAM - needed for SDRAM access */ /* Init SDRAM - needed for SDRAM access */
reg_write(gspca_dev->dev, 0x00, 0x870a, 0x04); reg_write(gspca_dev->dev, 0x00, 0x870a, 0x04);
spca500_setmode(gspca_dev,xmult,ymult); spca500_setmode(gspca_dev, xmult, ymult);
/* switch to video camera mode */ /* switch to video camera mode */
reg_write(gspca_dev->dev, 0x00, 0x8000, 0x0004); reg_write(gspca_dev->dev, 0x00, 0x8000, 0x0004);

2
drivers/media/video/gspca/spca505.c
View File

@ -904,7 +904,7 @@ MODULE_DEVICE_TABLE(usb, device_table);
static int sd_probe(struct usb_interface *intf, static int sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof (struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
THIS_MODULE); THIS_MODULE);
} }

6
drivers/media/video/gspca/sunplus.c
View File

@ -24,8 +24,8 @@
#include "gspca.h" #include "gspca.h"
#include "jpeg.h" #include "jpeg.h"
#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 0) #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 1)
static const char version[] = "2.1.0"; static const char version[] = "2.1.1";
MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver"); MODULE_DESCRIPTION("GSPCA/SPCA5xx USB Camera Driver");
@ -459,7 +459,7 @@ static int reg_write(struct usb_device *dev,
USB_TYPE_VENDOR | USB_RECIP_DEVICE, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
value, index, NULL, 0, 500); value, index, NULL, 0, 500);
PDEBUG(D_PACK, "reg write: 0x%02x,0x%02x:0x%02x, 0x%x", PDEBUG(D_PACK, "reg write: 0x%02x,0x%02x:0x%02x, 0x%x",
reg, index, value, ret); req, index, value, ret);
if (ret < 0) if (ret < 0)
PDEBUG(D_ERR, "reg write: error %d", ret); PDEBUG(D_ERR, "reg write: error %d", ret);
return ret; return ret;