renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
Code

V4L/DVB (11650): gspca - m5602: Sort out macro conflict by adding a prefix

Browse Source 
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Erik Andrén 2009-01-28 13:14:34 -03:00 committed by Mauro Carvalho Chehab
parent 7b8265033d
commit 72b79747a8
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/gspca/m5602/m5602_mt9m111.c
View File

@ -86,7 +86,7 @@ const static struct ctrl mt9m111_ctrls[] = {
.minimum = 0,
.maximum = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,
.step = 1,
.default_value = DEFAULT_GAIN,
.default_value = MT9M111_DEFAULT_GAIN,
.flags = V4L2_CTRL_FLAG_SLIDER
},
.set = mt9m111_set_gain,

2
drivers/media/video/gspca/m5602/m5602_mt9m111.h
View File

@ -97,7 +97,7 @@
#define MT9M111_2D_DEFECT_CORRECTION_ENABLE (1 << 0)
#define INITIAL_MAX_GAIN 64
#define DEFAULT_GAIN 283
#define MT9M111_DEFAULT_GAIN 283
#define MT9M111_GREEN_GAIN_DEFAULT 0x20
#define MT9M111_BLUE_GAIN_DEFAULT 0x20
#define MT9M111_RED_GAIN_DEFAULT 0x20

2
drivers/media/video/gspca/m5602/m5602_ov7660.c
View File

@ -31,7 +31,7 @@ const static struct ctrl ov7660_ctrls[] = {
.minimum = 0x00,
.maximum = 0xff,
.step = 0x1,
.default_value = DEFAULT_GAIN,
.default_value = OV7660_DEFAULT_GAIN,
.flags = V4L2_CTRL_FLAG_SLIDER
},
.set = ov7660_set_gain,

12
drivers/media/video/gspca/m5602/m5602_ov7660.h
View File

@ -78,11 +78,11 @@
#define OV7660_HV 0x69
#define OV7660_RSVDA1 0xa1
#define DEFAULT_GAIN 0x0e
#define DEFAULT_RED_GAIN 0x80
#define DEFAULT_BLUE_GAIN 0x80
#define DEFAULT_SATURATION 0x00
#define DEFAULT_EXPOSURE 0x20
#define OV7660_DEFAULT_GAIN 0x0e
#define OV7660_DEFAULT_RED_GAIN 0x80
#define OV7660_DEFAULT_BLUE_GAIN 0x80
#define OV7660_DEFAULT_SATURATION 0x00
#define OV7660_DEFAULT_EXPOSURE 0x20
/* Kernel module parameters */
extern int force_sensor;
@ -177,7 +177,7 @@ static const unsigned char init_ov7660[][4] =
{BRIDGE, M5602_XB_SEN_CLK_DIV, 0x02},
{BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
{SENSOR, OV7660_AECH, DEFAULT_EXPOSURE},
{SENSOR, OV7660_AECH, OV7660_DEFAULT_EXPOSURE},
{SENSOR, OV7660_COM1, 0x00},
{BRIDGE, M5602_XB_GPIO_DIR, 0x01},