Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / media / video / gspca / mars.c

diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index cd0d692..a81536e 100644 (file)
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -34,6 +34,8 @@ enum e_ctrl {
        COLORS,
        GAMMA,
        SHARPNESS,
+       ILLUM_TOP,
+       ILLUM_BOT,
        NCTRLS          /* number of controls */
 };
 
@@ -56,6 +58,8 @@ static void setbrightness(struct gspca_dev *gspca_dev);
 static void setcolors(struct gspca_dev *gspca_dev);
 static void setgamma(struct gspca_dev *gspca_dev);
 static void setsharpness(struct gspca_dev *gspca_dev);
+static int sd_setilluminator1(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_setilluminator2(struct gspca_dev *gspca_dev, __s32 val);
 
 static const struct ctrl sd_ctrls[NCTRLS] = {
 [BRIGHTNESS] = {
@@ -106,6 +110,32 @@ static const struct ctrl sd_ctrls[NCTRLS] = {
            },
            .set_control = setsharpness
        },
+[ILLUM_TOP] = {
+           {
+               .id      = V4L2_CID_ILLUMINATORS_1,
+               .type    = V4L2_CTRL_TYPE_BOOLEAN,
+               .name    = "Top illuminator",
+               .minimum = 0,
+               .maximum = 1,
+               .step    = 1,
+               .default_value = 0,
+               .flags = V4L2_CTRL_FLAG_UPDATE,
+           },
+           .set = sd_setilluminator1
+       },
+[ILLUM_BOT] = {
+           {
+               .id      = V4L2_CID_ILLUMINATORS_2,
+               .type    = V4L2_CTRL_TYPE_BOOLEAN,
+               .name    = "Bottom illuminator",
+               .minimum = 0,
+               .maximum = 1,
+               .step    = 1,
+               .default_value = 0,
+               .flags = V4L2_CTRL_FLAG_UPDATE,
+           },
+           .set = sd_setilluminator2
+       },
 };
 
 static const struct v4l2_pix_format vga_mode[] = {
@@ -133,21 +163,25 @@ static const __u8 mi_data[0x20] = {
 };
 
 /* write <len> bytes from gspca_dev->usb_buf */
-static int reg_w(struct gspca_dev *gspca_dev,
+static void reg_w(struct gspca_dev *gspca_dev,
                 int len)
 {
        int alen, ret;
 
+       if (gspca_dev->usb_err < 0)
+               return;
+
        ret = usb_bulk_msg(gspca_dev->dev,
                        usb_sndbulkpipe(gspca_dev->dev, 4),
                        gspca_dev->usb_buf,
                        len,
                        &alen,
                        500);   /* timeout in milliseconds */
-       if (ret < 0)
+       if (ret < 0) {
                err("reg write [%02x] error %d",
                        gspca_dev->usb_buf[0], ret);
-       return ret;
+               gspca_dev->usb_err = ret;
+       }
 }
 
 static void mi_w(struct gspca_dev *gspca_dev,
@@ -201,6 +235,20 @@ static void setsharpness(struct gspca_dev *gspca_dev)
        reg_w(gspca_dev, 2);
 }
 
+static void setilluminators(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       gspca_dev->usb_buf[0] = 0x22;
+       if (sd->ctrls[ILLUM_TOP].val)
+               gspca_dev->usb_buf[1] = 0x76;
+       else if (sd->ctrls[ILLUM_BOT].val)
+               gspca_dev->usb_buf[1] = 0x7a;
+       else
+               gspca_dev->usb_buf[1] = 0x7e;
+       reg_w(gspca_dev, 2);
+}
+
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
                        const struct usb_device_id *id)
@@ -220,13 +268,13 @@ static int sd_config(struct gspca_dev *gspca_dev,
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
+       gspca_dev->ctrl_inac = (1 << ILLUM_TOP) | (1 << ILLUM_BOT);
        return 0;
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       int err_code;
        u8 *data;
        int i;
 
@@ -239,9 +287,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
        data[0] = 0x01;         /* address */
        data[1] = 0x01;
-       err_code = reg_w(gspca_dev, 2);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 2);
 
        /*
           Initialize the MR97113 chip register
@@ -263,16 +309,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
 /*jfm: from win trace*/
        data[10] = 0x18;
 
-       err_code = reg_w(gspca_dev, 11);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 11);
 
        data[0] = 0x23;         /* address */
        data[1] = 0x09;         /* reg 35, append frame header */
 
-       err_code = reg_w(gspca_dev, 2);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 2);
 
        data[0] = 0x3c;         /* address */
 /*     if (gspca_dev->width == 1280) */
@@ -281,9 +323,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 /*     else */
        data[1] = 50;           /* 50 reg 60, pc-cam frame size
                                 *      (unit: 4KB) 200KB */
-       err_code = reg_w(gspca_dev, 2);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 2);
 
        /* auto dark-gain */
        data[0] = 0x5e;         /* address */
@@ -297,32 +337,24 @@ static int sd_start(struct gspca_dev *gspca_dev)
        data[4] = sd->ctrls[BRIGHTNESS].val; /* reg 0x61 = brightness */
        data[5] = 0x00;
 
-       err_code = reg_w(gspca_dev, 6);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 6);
 
        data[0] = 0x67;
 /*jfm: from win trace*/
        data[1] = sd->ctrls[SHARPNESS].val * 4 + 3;
        data[2] = 0x14;
-       err_code = reg_w(gspca_dev, 3);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 3);
 
        data[0] = 0x69;
        data[1] = 0x2f;
        data[2] = 0x28;
        data[3] = 0x42;
-       err_code = reg_w(gspca_dev, 4);
-       if (err_code < 0)
-               return err_code;
+       reg_w(gspca_dev, 4);
 
        data[0] = 0x63;
        data[1] = 0x07;
-       err_code = reg_w(gspca_dev, 2);
+       reg_w(gspca_dev, 2);
 /*jfm: win trace - many writes here to reg 0x64*/
-       if (err_code < 0)
-               return err_code;
 
        /* initialize the MI sensor */
        for (i = 0; i < sizeof mi_data; i++)
@@ -331,18 +363,26 @@ static int sd_start(struct gspca_dev *gspca_dev)
        data[0] = 0x00;
        data[1] = 0x4d;         /* ISOC transfering enable... */
        reg_w(gspca_dev, 2);
-       return 0;
+
+       gspca_dev->ctrl_inac = 0; /* activate the illuminator controls */
+       return gspca_dev->usb_err;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
-       int result;
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       gspca_dev->ctrl_inac = (1 << ILLUM_TOP) | (1 << ILLUM_BOT);
+       if (sd->ctrls[ILLUM_TOP].val || sd->ctrls[ILLUM_BOT].val) {
+               sd->ctrls[ILLUM_TOP].val = 0;
+               sd->ctrls[ILLUM_BOT].val = 0;
+               setilluminators(gspca_dev);
+               msleep(20);
+       }
 
        gspca_dev->usb_buf[0] = 1;
        gspca_dev->usb_buf[1] = 0;
-       result = reg_w(gspca_dev, 2);
-       if (result < 0)
-               PDEBUG(D_ERR, "Camera Stop failed");
+       reg_w(gspca_dev, 2);
 }
 
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
@@ -383,6 +423,30 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
        gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
 
+static int sd_setilluminator1(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       /* only one illuminator may be on */
+       sd->ctrls[ILLUM_TOP].val = val;
+       if (val)
+               sd->ctrls[ILLUM_BOT].val = 0;
+       setilluminators(gspca_dev);
+       return gspca_dev->usb_err;
+}
+
+static int sd_setilluminator2(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       /* only one illuminator may be on */
+       sd->ctrls[ILLUM_BOT].val = val;
+       if (val)
+               sd->ctrls[ILLUM_TOP].val = 0;
+       setilluminators(gspca_dev);
+       return gspca_dev->usb_err;
+}
+
 static int sd_set_jcomp(struct gspca_dev *gspca_dev,
                        struct v4l2_jpegcompression *jcomp)
 {