1 files changed, 99 insertions, 49 deletions

diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index e29954c1c38c..82e3e3e2ada1 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -34,6 +34,8 @@ struct sd {
         unsigned short contrast;
         __u8 brightness;
         __u8 colors;
+        __u8 blue_balance;
+        __u8 red_balance;
 
         char subtype;
 #define Arowana300KCMOSCamera 0
@@ -52,6 +54,10 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setblue_balance(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getblue_balance(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setred_balance(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getred_balance(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
 #define MY_BRIGHTNESS 0
@@ -63,7 +69,7 @@ static struct ctrl sd_ctrls[] = {
                 .minimum = 0,
                 .maximum = 127,
                 .step    = 1,
-                .default_value = 63,
+                .default_value = 0,
             },
             .set = sd_setbrightness,
             .get = sd_getbrightness,
@@ -75,9 +81,9 @@ static struct ctrl sd_ctrls[] = {
                 .type    = V4L2_CTRL_TYPE_INTEGER,
                 .name    = "Contrast",
                 .minimum = 0,
-                .maximum = 0xffff,
+                .maximum = 64725,
                 .step    = 1,
-                .default_value = 0xaa00,
+                .default_value = 64725,
             },
             .set = sd_setcontrast,
             .get = sd_getcontrast,
@@ -91,14 +97,42 @@ static struct ctrl sd_ctrls[] = {
                 .minimum = 0,
                 .maximum = 63,
                 .step    = 1,
-                .default_value = 31,
+                .default_value = 20,
             },
             .set = sd_setcolors,
             .get = sd_getcolors,
         },
+#define MY_BLUE_BALANCE 3
+        {
+            {
+                .id      = V4L2_CID_BLUE_BALANCE,
+                .type    = V4L2_CTRL_TYPE_INTEGER,
+                .name    = "Blue Balance",
+                .minimum = 0,
+                .maximum = 127,
+                .step    = 1,
+                .default_value = 0,
+            },
+            .set = sd_setblue_balance,
+            .get = sd_getblue_balance,
+        },
+#define MY_RED_BALANCE 4
+        {
+            {
+                .id      = V4L2_CID_RED_BALANCE,
+                .type    = V4L2_CTRL_TYPE_INTEGER,
+                .name    = "Red Balance",
+                .minimum = 0,
+                .maximum = 127,
+                .step    = 1,
+                .default_value = 0,
+            },
+            .set = sd_setred_balance,
+            .get = sd_getred_balance,
+        },
 };
 
-static struct v4l2_pix_format vga_mode[] = {
+static const struct v4l2_pix_format vga_mode[] = {
         {160, 120, V4L2_PIX_FMT_SPCA501, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 160 * 120 * 3 / 2,
@@ -1822,29 +1856,6 @@ static int reg_write(struct usb_device *dev,
         return ret;
 }
 
-/* returns: negative is error, pos or zero is data */
-static int reg_read(struct gspca_dev *gspca_dev,
-                        __u16 req,      /* bRequest */
-                        __u16 index,    /* wIndex */
-                        __u16 length)   /* wLength (1 or 2 only) */
-{
-        int ret;
-
-        gspca_dev->usb_buf[1] = 0;
-        ret = usb_control_msg(gspca_dev->dev,
-                        usb_rcvctrlpipe(gspca_dev->dev, 0),
-                        req,
-                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                        0,              /* value */
-                        index,
-                        gspca_dev->usb_buf, length,
-                        500);                   /* timeout */
-        if (ret < 0) {
-                PDEBUG(D_ERR, "reg_read err %d", ret);
-                return -1;
-        }
-        return (gspca_dev->usb_buf[1] << 8) + gspca_dev->usb_buf[0];
-}
 
 static int write_vector(struct gspca_dev *gspca_dev,
                         const __u16 data[][3])
@@ -1869,18 +1880,11 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, sd->brightness);
         reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x12, sd->brightness);
-        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, sd->brightness);
 }
 
 static void getbrightness(struct gspca_dev *gspca_dev)
 {
-        struct sd *sd = (struct sd *) gspca_dev;
-        __u16 brightness;
-
-        brightness = reg_read(gspca_dev, SPCA501_REG_CCDSP, 0x11, 2);
-        sd->brightness = brightness << 1;
 }
 
 static void setcontrast(struct gspca_dev *gspca_dev)
@@ -1895,7 +1899,6 @@ static void setcontrast(struct gspca_dev *gspca_dev)
 
 static void getcontrast(struct gspca_dev *gspca_dev)
 {
-/*      spca50x->contrast = 0xaa01; */
 }
 
 static void setcolors(struct gspca_dev *gspca_dev)
@@ -1907,11 +1910,20 @@ static void setcolors(struct gspca_dev *gspca_dev)
 
 static void getcolors(struct gspca_dev *gspca_dev)
 {
+}
+
+static void setblue_balance(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, sd->blue_balance);
+}
+
+static void setred_balance(struct gspca_dev *gspca_dev)
+{
         struct sd *sd = (struct sd *) gspca_dev;
 
-        sd->colors = reg_read(gspca_dev, SPCA501_REG_CCDSP, 0x0c, 2);
-/*      sd->hue = (reg_read(gspca_dev, SPCA501_REG_CCDSP, 0x13, */
-/*                      2) & 0xFF) << 8; */
+        reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, sd->red_balance);
 }
 
 /* this function is called at probe time */
@@ -1930,6 +1942,14 @@ static int sd_config(struct gspca_dev *gspca_dev,
         sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;
         sd->colors = sd_ctrls[MY_COLOR].qctrl.default_value;
 
+        return 0;
+}
+
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
         switch (sd->subtype) {
         case Arowana300KCMOSCamera:
         case SmileIntlCamera:
@@ -1948,15 +1968,17 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         goto error;
                 break;
         }
+        PDEBUG(D_STREAM, "Initializing SPCA501 finished");
         return 0;
 error:
         return -EINVAL;
 }
 
-/* this function is called at probe and resume time */
-static int sd_init(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        struct usb_device *dev = gspca_dev->dev;
+        int mode;
 
         switch (sd->subtype) {
         case ThreeComHomeConnectLite:
@@ -1976,14 +1998,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 /* Generic 501 open data */
                 write_vector(gspca_dev, spca501_open_data);
         }
-        PDEBUG(D_STREAM, "Initializing SPCA501 finished");
-        return 0;
-}
-
-static int sd_start(struct gspca_dev *gspca_dev)
-{
-        struct usb_device *dev = gspca_dev->dev;
-        int mode;
 
         /* memorize the wanted pixel format */
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
@@ -2113,6 +2127,42 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
         return 0;
 }
 
+static int sd_setblue_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->blue_balance = val;
+        if (gspca_dev->streaming)
+                setblue_balance(gspca_dev);
+        return 0;
+}
+
+static int sd_getblue_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->blue_balance;
+        return 0;
+}
+
+static int sd_setred_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        sd->red_balance = val;
+        if (gspca_dev->streaming)
+                setred_balance(gspca_dev);
+        return 0;
+}
+
+static int sd_getred_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+        struct sd *sd = (struct sd *) gspca_dev;
+
+        *val = sd->red_balance;
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,