Merge branch 'linus' into tracing/urgent

1 files changed, 2186 insertions, 0 deletions

diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
new file mode 100644
index 000000000000..08d99c3b78e2
--- /dev/null
+++ b/drivers/media/video/gspca/ov519.c
@@ -0,0 +1,2186 @@
+/**
+ * OV519 driver
+ *
+ * Copyright (C) 2008 Jean-Francois Moine (http://moinejf.free.fr)
+ *
+ * (This module is adapted from the ov51x-jpeg package)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#define MODULE_NAME "ov519"
+
+#include "gspca.h"
+
+#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 7)
+static const char version[] = "2.1.7";
+
+MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
+MODULE_DESCRIPTION("OV519 USB Camera Driver");
+MODULE_LICENSE("GPL");
+
+/* global parameters */
+static int frame_rate;
+
+/* Number of times to retry a failed I2C transaction. Increase this if you
+ * are getting "Failed to read sensor ID..." */
+static int i2c_detect_tries = 10;
+
+/* ov519 device descriptor */
+struct sd {
+	struct gspca_dev gspca_dev;		/* !! must be the first item */
+
+	/* Determined by sensor type */
+	short maxwidth;
+	short maxheight;
+
+	unsigned char primary_i2c_slave;	/* I2C write id of sensor */
+
+	unsigned char brightness;
+	unsigned char contrast;
+	unsigned char colors;
+
+	char compress;		/* Should the next frame be compressed? */
+	char compress_inited;	/* Are compression params uploaded? */
+	char stopped;		/* Streaming is temporarily paused */
+
+	char frame_rate;	/* current Framerate (OV519 only) */
+	char clockdiv;		/* clockdiv override for OV519 only */
+
+	char sensor;		/* Type of image sensor chip (SEN_*) */
+#define SEN_UNKNOWN 0
+#define SEN_OV6620 1
+#define SEN_OV6630 2
+#define SEN_OV7610 3
+#define SEN_OV7620 4
+#define SEN_OV7630 5
+#define SEN_OV7640 6
+#define SEN_OV7670 7
+#define SEN_OV76BE 8
+#define SEN_OV8610 9
+
+};
+
+/* V4L2 controls supported by the driver */
+static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
+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 struct ctrl sd_ctrls[] = {
+#define SD_BRIGHTNESS 0
+	{
+	    {
+		.id      = V4L2_CID_BRIGHTNESS,
+		.type    = V4L2_CTRL_TYPE_INTEGER,
+		.name    = "Brightness",
+		.minimum = 0,
+		.maximum = 255,
+		.step    = 1,
+		.default_value = 127,
+	    },
+	    .set = sd_setbrightness,
+	    .get = sd_getbrightness,
+	},
+#define SD_CONTRAST 1
+	{
+	    {
+		.id      = V4L2_CID_CONTRAST,
+		.type    = V4L2_CTRL_TYPE_INTEGER,
+		.name    = "Contrast",
+		.minimum = 0,
+		.maximum = 255,
+		.step    = 1,
+		.default_value = 127,
+	    },
+	    .set = sd_setcontrast,
+	    .get = sd_getcontrast,
+	},
+#define SD_COLOR 2
+	{
+	    {
+		.id      = V4L2_CID_SATURATION,
+		.type    = V4L2_CTRL_TYPE_INTEGER,
+		.name    = "Saturation",
+		.minimum = 0,
+		.maximum = 255,
+		.step    = 1,
+		.default_value = 127,
+	    },
+	    .set = sd_setcolors,
+	    .get = sd_getcolors,
+	},
+};
+
+static struct v4l2_pix_format vga_mode[] = {
+	{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+		.bytesperline = 320,
+		.sizeimage = 320 * 240 * 3 / 8 + 589,
+		.colorspace = V4L2_COLORSPACE_JPEG,
+		.priv = 1},
+	{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+		.bytesperline = 640,
+		.sizeimage = 640 * 480 * 3 / 8 + 590,
+		.colorspace = V4L2_COLORSPACE_JPEG,
+		.priv = 0},
+};
+static struct v4l2_pix_format sif_mode[] = {
+	{176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+		.bytesperline = 176,
+		.sizeimage = 176 * 144 * 3 / 8 + 589,
+		.colorspace = V4L2_COLORSPACE_JPEG,
+		.priv = 1},
+	{352, 288, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+		.bytesperline = 352,
+		.sizeimage = 352 * 288 * 3 / 8 + 589,
+		.colorspace = V4L2_COLORSPACE_JPEG,
+		.priv = 0},
+};
+
+/* OV519 Camera interface register numbers */
+#define OV519_CAM_H_SIZE		0x10
+#define OV519_CAM_V_SIZE		0x11
+#define OV519_CAM_X_OFFSETL		0x12
+#define OV519_CAM_X_OFFSETH		0x13
+#define OV519_CAM_Y_OFFSETL		0x14
+#define OV519_CAM_Y_OFFSETH		0x15
+#define OV519_CAM_DIVIDER		0x16
+#define OV519_CAM_DFR			0x20
+#define OV519_CAM_FORMAT		0x25
+
+/* OV519 System Controller register numbers */
+#define OV519_SYS_RESET1 0x51
+#define OV519_SYS_EN_CLK1 0x54
+
+#define OV519_GPIO_DATA_OUT0		0x71
+#define OV519_GPIO_IO_CTRL0		0x72
+
+#define OV511_ENDPOINT_ADDRESS  1	/* Isoc endpoint number */
+
+/* I2C registers */
+#define R51x_I2C_W_SID		0x41
+#define R51x_I2C_SADDR_3	0x42
+#define R51x_I2C_SADDR_2	0x43
+#define R51x_I2C_R_SID		0x44
+#define R51x_I2C_DATA		0x45
+#define R518_I2C_CTL		0x47	/* OV518(+) only */
+
+/* I2C ADDRESSES */
+#define OV7xx0_SID   0x42
+#define OV8xx0_SID   0xa0
+#define OV6xx0_SID   0xc0
+
+/* OV7610 registers */
+#define OV7610_REG_GAIN		0x00	/* gain setting (5:0) */
+#define OV7610_REG_SAT		0x03	/* saturation */
+#define OV8610_REG_HUE		0x04	/* 04 reserved */
+#define OV7610_REG_CNT		0x05	/* Y contrast */
+#define OV7610_REG_BRT		0x06	/* Y brightness */
+#define OV7610_REG_COM_C	0x14	/* misc common regs */
+#define OV7610_REG_ID_HIGH	0x1c	/* manufacturer ID MSB */
+#define OV7610_REG_ID_LOW	0x1d	/* manufacturer ID LSB */
+#define OV7610_REG_COM_I	0x29	/* misc settings */
+
+/* OV7670 registers */
+#define OV7670_REG_GAIN        0x00    /* Gain lower 8 bits (rest in vref) */
+#define OV7670_REG_BLUE        0x01    /* blue gain */
+#define OV7670_REG_RED         0x02    /* red gain */
+#define OV7670_REG_VREF        0x03    /* Pieces of GAIN, VSTART, VSTOP */
+#define OV7670_REG_COM1        0x04    /* Control 1 */
+#define OV7670_REG_AECHH       0x07    /* AEC MS 5 bits */
+#define OV7670_REG_COM3        0x0c    /* Control 3 */
+#define OV7670_REG_COM4        0x0d    /* Control 4 */
+#define OV7670_REG_COM5        0x0e    /* All "reserved" */
+#define OV7670_REG_COM6        0x0f    /* Control 6 */
+#define OV7670_REG_AECH        0x10    /* More bits of AEC value */
+#define OV7670_REG_CLKRC       0x11    /* Clock control */
+#define OV7670_REG_COM7        0x12    /* Control 7 */
+#define   OV7670_COM7_FMT_VGA    0x00
+#define   OV7670_COM7_YUV        0x00    /* YUV */
+#define   OV7670_COM7_FMT_QVGA   0x10    /* QVGA format */
+#define   OV7670_COM7_FMT_MASK   0x38
+#define   OV7670_COM7_RESET      0x80    /* Register reset */
+#define OV7670_REG_COM8        0x13    /* Control 8 */
+#define   OV7670_COM8_AEC        0x01    /* Auto exposure enable */
+#define   OV7670_COM8_AWB        0x02    /* White balance enable */
+#define   OV7670_COM8_AGC        0x04    /* Auto gain enable */
+#define   OV7670_COM8_BFILT      0x20    /* Band filter enable */
+#define   OV7670_COM8_AECSTEP    0x40    /* Unlimited AEC step size */
+#define   OV7670_COM8_FASTAEC    0x80    /* Enable fast AGC/AEC */
+#define OV7670_REG_COM9        0x14    /* Control 9  - gain ceiling */
+#define OV7670_REG_COM10       0x15    /* Control 10 */
+#define OV7670_REG_HSTART      0x17    /* Horiz start high bits */
+#define OV7670_REG_HSTOP       0x18    /* Horiz stop high bits */
+#define OV7670_REG_VSTART      0x19    /* Vert start high bits */
+#define OV7670_REG_VSTOP       0x1a    /* Vert stop high bits */
+#define OV7670_REG_MVFP        0x1e    /* Mirror / vflip */
+#define   OV7670_MVFP_MIRROR     0x20    /* Mirror image */
+#define OV7670_REG_AEW         0x24    /* AGC upper limit */
+#define OV7670_REG_AEB         0x25    /* AGC lower limit */
+#define OV7670_REG_VPT         0x26    /* AGC/AEC fast mode op region */
+#define OV7670_REG_HREF        0x32    /* HREF pieces */
+#define OV7670_REG_TSLB        0x3a    /* lots of stuff */
+#define OV7670_REG_COM11       0x3b    /* Control 11 */
+#define   OV7670_COM11_EXP       0x02
+#define   OV7670_COM11_HZAUTO    0x10    /* Auto detect 50/60 Hz */
+#define OV7670_REG_COM12       0x3c    /* Control 12 */
+#define OV7670_REG_COM13       0x3d    /* Control 13 */
+#define   OV7670_COM13_GAMMA     0x80    /* Gamma enable */
+#define   OV7670_COM13_UVSAT     0x40    /* UV saturation auto adjustment */
+#define OV7670_REG_COM14       0x3e    /* Control 14 */
+#define OV7670_REG_EDGE        0x3f    /* Edge enhancement factor */
+#define OV7670_REG_COM15       0x40    /* Control 15 */
+#define   OV7670_COM15_R00FF     0xc0    /*            00 to FF */
+#define OV7670_REG_COM16       0x41    /* Control 16 */
+#define   OV7670_COM16_AWBGAIN   0x08    /* AWB gain enable */
+#define OV7670_REG_BRIGHT      0x55    /* Brightness */
+#define OV7670_REG_CONTRAS     0x56    /* Contrast control */
+#define OV7670_REG_GFIX        0x69    /* Fix gain control */
+#define OV7670_REG_RGB444      0x8c    /* RGB 444 control */
+#define OV7670_REG_HAECC1      0x9f    /* Hist AEC/AGC control 1 */
+#define OV7670_REG_HAECC2      0xa0    /* Hist AEC/AGC control 2 */
+#define OV7670_REG_BD50MAX     0xa5    /* 50hz banding step limit */
+#define OV7670_REG_HAECC3      0xa6    /* Hist AEC/AGC control 3 */
+#define OV7670_REG_HAECC4      0xa7    /* Hist AEC/AGC control 4 */
+#define OV7670_REG_HAECC5      0xa8    /* Hist AEC/AGC control 5 */
+#define OV7670_REG_HAECC6      0xa9    /* Hist AEC/AGC control 6 */
+#define OV7670_REG_HAECC7      0xaa    /* Hist AEC/AGC control 7 */
+#define OV7670_REG_BD60MAX     0xab    /* 60hz banding step limit */
+
+struct ovsensor_window {
+	short x;
+	short y;
+	short width;
+	short height;
+/*	int format; */
+	short quarter;		/* Scale width and height down 2x */
+	short clockdiv;		/* Clock divisor setting */
+};
+
+static unsigned char ov7670_abs_to_sm(unsigned char v)
+{
+	if (v > 127)
+		return v & 0x7f;
+	return (128 - v) | 0x80;
+}
+
+/* Write a OV519 register */
+static int reg_w(struct sd *sd, __u16 index, __u8 value)
+{
+	int ret;
+
+	sd->gspca_dev.usb_buf[0] = value;
+	ret = usb_control_msg(sd->gspca_dev.dev,
+			usb_sndctrlpipe(sd->gspca_dev.dev, 0),
+			1,			/* REQ_IO (ov518/519) */
+			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+			0, index,
+			sd->gspca_dev.usb_buf, 1, 500);
+	if (ret < 0)
+		PDEBUG(D_ERR, "Write reg [%02x] %02x failed", index, value);
+	return ret;
+}
+
+/* Read from a OV519 register */
+/* returns: negative is error, pos or zero is data */
+static int reg_r(struct sd *sd, __u16 index)
+{
+	int ret;
+
+	ret = usb_control_msg(sd->gspca_dev.dev,
+			usb_rcvctrlpipe(sd->gspca_dev.dev, 0),
+			1,			/* REQ_IO */
+			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+			0, index, sd->gspca_dev.usb_buf, 1, 500);
+
+	if (ret >= 0)
+		ret = sd->gspca_dev.usb_buf[0];
+	else
+		PDEBUG(D_ERR, "Read reg [0x%02x] failed", index);
+	return ret;
+}
+
+/* Read 8 values from a OV519 register */
+static int reg_r8(struct sd *sd,
+		  __u16 index)
+{
+	int ret;
+
+	ret = usb_control_msg(sd->gspca_dev.dev,
+			usb_rcvctrlpipe(sd->gspca_dev.dev, 0),
+			1,			/* REQ_IO */
+			USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+			0, index, sd->gspca_dev.usb_buf, 8, 500);
+
+	if (ret >= 0)
+		ret = sd->gspca_dev.usb_buf[0];
+	else
+		PDEBUG(D_ERR, "Read reg 8 [0x%02x] failed", index);
+	return ret;
+}
+
+/*
+ * Writes bits at positions specified by mask to an OV51x reg. Bits that are in
+ * the same position as 1's in "mask" are cleared and set to "value". Bits
+ * that are in the same position as 0's in "mask" are preserved, regardless
+ * of their respective state in "value".
+ */
+static int reg_w_mask(struct sd *sd,
+			__u16 index,
+			__u8 value,
+			__u8 mask)
+{
+	int ret;
+	__u8 oldval;
+
+	if (mask != 0xff) {
+		value &= mask;			/* Enforce mask on value */
+		ret = reg_r(sd, index);
+		if (ret < 0)
+			return ret;
+
+		oldval = ret & ~mask;		/* Clear the masked bits */
+		value |= oldval;		/* Set the desired bits */
+	}
+	return reg_w(sd, index, value);
+}
+
+/*
+ * The OV518 I2C I/O procedure is different, hence, this function.
+ * This is normally only called from i2c_w(). Note that this function
+ * always succeeds regardless of whether the sensor is present and working.
+ */
+static int i2c_w(struct sd *sd,
+		__u8 reg,
+		__u8 value)
+{
+	int rc;
+
+	PDEBUG(D_USBO, "i2c 0x%02x -> [0x%02x]", value, reg);
+
+	/* Select camera register */
+	rc = reg_w(sd, R51x_I2C_SADDR_3, reg);
+	if (rc < 0)
+		return rc;
+
+	/* Write "value" to I2C data port of OV511 */
+	rc = reg_w(sd, R51x_I2C_DATA, value);
+	if (rc < 0)
+		return rc;
+
+	/* Initiate 3-byte write cycle */
+	rc = reg_w(sd, R518_I2C_CTL, 0x01);
+
+	/* wait for write complete */
+	msleep(4);
+	if (rc < 0)
+		return rc;
+	return reg_r8(sd, R518_I2C_CTL);
+}
+
+/*
+ * returns: negative is error, pos or zero is data
+ *
+ * The OV518 I2C I/O procedure is different, hence, this function.
+ * This is normally only called from i2c_r(). Note that this function
+ * always succeeds regardless of whether the sensor is present and working.
+ */
+static int i2c_r(struct sd *sd, __u8 reg)
+{
+	int rc, value;
+
+	/* Select camera register */
+	rc = reg_w(sd, R51x_I2C_SADDR_2, reg);
+	if (rc < 0)
+		return rc;
+
+	/* Initiate 2-byte write cycle */
+	rc = reg_w(sd, R518_I2C_CTL, 0x03);
+	if (rc < 0)
+		return rc;
+
+	/* Initiate 2-byte read cycle */
+	rc = reg_w(sd, R518_I2C_CTL, 0x05);
+	if (rc < 0)
+		return rc;
+	value = reg_r(sd, R51x_I2C_DATA);
+	PDEBUG(D_USBI, "i2c [0x%02X] -> 0x%02X", reg, value);
+	return value;
+}
+
+/* Writes bits at positions specified by mask to an I2C reg. Bits that are in
+ * the same position as 1's in "mask" are cleared and set to "value". Bits
+ * that are in the same position as 0's in "mask" are preserved, regardless
+ * of their respective state in "value".
+ */
+static int i2c_w_mask(struct sd *sd,
+		   __u8 reg,
+		   __u8 value,
+		   __u8 mask)
+{
+	int rc;
+	__u8 oldval;
+
+	value &= mask;			/* Enforce mask on value */
+	rc = i2c_r(sd, reg);
+	if (rc < 0)
+		return rc;
+	oldval = rc & ~mask;		/* Clear the masked bits */
+	value |= oldval;		/* Set the desired bits */
+	return i2c_w(sd, reg, value);
+}
+
+/* Temporarily stops OV511 from functioning. Must do this before changing
+ * registers while the camera is streaming */
+static inline int ov51x_stop(struct sd *sd)
+{
+	PDEBUG(D_STREAM, "stopping");
+	sd->stopped = 1;
+	return reg_w(sd, OV519_SYS_RESET1, 0x0f);
+}
+
+/* Restarts OV511 after ov511_stop() is called. Has no effect if it is not
+ * actually stopped (for performance). */
+static inline int ov51x_restart(struct sd *sd)
+{
+	PDEBUG(D_STREAM, "restarting");
+	if (!sd->stopped)
+		return 0;
+	sd->stopped = 0;
+
+	/* Reinitialize the stream */
+	return reg_w(sd, OV519_SYS_RESET1, 0x00);
+}
+
+/* This does an initial reset of an OmniVision sensor and ensures that I2C
+ * is synchronized. Returns <0 on failure.
+ */
+static int init_ov_sensor(struct sd *sd)
+{
+	int i, success;
+
+	/* Reset the sensor */
+	if (i2c_w(sd, 0x12, 0x80) < 0)
+		return -EIO;
+
+	/* Wait for it to initialize */
+	msleep(150);
+
+	for (i = 0, success = 0; i < i2c_detect_tries && !success; i++) {
+		if (i2c_r(sd, OV7610_REG_ID_HIGH) == 0x7f &&
+		    i2c_r(sd, OV7610_REG_ID_LOW) == 0xa2) {
+			success = 1;
+			continue;
+		}
+
+		/* Reset the sensor */
+		if (i2c_w(sd, 0x12, 0x80) < 0)
+			return -EIO;
+		/* Wait for it to initialize */
+		msleep(150);
+		/* Dummy read to sync I2C */
+		if (i2c_r(sd, 0x00) < 0)
+			return -EIO;
+	}
+	if (!success)
+		return -EIO;
+	PDEBUG(D_PROBE, "I2C synced in %d attempt(s)", i);
+	return 0;
+}
+
+/* Switch on standard JPEG compression. Returns 0 for success. */
+static int ov519_init_compression(struct sd *sd)
+{
+	if (!sd->compress_inited) {
+		if (reg_w_mask(sd, OV519_SYS_EN_CLK1, 1 << 2, 1 << 2) < 0) {
+			PDEBUG(D_ERR, "Error switching to compressed mode");
+			return -EIO;
+		}
+		sd->compress_inited = 1;
+	}
+	return 0;
+}
+
+/* Set the read and write slave IDs. The "slave" argument is the write slave,
+ * and the read slave will be set to (slave + 1).
+ * This should not be called from outside the i2c I/O functions.
+ * Sets I2C read and write slave IDs. Returns <0 for error
+ */
+static int ov51x_set_slave_ids(struct sd *sd,
+				__u8 slave)
+{
+	int rc;
+
+	rc = reg_w(sd, R51x_I2C_W_SID, slave);
+	if (rc < 0)
+		return rc;
+	return reg_w(sd, R51x_I2C_R_SID, slave + 1);
+}
+
+struct ov_regvals {
+	__u8 reg;
+	__u8 val;
+};
+struct ov_i2c_regvals {
+	__u8 reg;
+	__u8 val;
+};
+
+static int write_regvals(struct sd *sd,
+			 const struct ov_regvals *regvals,
+			 int n)
+{
+	int rc;
+
+	while (--n >= 0) {
+		rc = reg_w(sd, regvals->reg, regvals->val);
+		if (rc < 0)
+			return rc;
+		regvals++;
+	}
+	return 0;
+}
+
+static int write_i2c_regvals(struct sd *sd,
+			     const struct ov_i2c_regvals *regvals,
+			     int n)
+{
+	int rc;
+
+	while (--n >= 0) {
+		rc = i2c_w(sd, regvals->reg, regvals->val);
+		if (rc < 0)
+			return rc;
+		regvals++;
+	}
+	return 0;
+}
+
+/****************************************************************************
+ *
+ * OV511 and sensor configuration
+ *
+ ***************************************************************************/
+
+/* This initializes the OV8110, OV8610 sensor. The OV8110 uses
+ * the same register settings as the OV8610, since they are very similar.
+ */
+static int ov8xx0_configure(struct sd *sd)
+{
+	int rc;
+	static const struct ov_i2c_regvals norm_8610[] = {
+		{ 0x12, 0x80 },
+		{ 0x00, 0x00 },
+		{ 0x01, 0x80 },
+		{ 0x02, 0x80 },
+		{ 0x03, 0xc0 },
+		{ 0x04, 0x30 },
+		{ 0x05, 0x30 }, /* was 0x10, new from windrv 090403 */
+		{ 0x06, 0x70 }, /* was 0x80, new from windrv 090403 */
+		{ 0x0a, 0x86 },
+		{ 0x0b, 0xb0 },
+		{ 0x0c, 0x20 },
+		{ 0x0d, 0x20 },
+		{ 0x11, 0x01 },
+		{ 0x12, 0x25 },
+		{ 0x13, 0x01 },
+		{ 0x14, 0x04 },
+		{ 0x15, 0x01 }, /* Lin and Win think different about UV order */
+		{ 0x16, 0x03 },
+		{ 0x17, 0x38 }, /* was 0x2f, new from windrv 090403 */
+		{ 0x18, 0xea }, /* was 0xcf, new from windrv 090403 */
+		{ 0x19, 0x02 }, /* was 0x06, new from windrv 090403 */
+		{ 0x1a, 0xf5 },
+		{ 0x1b, 0x00 },
+		{ 0x20, 0xd0 }, /* was 0x90, new from windrv 090403 */
+		{ 0x23, 0xc0 }, /* was 0x00, new from windrv 090403 */
+		{ 0x24, 0x30 }, /* was 0x1d, new from windrv 090403 */
+		{ 0x25, 0x50 }, /* was 0x57, new from windrv 090403 */
+		{ 0x26, 0xa2 },
+		{ 0x27, 0xea },
+		{ 0x28, 0x00 },
+		{ 0x29, 0x00 },
+		{ 0x2a, 0x80 },
+		{ 0x2b, 0xc8 }, /* was 0xcc, new from windrv 090403 */
+		{ 0x2c, 0xac },
+		{ 0x2d, 0x45 }, /* was 0xd5, new from windrv 090403 */
+		{ 0x2e, 0x80 },
+		{ 0x2f, 0x14 }, /* was 0x01, new from windrv 090403 */
+		{ 0x4c, 0x00 },
+		{ 0x4d, 0x30 }, /* was 0x10, new from windrv 090403 */
+		{ 0x60, 0x02 }, /* was 0x01, new from windrv 090403 */
+		{ 0x61, 0x00 }, /* was 0x09, new from windrv 090403 */
+		{ 0x62, 0x5f }, /* was 0xd7, new from windrv 090403 */
+		{ 0x63, 0xff },
+		{ 0x64, 0x53 }, /* new windrv 090403 says 0x57,
+				 * maybe thats wrong */
+		{ 0x65, 0x00 },
+		{ 0x66, 0x55 },
+		{ 0x67, 0xb0 },
+		{ 0x68, 0xc0 }, /* was 0xaf, new from windrv 090403 */
+		{ 0x69, 0x02 },
+		{ 0x6a, 0x22 },
+		{ 0x6b, 0x00 },
+		{ 0x6c, 0x99 }, /* was 0x80, old windrv says 0x00, but
+				   deleting bit7 colors the first images red */
+		{ 0x6d, 0x11 }, /* was 0x00, new from windrv 090403 */
+		{ 0x6e, 0x11 }, /* was 0x00, new from windrv 090403 */
+		{ 0x6f, 0x01 },
+		{ 0x70, 0x8b },
+		{ 0x71, 0x00 },
+		{ 0x72, 0x14 },
+		{ 0x73, 0x54 },
+		{ 0x74, 0x00 },/* 0x60? - was 0x00, new from windrv 090403 */
+		{ 0x75, 0x0e },
+		{ 0x76, 0x02 }, /* was 0x02, new from windrv 090403 */
+		{ 0x77, 0xff },
+		{ 0x78, 0x80 },
+		{ 0x79, 0x80 },
+		{ 0x7a, 0x80 },
+		{ 0x7b, 0x10 }, /* was 0x13, new from windrv 090403 */
+		{ 0x7c, 0x00 },
+		{ 0x7d, 0x08 }, /* was 0x09, new from windrv 090403 */
+		{ 0x7e, 0x08 }, /* was 0xc0, new from windrv 090403 */
+		{ 0x7f, 0xfb },
+		{ 0x80, 0x28 },
+		{ 0x81, 0x00 },
+		{ 0x82, 0x23 },
+		{ 0x83, 0x0b },
+		{ 0x84, 0x00 },
+		{ 0x85, 0x62 }, /* was 0x61, new from windrv 090403 */
+		{ 0x86, 0xc9 },
+		{ 0x87, 0x00 },
+		{ 0x88, 0x00 },
+		{ 0x89, 0x01 },
+		{ 0x12, 0x20 },
+		{ 0x12, 0x25 }, /* was 0x24, new from windrv 090403 */
+	};
+
+	PDEBUG(D_PROBE, "starting ov8xx0 configuration");
+
+	if (init_ov_sensor(sd) < 0)
+		PDEBUG(D_ERR|D_PROBE, "Failed to read sensor ID");
+	else
+		PDEBUG(D_PROBE, "OV86x0 initialized");
+
+	/* Detect sensor (sub)type */
+	rc = i2c_r(sd, OV7610_REG_COM_I);
+	if (rc < 0) {
+		PDEBUG(D_ERR, "Error detecting sensor type");
+		return -1;
+	}
+	if ((rc & 3) == 1) {
+		PDEBUG(D_PROBE, "Sensor is an OV8610");
+		sd->sensor = SEN_OV8610;
+	} else {
+		PDEBUG(D_ERR, "Unknown image sensor version: %d", rc & 3);
+		return -1;
+	}
+	PDEBUG(D_PROBE, "Writing 8610 registers");
+	if (write_i2c_regvals(sd,
+			norm_8610,
+			sizeof norm_8610 / sizeof norm_8610[0]))
+		return -1;
+
+	/* Set sensor-specific vars */
+	sd->maxwidth = 640;
+	sd->maxheight = 480;
+	return 0;
+}
+
+/* This initializes the OV7610, OV7620, or OV76BE sensor. The OV76BE uses
+ * the same register settings as the OV7610, since they are very similar.
+ */
+static int ov7xx0_configure(struct sd *sd)
+{
+	int rc, high, low;
+
+	/* Lawrence Glaister <lg@jfm.bc.ca> reports:
+	 *
+	 * Register 0x0f in the 7610 has the following effects:
+	 *
+	 * 0x85 (AEC method 1): Best overall, good contrast range
+	 * 0x45 (AEC method 2): Very overexposed
+	 * 0xa5 (spec sheet default): Ok, but the black level is
+	 *	shifted resulting in loss of contrast
+	 * 0x05 (old driver setting): very overexposed, too much
+	 *	contrast
+	 */
+	static const struct ov_i2c_regvals norm_7610[] = {
+		{ 0x10, 0xff },
+		{ 0x16, 0x06 },
+		{ 0x28, 0x24 },
+		{ 0x2b, 0xac },
+		{ 0x12, 0x00 },
+		{ 0x38, 0x81 },
+		{ 0x28, 0x24 },	/* 0c */
+		{ 0x0f, 0x85 },	/* lg's setting */
+		{ 0x15, 0x01 },
+		{ 0x20, 0x1c },
+		{ 0x23, 0x2a },
+		{ 0x24, 0x10 },
+		{ 0x25, 0x8a },
+		{ 0x26, 0xa2 },
+		{ 0x27, 0xc2 },
+		{ 0x2a, 0x04 },
+		{ 0x2c, 0xfe },
+		{ 0x2d, 0x93 },
+		{ 0x30, 0x71 },
+		{ 0x31, 0x60 },
+		{ 0x32, 0x26 },
+		{ 0x33, 0x20 },
+		{ 0x34, 0x48 },
+		{ 0x12, 0x24 },
+		{ 0x11, 0x01 },
+		{ 0x0c, 0x24 },
+		{ 0x0d, 0x24 },
+	};
+
+	static const struct ov_i2c_regvals norm_7620[] = {
+		{ 0x00, 0x00 },		/* gain */
+		{ 0x01, 0x80 },		/* blue gain */
+		{ 0x02, 0x80 },		/* red gain */
+		{ 0x03, 0xc0 },		/* OV7670_REG_VREF */
+		{ 0x06, 0x60 },
+		{ 0x07, 0x00 },
+		{ 0x0c, 0x24 },
+		{ 0x0c, 0x24 },
+		{ 0x0d, 0x24 },
+		{ 0x11, 0x01 },
+		{ 0x12, 0x24 },
+		{ 0x13, 0x01 },
+		{ 0x14, 0x84 },
+		{ 0x15, 0x01 },
+		{ 0x16, 0x03 },
+		{ 0x17, 0x2f },
+		{ 0x18, 0xcf },
+		{ 0x19, 0x06 },
+		{ 0x1a, 0xf5 },
+		{ 0x1b, 0x00 },
+		{ 0x20, 0x18 },
+		{ 0x21, 0x80 },
+		{ 0x22, 0x80 },
+		{ 0x23, 0x00 },
+		{ 0x26, 0xa2 },
+		{ 0x27, 0xea },
+		{ 0x28, 0x20 },
+		{ 0x29, 0x00 },
+		{ 0x2a, 0x10 },
+		{ 0x2b, 0x00 },
+		{ 0x2c, 0x88 },
+		{ 0x2d, 0x91 },
+		{ 0x2e, 0x80 },
+		{ 0x2f, 0x44 },
+		{ 0x60, 0x27 },
+		{ 0x61, 0x02 },
+		{ 0x62, 0x5f },
+		{ 0x63, 0xd5 },
+		{ 0x64, 0x57 },
+		{ 0x65, 0x83 },
+		{ 0x66, 0x55 },
+		{ 0x67, 0x92 },
+		{ 0x68, 0xcf },
+		{ 0x69, 0x76 },
+		{ 0x6a, 0x22 },
+		{ 0x6b, 0x00 },
+		{ 0x6c, 0x02 },
+		{ 0x6d, 0x44 },
+		{ 0x6e, 0x80 },
+		{ 0x6f, 0x1d },
+		{ 0x70, 0x8b },
+		{ 0x71, 0x00 },
+		{ 0x72, 0x14 },
+		{ 0x73, 0x54 },
+		{ 0x74, 0x00 },
+		{ 0x75, 0x8e },
+		{ 0x76, 0x00 },
+		{ 0x77, 0xff },
+		{ 0x78, 0x80 },
+		{ 0x79, 0x80 },
+		{ 0x7a, 0x80 },
+		{ 0x7b, 0xe2 },
+		{ 0x7c, 0x00 },
+	};
+
+	/* 7640 and 7648. The defaults should be OK for most registers. */
+	static const struct ov_i2c_regvals norm_7640[] = {
+		{ 0x12, 0x80 },
+		{ 0x12, 0x14 },
+	};
+
+	/* 7670. Defaults taken from OmniVision provided data,
+	*  as provided by Jonathan Corbet of OLPC		*/
+	static const struct ov_i2c_regvals norm_7670[] = {
+		{ OV7670_REG_COM7, OV7670_COM7_RESET },
+		{ OV7670_REG_TSLB, 0x04 },		/* OV */
+		{ OV7670_REG_COM7, OV7670_COM7_FMT_VGA }, /* VGA */
+		{ OV7670_REG_CLKRC, 0x1 },
+	/*
+	 * Set the hardware window.  These values from OV don't entirely
+	 * make sense - hstop is less than hstart.  But they work...
+	 */
+		{ OV7670_REG_HSTART, 0x13 },	{ OV7670_REG_HSTOP, 0x01 },
+		{ OV7670_REG_HREF, 0xb6 },	{ OV7670_REG_VSTART, 0x02 },
+		{ OV7670_REG_VSTOP, 0x7a },	{ OV7670_REG_VREF, 0x0a },
+
+		{ OV7670_REG_COM3, 0 },	{ OV7670_REG_COM14, 0 },
+	/* Mystery scaling numbers */
+		{ 0x70, 0x3a },		{ 0x71, 0x35 },
+		{ 0x72, 0x11 },		{ 0x73, 0xf0 },
+		{ 0xa2, 0x02 },
+/* jfm */
+/* { OV7670_REG_COM10, 0x0 }, */
+
+	/* Gamma curve values */
+		{ 0x7a, 0x20 },
+/* jfm:win 7b=1c */
+		{ 0x7b, 0x10 },
+/* jfm:win 7c=28 */
+		{ 0x7c, 0x1e },
+/* jfm:win 7d=3c */
+		{ 0x7d, 0x35 },
+		{ 0x7e, 0x5a },		{ 0x7f, 0x69 },
+		{ 0x80, 0x76 },		{ 0x81, 0x80 },
+		{ 0x82, 0x88 },		{ 0x83, 0x8f },
+		{ 0x84, 0x96 },		{ 0x85, 0xa3 },
+		{ 0x86, 0xaf },		{ 0x87, 0xc4 },
+		{ 0x88, 0xd7 },		{ 0x89, 0xe8 },
+
+	/* AGC and AEC parameters.  Note we start by disabling those features,
+	   then turn them only after tweaking the values. */
+		{ OV7670_REG_COM8, OV7670_COM8_FASTAEC
+				 | OV7670_COM8_AECSTEP
+				 | OV7670_COM8_BFILT },
+		{ OV7670_REG_GAIN, 0 },	{ OV7670_REG_AECH, 0 },
+		{ OV7670_REG_COM4, 0x40 }, /* magic reserved bit */
+/* jfm:win 14=38 */
+		{ OV7670_REG_COM9, 0x18 }, /* 4x gain + magic rsvd bit */
+		{ OV7670_REG_BD50MAX, 0x05 },	{ OV7670_REG_BD60MAX, 0x07 },
+		{ OV7670_REG_AEW, 0x95 },	{ OV7670_REG_AEB, 0x33 },
+		{ OV7670_REG_VPT, 0xe3 },	{ OV7670_REG_HAECC1, 0x78 },
+		{ OV7670_REG_HAECC2, 0x68 },
+/* jfm:win a1=0b */
+		{ 0xa1, 0x03 }, /* magic */
+		{ OV7670_REG_HAECC3, 0xd8 },	{ OV7670_REG_HAECC4, 0xd8 },
+		{ OV7670_REG_HAECC5, 0xf0 },	{ OV7670_REG_HAECC6, 0x90 },
+		{ OV7670_REG_HAECC7, 0x94 },
+		{ OV7670_REG_COM8, OV7670_COM8_FASTAEC
+				| OV7670_COM8_AECSTEP
+				| OV7670_COM8_BFILT
+				| OV7670_COM8_AGC
+				| OV7670_COM8_AEC },
+
+	/* Almost all of these are magic "reserved" values.  */
+		{ OV7670_REG_COM5, 0x61 },	{ OV7670_REG_COM6, 0x4b },
+		{ 0x16, 0x02 },
+/* jfm */
+/*		{ OV7670_REG_MVFP, 0x07|OV7670_MVFP_MIRROR }, */
+		{ OV7670_REG_MVFP, 0x07 },
+		{ 0x21, 0x02 },		{ 0x22, 0x91 },
+		{ 0x29, 0x07 },		{ 0x33, 0x0b },
+		{ 0x35, 0x0b },		{ 0x37, 0x1d },
+		{ 0x38, 0x71 },		{ 0x39, 0x2a },
+		{ OV7670_REG_COM12, 0x78 },	{ 0x4d, 0x40 },
+		{ 0x4e, 0x20 },		{ OV7670_REG_GFIX, 0 },
+		{ 0x6b, 0x4a },		{ 0x74, 0x10 },
+		{ 0x8d, 0x4f },		{ 0x8e, 0 },
+		{ 0x8f, 0 },		{ 0x90, 0 },
+		{ 0x91, 0 },		{ 0x96, 0 },
+		{ 0x9a, 0 },		{ 0xb0, 0x84 },
+		{ 0xb1, 0x0c },		{ 0xb2, 0x0e },
+		{ 0xb3, 0x82 },		{ 0xb8, 0x0a },
+
+	/* More reserved magic, some of which tweaks white balance */
+		{ 0x43, 0x0a },		{ 0x44, 0xf0 },
+		{ 0x45, 0x34 },		{ 0x46, 0x58 },
+		{ 0x47, 0x28 },		{ 0x48, 0x3a },
+		{ 0x59, 0x88 },		{ 0x5a, 0x88 },
+		{ 0x5b, 0x44 },		{ 0x5c, 0x67 },
+		{ 0x5d, 0x49 },		{ 0x5e, 0x0e },
+		{ 0x6c, 0x0a },		{ 0x6d, 0x55 },
+		{ 0x6e, 0x11 },		{ 0x6f, 0x9f },
+						/* "9e for advance AWB" */
+		{ 0x6a, 0x40 },		{ OV7670_REG_BLUE, 0x40 },
+		{ OV7670_REG_RED, 0x60 },
+		{ OV7670_REG_COM8, OV7670_COM8_FASTAEC
+				| OV7670_COM8_AECSTEP
+				| OV7670_COM8_BFILT
+				| OV7670_COM8_AGC
+				| OV7670_COM8_AEC
+				| OV7670_COM8_AWB },
+
+	/* Matrix coefficients */
+		{ 0x4f, 0x80 },		{ 0x50, 0x80 },
+		{ 0x51, 0 },		{ 0x52, 0x22 },
+		{ 0x53, 0x5e },		{ 0x54, 0x80 },
+		{ 0x58, 0x9e },
+
+		{ OV7670_REG_COM16, OV7670_COM16_AWBGAIN },
+		{ OV7670_REG_EDGE, 0 },
+		{ 0x75, 0x05 },		{ 0x76, 0xe1 },
+		{ 0x4c, 0 },		{ 0x77, 0x01 },
+		{ OV7670_REG_COM13, 0xc3 },	{ 0x4b, 0x09 },
+		{ 0xc9, 0x60 },		{ OV7670_REG_COM16, 0x38 },
+		{ 0x56, 0x40 },
+
+		{ 0x34, 0x11 },
+		{ OV7670_REG_COM11, OV7670_COM11_EXP|OV7670_COM11_HZAUTO },
+		{ 0xa4, 0x88 },		{ 0x96, 0 },
+		{ 0x97, 0x30 },		{ 0x98, 0x20 },
+		{ 0x99, 0x30 },		{ 0x9a, 0x84 },
+		{ 0x9b, 0x29 },		{ 0x9c, 0x03 },
+		{ 0x9d, 0x4c },		{ 0x9e, 0x3f },
+		{ 0x78, 0x04 },
+
+	/* Extra-weird stuff.  Some sort of multiplexor register */
+		{ 0x79, 0x01 },		{ 0xc8, 0xf0 },
+		{ 0x79, 0x0f },		{ 0xc8, 0x00 },
+		{ 0x79, 0x10 },		{ 0xc8, 0x7e },
+		{ 0x79, 0x0a },		{ 0xc8, 0x80 },
+		{ 0x79, 0x0b },		{ 0xc8, 0x01 },
+		{ 0x79, 0x0c },		{ 0xc8, 0x0f },
+		{ 0x79, 0x0d },		{ 0xc8, 0x20 },
+		{ 0x79, 0x09 },		{ 0xc8, 0x80 },
+		{ 0x79, 0x02 },		{ 0xc8, 0xc0 },
+		{ 0x79, 0x03 },		{ 0xc8, 0x40 },
+		{ 0x79, 0x05 },		{ 0xc8, 0x30 },
+		{ 0x79, 0x26 },
+
+	/* Format YUV422 */
+		{ OV7670_REG_COM7, OV7670_COM7_YUV },  /* Selects YUV mode */
+		{ OV7670_REG_RGB444, 0 },	/* No RGB444 please */
+		{ OV7670_REG_COM1, 0 },
+		{ OV7670_REG_COM15, OV7670_COM15_R00FF },
+		{ OV7670_REG_COM9, 0x18 },
+				/* 4x gain ceiling; 0x8 is reserved bit */
+		{ 0x4f, 0x80 }, 	/* "matrix coefficient 1" */
+		{ 0x50, 0x80 }, 	/* "matrix coefficient 2" */
+		{ 0x52, 0x22 }, 	/* "matrix coefficient 4" */
+		{ 0x53, 0x5e }, 	/* "matrix coefficient 5" */
+		{ 0x54, 0x80 }, 	/* "matrix coefficient 6" */
+		{ OV7670_REG_COM13, OV7670_COM13_GAMMA|OV7670_COM13_UVSAT },
+};
+
+	PDEBUG(D_PROBE, "starting OV7xx0 configuration");
+
+/* jfm:already done? */
+	if (init_ov_sensor(sd) < 0)
+		PDEBUG(D_ERR, "Failed to read sensor ID");
+	else
+		PDEBUG(D_PROBE, "OV7xx0 initialized");
+
+	/* Detect sensor (sub)type */
+	rc = i2c_r(sd, OV7610_REG_COM_I);
+
+	/* add OV7670 here
+	 * it appears to be wrongly detected as a 7610 by default */
+	if (rc < 0) {
+		PDEBUG(D_ERR, "Error detecting sensor type");
+		return -1;
+	}
+	if ((rc & 3) == 3) {
+		/* quick hack to make OV7670s work */
+		high = i2c_r(sd, 0x0a);
+		low = i2c_r(sd, 0x0b);
+		/* info("%x, %x", high, low); */
+		if (high == 0x76 && low == 0x73) {
+			PDEBUG(D_PROBE, "Sensor is an OV7670");
+			sd->sensor = SEN_OV7670;
+		} else {
+			PDEBUG(D_PROBE, "Sensor is an OV7610");
+			sd->sensor = SEN_OV7610;
+		}
+	} else if ((rc & 3) == 1) {
+		/* I don't know what's different about the 76BE yet. */
+		if (i2c_r(sd, 0x15) & 1)
+			PDEBUG(D_PROBE, "Sensor is an OV7620AE");
+		else
+			PDEBUG(D_PROBE, "Sensor is an OV76BE");
+
+		/* OV511+ will return all zero isoc data unless we
+		 * configure the sensor as a 7620. Someone needs to
+		 * find the exact reg. setting that causes this. */
+		sd->sensor = SEN_OV76BE;
+	} else if ((rc & 3) == 0) {
+		/* try to read product id registers */
+		high = i2c_r(sd, 0x0a);
+		if (high < 0) {
+			PDEBUG(D_ERR, "Error detecting camera chip PID");
+			return high;
+		}
+		low = i2c_r(sd, 0x0b);
+		if (low < 0) {
+			PDEBUG(D_ERR, "Error detecting camera chip VER");
+			return low;
+		}
+		if (high == 0x76) {
+			if (low == 0x30) {
+				PDEBUG(D_PROBE, "Sensor is an OV7630/OV7635");
+				sd->sensor = SEN_OV7630;
+			} else if (low == 0x40) {
+				PDEBUG(D_PROBE, "Sensor is an OV7645");
+				sd->sensor = SEN_OV7640; /* FIXME */
+			} else if (low == 0x45) {
+				PDEBUG(D_PROBE, "Sensor is an OV7645B");
+				sd->sensor = SEN_OV7640; /* FIXME */
+			} else if (low == 0x48) {
+				PDEBUG(D_PROBE, "Sensor is an OV7648");
+				sd->sensor = SEN_OV7640; /* FIXME */
+			} else {
+				PDEBUG(D_PROBE, "Unknown sensor: 0x76%X", low);
+				return -1;
+			}
+		} else {
+			PDEBUG(D_PROBE, "Sensor is an OV7620");
+			sd->sensor = SEN_OV7620;
+		}
+	} else {
+		PDEBUG(D_ERR, "Unknown image sensor version: %d", rc & 3);
+		return -1;
+	}
+
+	if (sd->sensor == SEN_OV7620) {
+		PDEBUG(D_PROBE, "Writing 7620 registers");
+		if (write_i2c_regvals(sd, norm_7620,
+				sizeof norm_7620 / sizeof norm_7620[0]))
+			return -1;
+	} else if (sd->sensor == SEN_OV7630) {
+		PDEBUG(D_ERR, "7630 is not supported by this driver version");
+		return -1;
+	} else if (sd->sensor == SEN_OV7640) {
+		PDEBUG(D_PROBE, "Writing 7640 registers");
+		if (write_i2c_regvals(sd, norm_7640,
+				sizeof norm_7640 / sizeof norm_7640[0]))
+			return -1;
+	} else if (sd->sensor == SEN_OV7670) {
+		PDEBUG(D_PROBE, "Writing 7670 registers");
+		if (write_i2c_regvals(sd, norm_7670,
+				sizeof norm_7670 / sizeof norm_7670[0]))
+			return -1;
+	} else {
+		PDEBUG(D_PROBE, "Writing 7610 registers");
+		if (write_i2c_regvals(sd, norm_7610,
+				sizeof norm_7610 / sizeof norm_7610[0]))
+			return -1;
+	}
+
+	/* Set sensor-specific vars */
+	sd->maxwidth = 640;
+	sd->maxheight = 480;
+	return 0;
+}
+
+/* This initializes the OV6620, OV6630, OV6630AE, or OV6630AF sensor. */
+static int ov6xx0_configure(struct sd *sd)
+{
+	int rc;
+	static const struct ov_i2c_regvals norm_6x20[] = {
+		{ 0x12, 0x80 }, /* reset */
+		{ 0x11, 0x01 },
+		{ 0x03, 0x60 },
+		{ 0x05, 0x7f }, /* For when autoadjust is off */
+		{ 0x07, 0xa8 },
+		/* The ratio of 0x0c and 0x0d  controls the white point */
+		{ 0x0c, 0x24 },
+		{ 0x0d, 0x24 },
+		{ 0x0f, 0x15 }, /* COMS */
+		{ 0x10, 0x75 }, /* AEC Exposure time */
+		{ 0x12, 0x24 }, /* Enable AGC */
+		{ 0x14, 0x04 },
+		/* 0x16: 0x06 helps frame stability with moving objects */
+		{ 0x16, 0x06 },
+/*		{ 0x20, 0x30 },  * Aperture correction enable */
+		{ 0x26, 0xb2 }, /* BLC enable */
+		/* 0x28: 0x05 Selects RGB format if RGB on */
+		{ 0x28, 0x05 },
+		{ 0x2a, 0x04 }, /* Disable framerate adjust */
+/*		{ 0x2b, 0xac },  * Framerate; Set 2a[7] first */
+		{ 0x2d, 0x99 },
+		{ 0x33, 0xa0 }, /* Color Processing Parameter */
+		{ 0x34, 0xd2 }, /* Max A/D range */
+		{ 0x38, 0x8b },
+		{ 0x39, 0x40 },
+
+		{ 0x3c, 0x39 }, /* Enable AEC mode changing */
+		{ 0x3c, 0x3c }, /* Change AEC mode */
+		{ 0x3c, 0x24 }, /* Disable AEC mode changing */
+
+		{ 0x3d, 0x80 },
+		/* These next two registers (0x4a, 0x4b) are undocumented.
+		 * They control the color balance */
+		{ 0x4a, 0x80 },
+		{ 0x4b, 0x80 },
+		{ 0x4d, 0xd2 }, /* This reduces noise a bit */
+		{ 0x4e, 0xc1 },
+		{ 0x4f, 0x04 },
+/* Do 50-53 have any effect? */
+/* Toggle 0x12[2] off and on here? */
+	};
+
+	static const struct ov_i2c_regvals norm_6x30[] = {
+		{ 0x12, 0x80 }, /* Reset */
+		{ 0x00, 0x1f }, /* Gain */
+		{ 0x01, 0x99 }, /* Blue gain */
+		{ 0x02, 0x7c }, /* Red gain */
+		{ 0x03, 0xc0 }, /* Saturation */
+		{ 0x05, 0x0a }, /* Contrast */
+		{ 0x06, 0x95 }, /* Brightness */
+		{ 0x07, 0x2d }, /* Sharpness */
+		{ 0x0c, 0x20 },
+		{ 0x0d, 0x20 },
+		{ 0x0e, 0x20 },
+		{ 0x0f, 0x05 },
+		{ 0x10, 0x9a },
+		{ 0x11, 0x00 }, /* Pixel clock = fastest */
+		{ 0x12, 0x24 }, /* Enable AGC and AWB */
+		{ 0x13, 0x21 },
+		{ 0x14, 0x80 },
+		{ 0x15, 0x01 },
+		{ 0x16, 0x03 },
+		{ 0x17, 0x38 },
+		{ 0x18, 0xea },
+		{ 0x19, 0x04 },
+		{ 0x1a, 0x93 },
+		{ 0x1b, 0x00 },
+		{ 0x1e, 0xc4 },
+		{ 0x1f, 0x04 },
+		{ 0x20, 0x20 },
+		{ 0x21, 0x10 },
+		{ 0x22, 0x88 },
+		{ 0x23, 0xc0 }, /* Crystal circuit power level */
+		{ 0x25, 0x9a }, /* Increase AEC black ratio */
+		{ 0x26, 0xb2 }, /* BLC enable */
+		{ 0x27, 0xa2 },
+		{ 0x28, 0x00 },
+		{ 0x29, 0x00 },
+		{ 0x2a, 0x84 }, /* 60 Hz power */
+		{ 0x2b, 0xa8 }, /* 60 Hz power */
+		{ 0x2c, 0xa0 },
+		{ 0x2d, 0x95 }, /* Enable auto-brightness */
+		{ 0x2e, 0x88 },
+		{ 0x33, 0x26 },
+		{ 0x34, 0x03 },
+		{ 0x36, 0x8f },
+		{ 0x37, 0x80 },
+		{ 0x38, 0x83 },
+		{ 0x39, 0x80 },
+		{ 0x3a, 0x0f },
+		{ 0x3b, 0x3c },
+		{ 0x3c, 0x1a },
+		{ 0x3d, 0x80 },
+		{ 0x3e, 0x80 },
+		{ 0x3f, 0x0e },
+		{ 0x40, 0x00 }, /* White bal */
+		{ 0x41, 0x00 }, /* White bal */
+		{ 0x42, 0x80 },
+		{ 0x43, 0x3f }, /* White bal */
+		{ 0x44, 0x80 },
+		{ 0x45, 0x20 },
+		{ 0x46, 0x20 },
+		{ 0x47, 0x80 },
+		{ 0x48, 0x7f },
+		{ 0x49, 0x00 },
+		{ 0x4a, 0x00 },
+		{ 0x4b, 0x80 },
+		{ 0x4c, 0xd0 },
+		{ 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */
+		{ 0x4e, 0x40 },
+		{ 0x4f, 0x07 }, /* UV avg., col. killer: max */
+		{ 0x50, 0xff },
+		{ 0x54, 0x23 }, /* Max AGC gain: 18dB */
+		{ 0x55, 0xff },
+		{ 0x56, 0x12 },
+		{ 0x57, 0x81 },
+		{ 0x58, 0x75 },
+		{ 0x59, 0x01 }, /* AGC dark current comp.: +1 */
+		{ 0x5a, 0x2c },
+		{ 0x5b, 0x0f }, /* AWB chrominance levels */
+		{ 0x5c, 0x10 },
+		{ 0x3d, 0x80 },
+		{ 0x27, 0xa6 },
+		{ 0x12, 0x20 }, /* Toggle AWB */
+		{ 0x12, 0x24 },
+	};
+
+	PDEBUG(D_PROBE, "starting sensor configuration");
+
+	if (init_ov_sensor(sd) < 0) {
+		PDEBUG(D_ERR, "Failed to read sensor ID.");
+		return -1;
+	}
+	PDEBUG(D_PROBE, "OV6xx0 sensor detected");
+
+	/* Detect sensor (sub)type */
+	rc = i2c_r(sd, OV7610_REG_COM_I);
+	if (rc < 0) {
+		PDEBUG(D_ERR, "Error detecting sensor type");
+		return -1;
+	}
+
+	/* Ugh. The first two bits are the version bits, but
+	 * the entire register value must be used. I guess OVT
+	 * underestimated how many variants they would make. */
+	if (rc == 0x00) {
+		sd->sensor = SEN_OV6630;
+		PDEBUG(D_ERR,
+			"WARNING: Sensor is an OV66308. Your camera may have");
+		PDEBUG(D_ERR, "been misdetected in previous driver versions.");
+	} else if (rc == 0x01) {
+		sd->sensor = SEN_OV6620;
+		PDEBUG(D_PROBE, "Sensor is an OV6620");
+	} else if (rc == 0x02) {
+		sd->sensor = SEN_OV6630;
+		PDEBUG(D_PROBE, "Sensor is an OV66308AE");
+	} else if (rc == 0x03) {
+		sd->sensor = SEN_OV6630;
+		PDEBUG(D_PROBE, "Sensor is an OV66308AF");
+	} else if (rc == 0x90) {
+		sd->sensor = SEN_OV6630;
+		PDEBUG(D_ERR,
+			"WARNING: Sensor is an OV66307. Your camera may have");
+		PDEBUG(D_ERR, "been misdetected in previous driver versions.");
+	} else {
+		PDEBUG(D_ERR, "FATAL: Unknown sensor version: 0x%02x", rc);
+		return -1;
+	}
+
+	/* Set sensor-specific vars */
+	sd->maxwidth = 352;
+	sd->maxheight = 288;
+
+	if (sd->sensor == SEN_OV6620) {
+		PDEBUG(D_PROBE, "Writing 6x20 registers");
+		if (write_i2c_regvals(sd, norm_6x20,
+				sizeof norm_6x20 / sizeof norm_6x20[0]))
+			return -1;
+	} else {
+		PDEBUG(D_PROBE, "Writing 6x30 registers");
+		if (write_i2c_regvals(sd, norm_6x30,
+				sizeof norm_6x30 / sizeof norm_6x30[0]))
+			return -1;
+	}
+	return 0;
+}
+
+/* Turns on or off the LED. Only has an effect with OV511+/OV518(+)/OV519 */
+static void ov51x_led_control(struct sd *sd, int on)
+{
+	PDEBUG(D_STREAM, "LED (%s)", on ? "on" : "off");
+
+/*	if (sd->bridge == BRG_OV511PLUS) */
+/*		reg_w(sd, R511_SYS_LED_CTL, on ? 1 : 0); */
+/*	else if (sd->bridge == BRG_OV519) */
+		reg_w_mask(sd, OV519_GPIO_DATA_OUT0, !on, 1);	/* 0 / 1 */
+/*	else if (sd->bclass == BCL_OV518) */
+/*		reg_w_mask(sd, R518_GPIO_OUT, on ? 0x02 : 0x00, 0x02); */
+}
+
+/* this function is called at probe time */
+static int sd_config(struct gspca_dev *gspca_dev,
+			const struct usb_device_id *id)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+	struct cam *cam;
+
+/* (from ov519_configure) */
+	static const struct ov_regvals init_519[] = {
+		{ 0x5a,  0x6d }, /* EnableSystem */
+/* jfm trace usbsnoop3-1.txt */
+/* jfm 53 = fb */
+		{ 0x53,  0x9b },
+		{ 0x54,  0xff }, /* set bit2 to enable jpeg */
+		{ 0x5d,  0x03 },
+		{ 0x49,  0x01 },
+		{ 0x48,  0x00 },
+		/* Set LED pin to output mode. Bit 4 must be cleared or sensor
+		 * detection will fail. This deserves further investigation. */
+		{ OV519_GPIO_IO_CTRL0,   0xee },
+		{ 0x51,  0x0f }, /* SetUsbInit */
+		{ 0x51,  0x00 },
+		{ 0x22,  0x00 },
+		/* windows reads 0x55 at this point*/
+	};
+
+	if (write_regvals(sd, init_519, ARRAY_SIZE(init_519)))
+		goto error;
+/* jfm: not seen in windows trace */
+	if (ov519_init_compression(sd))
+		goto error;
+	ov51x_led_control(sd, 0);	/* turn LED off */
+
+	/* Test for 76xx */
+	sd->primary_i2c_slave = OV7xx0_SID;
+	if (ov51x_set_slave_ids(sd, OV7xx0_SID) < 0)
+		goto error;
+
+	/* The OV519 must be more aggressive about sensor detection since
+	 * I2C write will never fail if the sensor is not present. We have
+	 * to try to initialize the sensor to detect its presence */
+	if (init_ov_sensor(sd) < 0) {
+		/* Test for 6xx0 */
+		sd->primary_i2c_slave = OV6xx0_SID;
+		if (ov51x_set_slave_ids(sd, OV6xx0_SID) < 0)
+			goto error;
+
+		if (init_ov_sensor(sd) < 0) {
+			/* Test for 8xx0 */
+			sd->primary_i2c_slave = OV8xx0_SID;
+			if (ov51x_set_slave_ids(sd, OV8xx0_SID) < 0)
+				goto error;
+
+			if (init_ov_sensor(sd) < 0) {
+				PDEBUG(D_ERR,
+					"Can't determine sensor slave IDs");
+				goto error;
+			} else {
+				if (ov8xx0_configure(sd) < 0) {
+					PDEBUG(D_ERR,
+					   "Failed to configure OV8xx0 sensor");
+					goto error;
+				}
+			}
+		} else {
+			if (ov6xx0_configure(sd) < 0) {
+				PDEBUG(D_ERR, "Failed to configure OV6xx0");
+				goto error;
+			}
+		}
+	} else {
+		if (ov7xx0_configure(sd) < 0) {
+			PDEBUG(D_ERR, "Failed to configure OV7xx0");
+			goto error;
+		}
+	}
+
+	cam = &gspca_dev->cam;
+	cam->epaddr = OV511_ENDPOINT_ADDRESS;
+	if (sd->maxwidth == 640) {
+		cam->cam_mode = vga_mode;
+		cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
+	} else {
+		cam->cam_mode = sif_mode;
+		cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
+	}
+	cam->dev_name = (char *) id->driver_info;
+	sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
+	sd->contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
+	sd->colors = sd_ctrls[SD_COLOR].qctrl.default_value;
+	return 0;
+error:
+	PDEBUG(D_ERR, "OV519 Config failed");
+	return -EBUSY;
+}
+
+/* this function is called at open time */
+static int sd_open(struct gspca_dev *gspca_dev)
+{
+	return 0;
+}
+
+/* Sets up the OV519 with the given image parameters
+ *
+ * OV519 needs a completely different approach, until we can figure out what
+ * the individual registers do.
+ *
+ * Do not put any sensor-specific code in here (including I2C I/O functions)
+ */
+static int ov519_mode_init_regs(struct sd *sd,
+				int width, int height)
+{
+	static const struct ov_regvals mode_init_519_ov7670[] = {
+		{ 0x5d,	0x03 }, /* Turn off suspend mode */
+		{ 0x53,	0x9f }, /* was 9b in 1.65-1.08 */
+		{ 0x54,	0x0f }, /* bit2 (jpeg enable) */
+		{ 0xa2,	0x20 }, /* a2-a5 are undocumented */
+		{ 0xa3,	0x18 },
+		{ 0xa4,	0x04 },
+		{ 0xa5,	0x28 },
+		{ 0x37,	0x00 },	/* SetUsbInit */
+		{ 0x55,	0x02 }, /* 4.096 Mhz audio clock */
+		/* Enable both fields, YUV Input, disable defect comp (why?) */
+		{ 0x20,	0x0c },
+		{ 0x21,	0x38 },
+		{ 0x22,	0x1d },
+		{ 0x17,	0x50 }, /* undocumented */
+		{ 0x37,	0x00 }, /* undocumented */
+		{ 0x40,	0xff }, /* I2C timeout counter */
+		{ 0x46,	0x00 }, /* I2C clock prescaler */
+		{ 0x59,	0x04 },	/* new from windrv 090403 */
+		{ 0xff,	0x00 }, /* undocumented */
+		/* windows reads 0x55 at this point, why? */
+	};
+
+	static const struct ov_regvals mode_init_519[] = {
+		{ 0x5d,	0x03 }, /* Turn off suspend mode */
+		{ 0x53,	0x9f }, /* was 9b in 1.65-1.08 */
+		{ 0x54,	0x0f }, /* bit2 (jpeg enable) */
+		{ 0xa2,	0x20 }, /* a2-a5 are undocumented */
+		{ 0xa3,	0x18 },
+		{ 0xa4,	0x04 },
+		{ 0xa5,	0x28 },
+		{ 0x37,	0x00 },	/* SetUsbInit */
+		{ 0x55,	0x02 }, /* 4.096 Mhz audio clock */
+		/* Enable both fields, YUV Input, disable defect comp (why?) */
+		{ 0x22,	0x1d },
+		{ 0x17,	0x50 }, /* undocumented */
+		{ 0x37,	0x00 }, /* undocumented */
+		{ 0x40,	0xff }, /* I2C timeout counter */
+		{ 0x46,	0x00 }, /* I2C clock prescaler */
+		{ 0x59,	0x04 },	/* new from windrv 090403 */
+		{ 0xff,	0x00 }, /* undocumented */
+		/* windows reads 0x55 at this point, why? */
+	};
+
+/* int hi_res; */
+
+	PDEBUG(D_CONF, "mode init %dx%d", width, height);
+
+/*	if (width >= 800 && height >= 600)
+		hi_res = 1;
+	else
+		hi_res = 0; */
+
+/*	if (ov51x_stop(sd) < 0)
+		return -EIO; */
+
+	/******** Set the mode ********/
+	if (sd->sensor != SEN_OV7670) {
+		if (write_regvals(sd, mode_init_519,
+				  ARRAY_SIZE(mode_init_519)))
+			return -EIO;
+	} else {
+		if (write_regvals(sd, mode_init_519_ov7670,
+				  ARRAY_SIZE(mode_init_519_ov7670)))
+			return -EIO;
+	}
+
+	if (sd->sensor == SEN_OV7640) {
+		/* Select 8-bit input mode */
+		reg_w_mask(sd, OV519_CAM_DFR, 0x10, 0x10);
+	}
+
+	reg_w(sd, OV519_CAM_H_SIZE,	width >> 4);
+	reg_w(sd, OV519_CAM_V_SIZE,	height >> 3);
+	reg_w(sd, OV519_CAM_X_OFFSETL,	0x00);
+	reg_w(sd, OV519_CAM_X_OFFSETH,	0x00);
+	reg_w(sd, OV519_CAM_Y_OFFSETL,	0x00);
+	reg_w(sd, OV519_CAM_Y_OFFSETH,	0x00);
+	reg_w(sd, OV519_CAM_DIVIDER,	0x00);
+	reg_w(sd, OV519_CAM_FORMAT,	0x03); /* YUV422 */
+	reg_w(sd, 0x26,			0x00); /* Undocumented */
+
+	/******** Set the framerate ********/
+	if (frame_rate > 0)
+		sd->frame_rate = frame_rate;
+
+/* FIXME: These are only valid at the max resolution. */
+	sd->clockdiv = 0;
+	if (sd->sensor == SEN_OV7640) {
+		switch (sd->frame_rate) {
+/*jfm: default was 30 fps */
+		case 30:
+			reg_w(sd, 0xa4, 0x0c);
+			reg_w(sd, 0x23, 0xff);
+			break;
+		case 25:
+			reg_w(sd, 0xa4, 0x0c);
+			reg_w(sd, 0x23, 0x1f);
+			break;
+		case 20:
+			reg_w(sd, 0xa4, 0x0c);
+			reg_w(sd, 0x23, 0x1b);
+			break;
+		default:
+/*		case 15: */
+			reg_w(sd, 0xa4, 0x04);
+			reg_w(sd, 0x23, 0xff);
+			sd->clockdiv = 1;
+			break;
+		case 10:
+			reg_w(sd, 0xa4, 0x04);
+			reg_w(sd, 0x23, 0x1f);
+			sd->clockdiv = 1;
+			break;
+		case 5:
+			reg_w(sd, 0xa4, 0x04);
+			reg_w(sd, 0x23, 0x1b);
+			sd->clockdiv = 1;
+			break;
+		}
+	} else if (sd->sensor == SEN_OV8610) {
+		switch (sd->frame_rate) {
+		default:	/* 15 fps */
+/*		case 15: */
+			reg_w(sd, 0xa4, 0x06);
+			reg_w(sd, 0x23, 0xff);
+			break;
+		case 10:
+			reg_w(sd, 0xa4, 0x06);
+			reg_w(sd, 0x23, 0x1f);
+			break;
+		case 5:
+			reg_w(sd, 0xa4, 0x06);
+			reg_w(sd, 0x23, 0x1b);
+			break;
+		}
+		sd->clockdiv = 0;
+	} else if (sd->sensor == SEN_OV7670) { /* guesses, based on 7640 */
+		PDEBUG(D_STREAM, "Setting framerate to %d fps",
+				 (sd->frame_rate == 0) ? 15 : sd->frame_rate);
+		switch (sd->frame_rate) {
+		case 30:
+			reg_w(sd, 0xa4, 0x10);
+			reg_w(sd, 0x23, 0xff);
+			break;
+		case 20:
+			reg_w(sd, 0xa4, 0x10);
+			reg_w(sd, 0x23, 0x1b);
+			break;
+		default: /* 15 fps */
+/*			case 15: */
+			reg_w(sd, 0xa4, 0x10);
+			reg_w(sd, 0x23, 0xff);
+			sd->clockdiv = 1;
+			break;
+		}
+	}
+
+/*	if (ov51x_restart(sd) < 0)
+		return -EIO; */
+
+	/* Reset it just for good measure */
+/*	if (ov51x_reset(sd, OV511_RESET_NOREGS) < 0)
+		return -EIO; */
+	return 0;
+}
+
+static int mode_init_ov_sensor_regs(struct sd *sd,
+				struct ovsensor_window *win)
+{
+	int qvga = win->quarter;
+
+	/******** Mode (VGA/QVGA) and sensor specific regs ********/
+	switch (sd->sensor) {
+	case SEN_OV8610:
+		/* For OV8610 qvga means qsvga */
+		i2c_w_mask(sd, OV7610_REG_COM_C, qvga ? (1 << 5) : 0, 1 << 5);
+		break;
+	case SEN_OV7610:
+		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);
+		break;
+	case SEN_OV7620:
+/*		i2c_w(sd, 0x2b, 0x00); */
+		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);
+		i2c_w_mask(sd, 0x28, qvga ? 0x00 : 0x20, 0x20);
+		i2c_w(sd, 0x24, qvga ? 0x20 : 0x3a);
+		i2c_w(sd, 0x25, qvga ? 0x30 : 0x60);
+		i2c_w_mask(sd, 0x2d, qvga ? 0x40 : 0x00, 0x40);
+		i2c_w_mask(sd, 0x67, qvga ? 0xf0 : 0x90, 0xf0);
+		i2c_w_mask(sd, 0x74, qvga ? 0x20 : 0x00, 0x20);
+		break;
+	case SEN_OV76BE:
+/*		i2c_w(sd, 0x2b, 0x00); */
+		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);
+		break;
+	case SEN_OV7640:
+/*		i2c_w(sd, 0x2b, 0x00); */
+		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);
+		i2c_w_mask(sd, 0x28, qvga ? 0x00 : 0x20, 0x20);
+/*		i2c_w(sd, 0x24, qvga ? 0x20 : 0x3a); */
+/*		i2c_w(sd, 0x25, qvga ? 0x30 : 0x60); */
+/*		i2c_w_mask(sd, 0x2d, qvga ? 0x40 : 0x00, 0x40); */
+/*		i2c_w_mask(sd, 0x67, qvga ? 0xf0 : 0x90, 0xf0); */
+/*		i2c_w_mask(sd, 0x74, qvga ? 0x20 : 0x00, 0x20); */
+		break;
+	case SEN_OV7670:
+		/* set COM7_FMT_VGA or COM7_FMT_QVGA
+		 * do we need to set anything else?
+		 *	HSTART etc are set in set_ov_sensor_window itself */
+		i2c_w_mask(sd, OV7670_REG_COM7,
+			 qvga ? OV7670_COM7_FMT_QVGA : OV7670_COM7_FMT_VGA,
+			 OV7670_COM7_FMT_MASK);
+		break;
+	case SEN_OV6620:
+		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);
+		break;
+	case SEN_OV6630:
+		i2c_w_mask(sd, 0x14, qvga ? 0x20 : 0x00, 0x20);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	/******** Palette-specific regs ********/
+/* Need to do work here for the OV7670 */
+
+		if (sd->sensor == SEN_OV7610 || sd->sensor == SEN_OV76BE) {
+			/* not valid on the OV6620/OV7620/6630? */
+			i2c_w_mask(sd, 0x0e, 0x00, 0x40);
+		}
+
+		/* The OV518 needs special treatment. Although both the OV518
+		 * and the OV6630 support a 16-bit video bus, only the 8 bit Y
+		 * bus is actually used. The UV bus is tied to ground.
+		 * Therefore, the OV6630 needs to be in 8-bit multiplexed
+		 * output mode */
+
+		/* OV7640 is 8-bit only */
+
+		if (sd->sensor != SEN_OV6630 && sd->sensor != SEN_OV7640)
+			i2c_w_mask(sd, 0x13, 0x00, 0x20);
+/*	} */
+
+	/******** Clock programming ********/
+	/* The OV6620 needs special handling. This prevents the
+	 * severe banding that normally occurs */
+	if (sd->sensor == SEN_OV6620) {
+
+		/* Clock down */
+		i2c_w(sd, 0x2a, 0x04);
+		i2c_w(sd, 0x11, win->clockdiv);
+		i2c_w(sd, 0x2a, 0x84);
+		/* This next setting is critical. It seems to improve
+		 * the gain or the contrast. The "reserved" bits seem
+		 * to have some effect in this case. */
+		i2c_w(sd, 0x2d, 0x85);
+	} else if (win->clockdiv >= 0) {
+		i2c_w(sd, 0x11, win->clockdiv);
+	}
+
+	/******** Special Features ********/
+/* no evidence this is possible with OV7670, either */
+	/* Test Pattern */
+	if (sd->sensor != SEN_OV7640 && sd->sensor != SEN_OV7670)
+		i2c_w_mask(sd, 0x12, 0x00, 0x02);
+
+	/* Enable auto white balance */
+	if (sd->sensor == SEN_OV7670)
+		i2c_w_mask(sd, OV7670_REG_COM8, OV7670_COM8_AWB,
+				OV7670_COM8_AWB);
+	else
+		i2c_w_mask(sd, 0x12, 0x04, 0x04);
+
+	/* This will go away as soon as ov51x_mode_init_sensor_regs() */
+	/* is fully tested. */
+	/* 7620/6620/6630? don't have register 0x35, so play it safe */
+	if (sd->sensor == SEN_OV7610 || sd->sensor == SEN_OV76BE) {
+		if (win->width == 640 /*&& win->height == 480*/)
+			i2c_w(sd, 0x35, 0x9e);
+		else
+			i2c_w(sd, 0x35, 0x1e);
+	}
+	return 0;
+}
+
+static int set_ov_sensor_window(struct sd *sd,
+				struct ovsensor_window *win)
+{
+	int hwsbase, hwebase, vwsbase, vwebase, hwscale, vwscale;
+	int ret, hstart, hstop, vstop, vstart;
+	__u8 v;
+
+	/* The different sensor ICs handle setting up of window differently.
+	 * IF YOU SET IT WRONG, YOU WILL GET ALL ZERO ISOC DATA FROM OV51x!! */
+	switch (sd->sensor) {
+	case SEN_OV8610:
+		hwsbase = 0x1e;
+		hwebase = 0x1e;
+		vwsbase = 0x02;
+		vwebase = 0x02;
+		break;
+	case SEN_OV7610:
+	case SEN_OV76BE:
+		hwsbase = 0x38;
+		hwebase = 0x3a;
+		vwsbase = vwebase = 0x05;
+		break;
+	case SEN_OV6620:
+	case SEN_OV6630:
+		hwsbase = 0x38;
+		hwebase = 0x3a;
+		vwsbase = 0x05;
+		vwebase = 0x06;
+		break;
+	case SEN_OV7620:
+		hwsbase = 0x2f;		/* From 7620.SET (spec is wrong) */
+		hwebase = 0x2f;
+		vwsbase = vwebase = 0x05;
+		break;
+	case SEN_OV7640:
+		hwsbase = 0x1a;
+		hwebase = 0x1a;
+		vwsbase = vwebase = 0x03;
+		break;
+	case SEN_OV7670:
+		/*handling of OV7670 hardware sensor start and stop values
+		 * is very odd, compared to the other OV sensors */
+		vwsbase = vwebase = hwebase = hwsbase = 0x00;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (sd->sensor) {
+	case SEN_OV6620:
+	case SEN_OV6630:
+		if (win->quarter) {	/* QCIF */
+			hwscale = 0;
+			vwscale = 0;
+		} else {		/* CIF */
+			hwscale = 1;
+			vwscale = 1;	/* The datasheet says 0;
+					 * it's wrong */
+		}
+		break;
+	case SEN_OV8610:
+		if (win->quarter) {	/* QSVGA */
+			hwscale = 1;
+			vwscale = 1;
+		} else {		/* SVGA */
+			hwscale = 2;
+			vwscale = 2;
+		}
+		break;
+	default:			/* SEN_OV7xx0 */
+		if (win->quarter) {	/* QVGA */
+			hwscale = 1;
+			vwscale = 0;
+		} else {		/* VGA */
+			hwscale = 2;
+			vwscale = 1;
+		}
+	}
+
+	ret = mode_init_ov_sensor_regs(sd, win);
+	if (ret < 0)
+		return ret;
+
+	if (sd->sensor == SEN_OV8610) {
+		i2c_w_mask(sd, 0x2d, 0x05, 0x40);
+				/* old 0x95, new 0x05 from windrv 090403 */
+						/* bits 5-7: reserved */
+		i2c_w_mask(sd, 0x28, 0x20, 0x20);
+					/* bit 5: progressive mode on */
+	}
+
+	/* The below is wrong for OV7670s because their window registers
+	 * only store the high bits in 0x17 to 0x1a */
+
+	/* SRH Use sd->max values instead of requested win values */
+	/* SCS Since we're sticking with only the max hardware widths
+	 * for a given mode */
+	/* I can hard code this for OV7670s */
+	/* Yes, these numbers do look odd, but they're tested and work! */
+	if (sd->sensor == SEN_OV7670) {
+		if (win->quarter) {	/* QVGA from ov7670.c by
+					 * Jonathan Corbet */
+			hstart = 164;
+			hstop = 20;
+			vstart = 14;
+			vstop = 494;
+		} else {		/* VGA */
+			hstart = 158;
+			hstop = 14;
+			vstart = 10;
+			vstop = 490;
+		}
+		/* OV7670 hardware window registers are split across
+		 * multiple locations */
+		i2c_w(sd, OV7670_REG_HSTART, (hstart >> 3) & 0xff);
+		i2c_w(sd, OV7670_REG_HSTOP, (hstop >> 3) & 0xff);
+		v = i2c_r(sd, OV7670_REG_HREF);
+		v = (v & 0xc0) | ((hstop & 0x7) << 3) | (hstart & 0x07);
+		msleep(10);	/* need to sleep between read and write to
+				 * same reg! */
+		i2c_w(sd, OV7670_REG_HREF, v);
+
+		i2c_w(sd, OV7670_REG_VSTART, (vstart >> 2) & 0xff);
+		i2c_w(sd, OV7670_REG_VSTOP, (vstop >> 2) & 0xff);
+		v = i2c_r(sd, OV7670_REG_VREF);
+		v = (v & 0xc0) | ((vstop & 0x3) << 2) | (vstart & 0x03);
+		msleep(10);	/* need to sleep between read and write to
+				 * same reg! */
+		i2c_w(sd, OV7670_REG_VREF, v);
+
+	} else {
+		i2c_w(sd, 0x17, hwsbase + (win->x >> hwscale));
+		i2c_w(sd, 0x18, hwebase + ((win->x + win->width) >> hwscale));
+		i2c_w(sd, 0x19, vwsbase + (win->y >> vwscale));
+		i2c_w(sd, 0x1a, vwebase + ((win->y + win->height) >> vwscale));
+	}
+	return 0;
+}
+
+static int ov_sensor_mode_setup(struct sd *sd,
+				int width, int height)
+{
+	struct ovsensor_window win;
+
+/*	win.format = mode; */
+
+	/* Unless subcapture is enabled,
+	 * center the image window and downsample
+	 * if possible to increase the field of view */
+	/* NOTE: OV518(+) and OV519 does downsampling on its own */
+	win.width = width;
+	win.height = height;
+	if (width == sd->maxwidth)
+		win.quarter = 0;
+	else
+		win.quarter = 1;
+
+	/* Center it */
+	win.x = (win.width - width) / 2;
+	win.y = (win.height - height) / 2;
+
+	/* Clock is determined by OV519 frame rate code */
+	win.clockdiv = sd->clockdiv;
+
+	PDEBUG(D_CONF, "Setting clock divider to %d", win.clockdiv);
+	return set_ov_sensor_window(sd, &win);
+}
+
+/* -- start the camera -- */
+static void sd_start(struct gspca_dev *gspca_dev)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+	int ret;
+
+
+	ret = ov519_mode_init_regs(sd, gspca_dev->width, gspca_dev->height);
+	if (ret < 0)
+		goto out;
+	ret = ov_sensor_mode_setup(sd, gspca_dev->width, gspca_dev->height);
+	if (ret < 0)
+		goto out;
+
+	ret = ov51x_restart((struct sd *) gspca_dev);
+	if (ret < 0)
+		goto out;
+	PDEBUG(D_STREAM, "camera started alt: 0x%02x", gspca_dev->alt);
+	ov51x_led_control(sd, 1);
+	return;
+out:
+	PDEBUG(D_ERR, "camera start error:%d", ret);
+}
+
+static void sd_stopN(struct gspca_dev *gspca_dev)
+{
+	ov51x_stop((struct sd *) gspca_dev);
+	ov51x_led_control((struct sd *) gspca_dev, 0);
+}
+
+static void sd_stop0(struct gspca_dev *gspca_dev)
+{
+}
+
+static void sd_close(struct gspca_dev *gspca_dev)
+{
+}
+
+static void sd_pkt_scan(struct gspca_dev *gspca_dev,
+			struct gspca_frame *frame,	/* target */
+			__u8 *data,			/* isoc packet */
+			int len)			/* iso packet length */
+{
+	/* Header of ov519 is 16 bytes:
+	 *     Byte     Value      Description
+	 *	0	0xff	magic
+	 *	1	0xff	magic
+	 *	2	0xff	magic
+	 *	3	0xXX	0x50 = SOF, 0x51 = EOF
+	 *	9	0xXX	0x01 initial frame without data,
+	 *			0x00 standard frame with image
+	 *	14	Lo	in EOF: length of image data / 8
+	 *	15	Hi
+	 */
+
+	if (data[0] == 0xff && data[1] == 0xff && data[2] == 0xff) {
+		switch (data[3]) {
+		case 0x50:		/* start of frame */
+#define HDRSZ 16
+			data += HDRSZ;
+			len -= HDRSZ;
+#undef HDRSZ
+			if (data[0] == 0xff || data[1] == 0xd8)
+				gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+						data, len);
+			else
+				gspca_dev->last_packet_type = DISCARD_PACKET;
+			return;
+		case 0x51:		/* end of frame */
+			if (data[9] != 0)
+				gspca_dev->last_packet_type = DISCARD_PACKET;
+			gspca_frame_add(gspca_dev, LAST_PACKET, frame,
+					data, 0);
+			return;
+		}
+	}
+
+	/* intermediate packet */
+	gspca_frame_add(gspca_dev, INTER_PACKET, frame,
+			data, len);
+}
+
+/* -- management routines -- */
+
+static void setbrightness(struct gspca_dev *gspca_dev)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+	int val;
+/*	int was_streaming; */
+
+	val = sd->brightness;
+	PDEBUG(D_CONF, "brightness:%d", val);
+/*	was_streaming = gspca_dev->streaming;
+ *	if (was_streaming)
+ *		ov51x_stop(sd); */
+	switch (sd->sensor) {
+	case SEN_OV8610:
+	case SEN_OV7610:
+	case SEN_OV76BE:
+	case SEN_OV6620:
+	case SEN_OV6630:
+	case SEN_OV7640:
+		i2c_w(sd, OV7610_REG_BRT, val);
+		break;
+	case SEN_OV7620:
+		/* 7620 doesn't like manual changes when in auto mode */
+/*fixme
+ *		if (!sd->auto_brt) */
+			i2c_w(sd, OV7610_REG_BRT, val);
+		break;
+	case SEN_OV7670:
+/*jfm - from windblows
+ *		i2c_w_mask(sd, OV7670_REG_COM8, 0, OV7670_COM8_AEC); */
+		i2c_w(sd, OV7670_REG_BRIGHT, ov7670_abs_to_sm(val));
+		break;
+	}
+/*	if (was_streaming)
+ *		ov51x_restart(sd); */
+}
+
+static void setcontrast(struct gspca_dev *gspca_dev)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+	int val;
+/*	int was_streaming; */
+
+	val = sd->contrast;
+	PDEBUG(D_CONF, "contrast:%d", val);
+/*	was_streaming = gspca_dev->streaming;
+	if (was_streaming)
+		ov51x_stop(sd); */
+	switch (sd->sensor) {
+	case SEN_OV7610:
+	case SEN_OV6620:
+		i2c_w(sd, OV7610_REG_CNT, val);
+		break;
+	case SEN_OV6630:
+		i2c_w_mask(sd, OV7610_REG_CNT, val >> 4, 0x0f);
+	case SEN_OV8610: {
+		static const __u8 ctab[] = {
+			0x03, 0x09, 0x0b, 0x0f, 0x53, 0x6f, 0x35, 0x7f
+		};
+
+		/* Use Y gamma control instead. Bit 0 enables it. */
+		i2c_w(sd, 0x64, ctab[val >> 5]);
+		break;
+	    }
+	case SEN_OV7620: {
+		static const __u8 ctab[] = {
+			0x01, 0x05, 0x09, 0x11, 0x15, 0x35, 0x37, 0x57,
+			0x5b, 0xa5, 0xa7, 0xc7, 0xc9, 0xcf, 0xef, 0xff
+		};
+
+		/* Use Y gamma control instead. Bit 0 enables it. */
+		i2c_w(sd, 0x64, ctab[val >> 4]);
+		break;
+	    }
+	case SEN_OV7640:
+		/* Use gain control instead. */
+		i2c_w(sd, OV7610_REG_GAIN, val >> 2);
+		break;
+	case SEN_OV7670:
+		/* check that this isn't just the same as ov7610 */
+		i2c_w(sd, OV7670_REG_CONTRAS, val >> 1);
+		break;
+	}
+/*	if (was_streaming)
+		ov51x_restart(sd); */
+}
+
+static void setcolors(struct gspca_dev *gspca_dev)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+	int val;
+/*	int was_streaming; */
+
+	val = sd->colors;
+	PDEBUG(D_CONF, "saturation:%d", val);
+/*	was_streaming = gspca_dev->streaming;
+	if (was_streaming)
+		ov51x_stop(sd); */
+	switch (sd->sensor) {
+	case SEN_OV8610:
+	case SEN_OV7610:
+	case SEN_OV76BE:
+	case SEN_OV6620:
+	case SEN_OV6630:
+		i2c_w(sd, OV7610_REG_SAT, val);
+		break;
+	case SEN_OV7620:
+		/* Use UV gamma control instead. Bits 0 & 7 are reserved. */
+/*		rc = ov_i2c_write(sd->dev, 0x62, (val >> 9) & 0x7e);
+		if (rc < 0)
+			goto out; */
+		i2c_w(sd, OV7610_REG_SAT, val);
+		break;
+	case SEN_OV7640:
+		i2c_w(sd, OV7610_REG_SAT, val & 0xf0);
+		break;
+	case SEN_OV7670:
+		/* supported later once I work out how to do it
+		 * transparently fail now! */
+		/* set REG_COM13 values for UV sat auto mode */
+		break;
+	}
+/*	if (was_streaming)
+		ov51x_restart(sd); */
+}
+
+static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
+	sd->brightness = val;
+	setbrightness(gspca_dev);
+	return 0;
+}
+
+static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
+	*val = sd->brightness;
+	return 0;
+}
+
+static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
+	sd->contrast = val;
+	setcontrast(gspca_dev);
+	return 0;
+}
+
+static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
+	*val = sd->contrast;
+	return 0;
+}
+
+static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
+	sd->colors = val;
+	setcolors(gspca_dev);
+	return 0;
+}
+
+static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
+	*val = sd->colors;
+	return 0;
+}
+
+/* sub-driver description */
+static const struct sd_desc sd_desc = {
+	.name = MODULE_NAME,
+	.ctrls = sd_ctrls,
+	.nctrls = ARRAY_SIZE(sd_ctrls),
+	.config = sd_config,
+	.open = sd_open,
+	.start = sd_start,
+	.stopN = sd_stopN,
+	.stop0 = sd_stop0,
+	.close = sd_close,
+	.pkt_scan = sd_pkt_scan,
+};
+
+/* -- module initialisation -- */
+#define DVNM(name) .driver_info = (kernel_ulong_t) name
+static const __devinitdata struct usb_device_id device_table[] = {
+	{USB_DEVICE(0x041e, 0x4052), DVNM("Creative Live! VISTA IM")},
+	{USB_DEVICE(0x041e, 0x405f), DVNM("Creative Live! VISTA VF0330")},
+	{USB_DEVICE(0x041e, 0x4060), DVNM("Creative Live! VISTA VF0350")},
+	{USB_DEVICE(0x041e, 0x4061), DVNM("Creative Live! VISTA VF0400")},
+	{USB_DEVICE(0x041e, 0x4064), DVNM("Creative Live! VISTA VF0420")},
+	{USB_DEVICE(0x041e, 0x4068), DVNM("Creative Live! VISTA VF0470")},
+	{USB_DEVICE(0x045e, 0x028c), DVNM("Microsoft xbox cam")},
+	{USB_DEVICE(0x054c, 0x0154), DVNM("Sonny toy4")},
+	{USB_DEVICE(0x054c, 0x0155), DVNM("Sonny toy5")},
+	{USB_DEVICE(0x05a9, 0x0519), DVNM("OmniVision")},
+	{USB_DEVICE(0x05a9, 0x0530), DVNM("OmniVision")},
+	{USB_DEVICE(0x05a9, 0x4519), DVNM("OmniVision")},
+	{USB_DEVICE(0x05a9, 0x8519), DVNM("OmniVision")},
+	{}
+};
+#undef DVNAME
+MODULE_DEVICE_TABLE(usb, device_table);
+
+/* -- device connect -- */
+static int sd_probe(struct usb_interface *intf,
+			const struct usb_device_id *id)
+{
+	return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
+				THIS_MODULE);
+}
+
+static struct usb_driver sd_driver = {
+	.name = MODULE_NAME,
+	.id_table = device_table,
+	.probe = sd_probe,
+	.disconnect = gspca_disconnect,
+};
+
+/* -- module insert / remove -- */
+static int __init sd_mod_init(void)
+{
+	if (usb_register(&sd_driver) < 0)
+		return -1;
+	PDEBUG(D_PROBE, "v%s registered", version);
+	return 0;
+}
+static void __exit sd_mod_exit(void)
+{
+	usb_deregister(&sd_driver);
+	PDEBUG(D_PROBE, "deregistered");
+}
+
+module_init(sd_mod_init);
+module_exit(sd_mod_exit);
+
+module_param(frame_rate, int, 0644);
+MODULE_PARM_DESC(frame_rate, "Frame rate (5, 10, 15, 20 or 30 fps)");
+