1 files changed, 109 insertions, 76 deletions

diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index 30662fccb0cf..a0369a58c4bb 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -23,43 +23,58 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-/* Some documentation about various registers as determined by trial and error.
-
-   Register page 1:
-
-   Address      Description
-   0x78         Global control, bit 6 controls the LED (inverted)
-
-   Register page 3:
-
-   Address      Description
-   0x02         Clock divider 3-63, fps = 90 / val. Must be a multiple of 3 on
-                the 7302, so one of 3, 6, 9, ..., except when between 6 and 12?
-   0x03         Variable framerate ctrl reg2==3: 0 -> ~30 fps, 255 -> ~22fps
-   0x04         Another var framerate ctrl reg2==3, reg3==0: 0 -> ~30 fps,
-                63 -> ~27 fps, the 2 msb's must always be 1 !!
-   0x05         Another var framerate ctrl reg2==3, reg3==0, reg4==0xc0:
-                1 -> ~30 fps, 2 -> ~20 fps
-   0x0e         Exposure bits 0-7, 0-448, 0 = use full frame time
-   0x0f         Exposure bit 8, 0-448, 448 = no exposure at all
-   0x10         Master gain 0-31
-   0x21         Bitfield: 0-1 unused, 2-3 vflip/hflip, 4-5 unknown, 6-7 unused
-
-   The registers are accessed in the following functions:
-
-   Page | Register   | Function
-   -----+------------+---------------------------------------------------
-    0   | 0x0f..0x20 | setcolors()
-    0   | 0xa2..0xab | setbrightcont()
-    0   | 0xc5       | setredbalance()
-    0   | 0xc6       | setwhitebalance()
-    0   | 0xc7       | setbluebalance()
-    0   | 0xdc       | setbrightcont(), setcolors()
-    3   | 0x02       | setexposure()
-    3   | 0x10       | setgain()
-    3   | 0x11       | setcolors(), setgain(), setexposure(), sethvflip()
-    3   | 0x21       | sethvflip()
-*/
+/*
+ * Some documentation about various registers as determined by trial and error.
+ *
+ * Register page 1:
+ *
+ * Address      Description
+ * 0x78         Global control, bit 6 controls the LED (inverted)
+ * 0x80         Compression balance, 2 interesting settings:
+ *              0x0f Default
+ *              0x50 Values >= this switch the camera to a lower compression,
+ *                   using the same table for both luminance and chrominance.
+ *                   This gives a sharper picture. Only usable when running
+ *                   at < 15 fps! Note currently the driver does not use this
+ *                   as the quality gain is small and the generated JPG-s are
+ *                   only understood by v4l-utils >= 0.8.9
+ *
+ * Register page 3:
+ *
+ * Address      Description
+ * 0x02         Clock divider 3-63, fps = 90 / val. Must be a multiple of 3 on
+ *              the 7302, so one of 3, 6, 9, ..., except when between 6 and 12?
+ * 0x03         Variable framerate ctrl reg2==3: 0 -> ~30 fps, 255 -> ~22fps
+ * 0x04         Another var framerate ctrl reg2==3, reg3==0: 0 -> ~30 fps,
+ *              63 -> ~27 fps, the 2 msb's must always be 1 !!
+ * 0x05         Another var framerate ctrl reg2==3, reg3==0, reg4==0xc0:
+ *              1 -> ~30 fps, 2 -> ~20 fps
+ * 0x0e         Exposure bits 0-7, 0-448, 0 = use full frame time
+ * 0x0f         Exposure bit 8, 0-448, 448 = no exposure at all
+ * 0x10         Gain 0-31
+ * 0x12         Another gain 0-31, unlike 0x10 this one seems to start with an
+ *              amplification value of 1 rather then 0 at its lowest setting
+ * 0x21         Bitfield: 0-1 unused, 2-3 vflip/hflip, 4-5 unknown, 6-7 unused
+ * 0x80         Another framerate control, best left at 1, moving it from 1 to
+ *              2 causes the framerate to become 3/4th of what it was, and
+ *              also seems to cause pixel averaging, resulting in an effective
+ *              resolution of 320x240 and thus a much blockier image
+ *
+ * The registers are accessed in the following functions:
+ *
+ * Page | Register   | Function
+ * -----+------------+---------------------------------------------------
+ *  0   | 0x0f..0x20 | setcolors()
+ *  0   | 0xa2..0xab | setbrightcont()
+ *  0   | 0xc5       | setredbalance()
+ *  0   | 0xc6       | setwhitebalance()
+ *  0   | 0xc7       | setbluebalance()
+ *  0   | 0xdc       | setbrightcont(), setcolors()
+ *  3   | 0x02       | setexposure()
+ *  3   | 0x10, 0x12 | setgain()
+ *  3   | 0x11       | setcolors(), setgain(), setexposure(), sethvflip()
+ *  3   | 0x21       | sethvflip()
+ */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -89,7 +104,6 @@ enum e_ctrl {
         NCTRLS          /* number of controls */
 };
 
-/* specific webcam descriptor for pac7302 */
 struct sd {
         struct gspca_dev gspca_dev;             /* !! must be the first item */
 
@@ -198,10 +212,10 @@ static const struct ctrl sd_ctrls[] = {
                 .type    = V4L2_CTRL_TYPE_INTEGER,
                 .name    = "Gain",
                 .minimum = 0,
-                .maximum = 255,
+                .maximum = 62,
                 .step    = 1,
-#define GAIN_DEF 127
-#define GAIN_KNEE 255 /* Gain seems to cause little noise on the pac73xx */
+#define GAIN_DEF 15
+#define GAIN_KNEE 46
                 .default_value = GAIN_DEF,
             },
             .set_control = setgain
@@ -270,7 +284,6 @@ static const struct v4l2_pix_format vga_mode[] = {
 #define LOAD_PAGE3              255
 #define END_OF_SEQUENCE         0
 
-/* pac 7302 */
 static const u8 init_7302[] = {
 /*      index,value */
         0xff, 0x01,             /* page 1 */
@@ -509,7 +522,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         return 0;
 }
 
-/* This function is used by pac7302 only */
 static void setbrightcont(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -536,7 +548,6 @@ static void setbrightcont(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0xdc, 0x01);
 }
 
-/* This function is used by pac7302 only */
 static void setcolors(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -590,9 +601,19 @@ static void setbluebalance(struct gspca_dev *gspca_dev)
 static void setgain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
+        u8 reg10, reg12;
+
+        if (sd->ctrls[GAIN].val < 32) {
+                reg10 = sd->ctrls[GAIN].val;
+                reg12 = 0;
+        } else {
+                reg10 = 31;
+                reg12 = sd->ctrls[GAIN].val - 31;
+        }
 
         reg_w(gspca_dev, 0xff, 0x03);                   /* page 3 */
-        reg_w(gspca_dev, 0x10, sd->ctrls[GAIN].val >> 3);
+        reg_w(gspca_dev, 0x10, reg10);
+        reg_w(gspca_dev, 0x12, reg12);
 
         /* load registers to sensor (Bit 0, auto clear) */
         reg_w(gspca_dev, 0x11, 0x01);
@@ -604,28 +625,36 @@ static void setexposure(struct gspca_dev *gspca_dev)
         u8 clockdiv;
         u16 exposure;
 
-        /* register 2 of frame 3 contains the clock divider configuring the
-           no fps according to the formula: 90 / reg. sd->exposure is the
-           desired exposure time in 0.5 ms. */
+        /*
+         * Register 2 of frame 3 contains the clock divider configuring the
+         * no fps according to the formula: 90 / reg. sd->exposure is the
+         * desired exposure time in 0.5 ms.
+         */
         clockdiv = (90 * sd->ctrls[EXPOSURE].val + 1999) / 2000;
 
-        /* Note clockdiv = 3 also works, but when running at 30 fps, depending
-           on the scene being recorded, the camera switches to another
-           quantization table for certain JPEG blocks, and we don't know how
-           to decompress these blocks. So we cap the framerate at 15 fps */
+        /*
+         * Note clockdiv = 3 also works, but when running at 30 fps, depending
+         * on the scene being recorded, the camera switches to another
+         * quantization table for certain JPEG blocks, and we don't know how
+         * to decompress these blocks. So we cap the framerate at 15 fps.
+         */
         if (clockdiv < 6)
                 clockdiv = 6;
         else if (clockdiv > 63)
                 clockdiv = 63;
 
-        /* reg2 MUST be a multiple of 3, except when between 6 and 12?
-           Always round up, otherwise we cannot get the desired frametime
-           using the partial frame time exposure control */
+        /*
+         * Register 2 MUST be a multiple of 3, except when between 6 and 12?
+         * Always round up, otherwise we cannot get the desired frametime
+         * using the partial frame time exposure control.
+         */
         if (clockdiv < 6 || clockdiv > 12)
                 clockdiv = ((clockdiv + 2) / 3) * 3;
 
-        /* frame exposure time in ms = 1000 * clockdiv / 90    ->
-        exposure = (sd->exposure / 2) * 448 / (1000 * clockdiv / 90) */
+        /*
+         * frame exposure time in ms = 1000 * clockdiv / 90    ->
+         * exposure = (sd->exposure / 2) * 448 / (1000 * clockdiv / 90)
+         */
         exposure = (sd->ctrls[EXPOSURE].val * 45 * 448) / (1000 * clockdiv);
         /* 0 = use full frametime, 448 = no exposure, reverse it */
         exposure = 448 - exposure;
@@ -643,10 +672,12 @@ static void setautogain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        /* when switching to autogain set defaults to make sure
-           we are on a valid point of the autogain gain /
-           exposure knee graph, and give this change time to
-           take effect before doing autogain. */
+        /*
+         * When switching to autogain set defaults to make sure
+         * we are on a valid point of the autogain gain /
+         * exposure knee graph, and give this change time to
+         * take effect before doing autogain.
+         */
         if (sd->ctrls[AUTOGAIN].val) {
                 sd->ctrls[EXPOSURE].val = EXPOSURE_DEF;
                 sd->ctrls[GAIN].val = GAIN_DEF;
@@ -700,8 +731,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         setautogain(gspca_dev);
         sethvflip(gspca_dev);
 
-        /* only resolution 640x480 is supported for pac7302 */
-
         sd->sof_read = 0;
         atomic_set(&sd->avg_lum, 270 + sd->ctrls[BRIGHTNESS].val);
 
@@ -729,9 +758,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, 0x78, 0x40);
 }
 
-/* !! coarse_grained_expo_autogain is not used !! */
-#define exp_too_low_cnt flags
-#define exp_too_high_cnt sof_read
+#define WANT_REGULAR_AUTOGAIN
 #include "autogain_functions.h"
 
 static void do_autogain(struct gspca_dev *gspca_dev)
@@ -792,10 +819,12 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         if (sof) {
                 int n, lum_offset, footer_length;
 
-                /* 6 bytes after the FF D9 EOF marker a number of lumination
-                   bytes are send corresponding to different parts of the
-                   image, the 14th and 15th byte after the EOF seem to
-                   correspond to the center of the image */
+                /*
+                 * 6 bytes after the FF D9 EOF marker a number of lumination
+                 * bytes are send corresponding to different parts of the
+                 * image, the 14th and 15th byte after the EOF seem to
+                 * correspond to the center of the image.
+                 */
                 lum_offset = 61 + sizeof pac_sof_marker;
                 footer_length = 74;
 
@@ -839,9 +868,10 @@ static int sd_dbg_s_register(struct gspca_dev *gspca_dev,
         u8 index;
         u8 value;
 
-        /* reg->reg: bit0..15: reserved for register index (wIndex is 16bit
-                               long on the USB bus)
-        */
+        /*
+         * reg->reg: bit0..15: reserved for register index (wIndex is 16bit
+         *                     long on the USB bus)
+         */
         if (reg->match.type == V4L2_CHIP_MATCH_HOST &&
             reg->match.addr == 0 &&
             (reg->reg < 0x000000ff) &&
@@ -852,9 +882,11 @@ static int sd_dbg_s_register(struct gspca_dev *gspca_dev,
                 index = reg->reg;
                 value = reg->val;
 
-                /* Note that there shall be no access to other page
-                   by any other function between the page swith and
-                   the actual register write */
+                /*
+                 * Note that there shall be no access to other page
+                 * by any other function between the page switch and
+                 * the actual register write.
+                 */
                 reg_w(gspca_dev, 0xff, 0x00);           /* page 0 */
                 reg_w(gspca_dev, index, value);
 
@@ -940,6 +972,7 @@ static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x093a, 0x2624), .driver_info = FL_VFLIP},
         {USB_DEVICE(0x093a, 0x2625)},
         {USB_DEVICE(0x093a, 0x2626)},
+        {USB_DEVICE(0x093a, 0x2627), .driver_info = FL_VFLIP},
         {USB_DEVICE(0x093a, 0x2628)},
         {USB_DEVICE(0x093a, 0x2629), .driver_info = FL_VFLIP},
         {USB_DEVICE(0x093a, 0x262a)},