The patch number 11650 was added via Erik Andr?n <erik.and...@gmail.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Erik Andr?n <erik.and...@gmail.com>
gspca - m5602: Sort out macro conflict by adding a prefix
Priority: normal
Signed-off-by: Erik Andr?n <erik.and...@gmail.com>
---
linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c | 2 -
linux/drivers/media/video/gspca/m5602/m5602_mt9m111.h | 2 -
linux/drivers/media/video/gspca/m5602/m5602_ov7660.c | 2 -
linux/drivers/media/video/gspca/m5602/m5602_ov7660.h | 12 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff -r f2af67ffab25 -r 0f6e4a75900c
linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c
--- a/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c Mon Apr 27
20:41:45 2009 +0200
+++ b/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c Wed Jan 28
17:14:34 2009 +0100
@@ -98,7 +98,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,
diff -r f2af67ffab25 -r 0f6e4a75900c
linux/drivers/media/video/gspca/m5602/m5602_mt9m111.h
--- a/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.h Mon Apr 27
20:41:45 2009 +0200
+++ b/linux/drivers/media/video/gspca/m5602/m5602_mt9m111.h Wed Jan 28
17:14:34 2009 +0100
@@ -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
diff -r f2af67ffab25 -r 0f6e4a75900c
linux/drivers/media/video/gspca/m5602/m5602_ov7660.c
--- a/linux/drivers/media/video/gspca/m5602/m5602_ov7660.c Mon Apr 27
20:41:45 2009 +0200
+++ b/linux/drivers/media/video/gspca/m5602/m5602_ov7660.c Wed Jan 28
17:14:34 2009 +0100
@@ -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,
diff -r f2af67ffab25 -r 0f6e4a75900c
linux/drivers/media/video/gspca/m5602/m5602_ov7660.h
--- a/linux/drivers/media/video/gspca/m5602/m5602_ov7660.h Mon Apr 27
20:41:45 2009 +0200
+++ b/linux/drivers/media/video/gspca/m5602/m5602_ov7660.h Wed Jan 28
17:14:34 2009 +0100
@@ -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[]
{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},
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/0f6e4a75900c8df9ba6759077f935cbbc36f6aec
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
