Here's a patch that upgrades the ov511 driver to version 1.63. This is primarily a cleanup patch, with some small bug fixes and other stuff thrown in.
Please apply.
Thanks,
Mark
===================================================================
Documentation/usb/ov511.txt | 9 +
drivers/usb/media/ov511.c | 227 +++++++++++++++++++++++---------------------
drivers/usb/media/ov511.h | 4
3 files changed, 136 insertions, 104 deletions
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1055 -> 1.1056
# drivers/usb/media/ov511.h 1.17 -> 1.18
# Documentation/usb/ov511.txt 1.11 -> 1.12
# drivers/usb/media/ov511.c 1.38 -> 1.39
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/11/27 [EMAIL PROTECTED] 1.1056
# USB ov511 driver: Update to version 1.63
# * Begin merging OV518 color support
# * New camera: Ezonics EZCam II
# * #ifdef CONFIG_VIDEO_PROC_FS cleanup
# * Make use of usb_make_path()
# * Un-inline some functions
# * OV6630 register updates/cleanups
# * Trivial comment fixups
# * OV6630AE/AF were being incorrectly reported as OV6630
# --------------------------------------------
#
diff -Nru a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
--- a/Documentation/usb/ov511.txt Wed Nov 27 00:59:08 2002
+++ b/Documentation/usb/ov511.txt Wed Nov 27 00:59:08 2002
@@ -255,6 +255,15 @@
might be necessary if your camera has a custom lens assembly. This has
no effect with video capture devices.
+ NAME: ov518_color
+ TYPE: integer (Boolean)
+ DEFAULT: 0 (off)
+ DESC: Enable OV518 color support. This is off by default since it doesn't
+ work most of the time. If you want to try it, you must also load
+ ov518_decomp with the "nouv=0" parameter. If you get improper colors or
+ diagonal lines through the image, restart your video app and try again.
+ Repeat as necessary.
+
WORKING FEATURES:
o Color streaming/capture at most widths and heights that are multiples of 8.
o Monochrome (use force_palette=1 to enable)
diff -Nru a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
--- a/drivers/usb/media/ov511.c Wed Nov 27 00:59:08 2002
+++ b/drivers/usb/media/ov511.c Wed Nov 27 00:59:08 2002
@@ -60,7 +60,7 @@
/*
* Version Information
*/
-#define DRIVER_VERSION "v1.62 for Linux 2.5"
+#define DRIVER_VERSION "v1.63 for Linux 2.5"
#define EMAIL "[EMAIL PROTECTED]"
#define DRIVER_AUTHOR "Mark McClelland <[EMAIL PROTECTED]> & Bret Wallach \
& Orion Sky Lawlor <[EMAIL PROTECTED]> & Kevin Moore & Charl P. Botha \
@@ -121,6 +121,7 @@
static int unit_video[OV511_MAX_UNIT_VIDEO];
static int remove_zeros;
static int mirror;
+static int ov518_color;
MODULE_PARM(autobright, "i");
MODULE_PARM_DESC(autobright, "Sensor automatically changes brightness");
@@ -193,6 +194,8 @@
"Remove zero-padding from uncompressed incoming data");
MODULE_PARM(mirror, "i");
MODULE_PARM_DESC(mirror, "Reverse image horizontally");
+MODULE_PARM(ov518_color, "i");
+MODULE_PARM_DESC(ov518_color, "Enable OV518 color (experimental)");
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
@@ -259,6 +262,7 @@
{ 100, "Lifeview RoboCam" },
{ 102, "AverMedia InterCam Elite" },
{ 112, "MediaForte MV300" }, /* or OV7110 evaluation kit */
+ { 134, "Ezonics EZCam II" },
{ 192, "Webeye 2000B" },
{ 253, "Alpha Vision Tech. AlphaCam SE" },
{ -1, NULL }
@@ -293,6 +297,7 @@
{ -1, NULL }
};
+#if defined(CONFIG_VIDEO_PROC_FS)
static struct symbolic_list senlist[] = {
{ SEN_OV76BE, "OV76BE" },
{ SEN_OV7610, "OV7610" },
@@ -308,6 +313,7 @@
{ SEN_SAA7111A, "SAA7111A" },
{ -1, NULL }
};
+#endif
/* URB error codes: */
static struct symbolic_list urb_errlist[] = {
@@ -321,20 +327,6 @@
};
/**********************************************************************
- * Prototypes
- **********************************************************************/
-
-static void ov51x_clear_snapshot(struct usb_ov511 *);
-static inline int sensor_get_picture(struct usb_ov511 *,
- struct video_picture *);
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
-static int sensor_get_exposure(struct usb_ov511 *, unsigned char *);
-static int ov51x_control_ioctl(struct inode *, struct file *, unsigned int,
- unsigned long);
-static int ov51x_check_snapshot(struct usb_ov511 *);
-#endif
-
-/**********************************************************************
* Memory management
**********************************************************************/
@@ -396,11 +388,19 @@
* Based on the CPiA driver version 0.7.4 -claudio
**********************************************************************/
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
+#if defined(CONFIG_VIDEO_PROC_FS)
static struct proc_dir_entry *ov511_proc_entry = NULL;
extern struct proc_dir_entry *video_proc_entry;
+/* Prototypes */
+static void ov51x_clear_snapshot(struct usb_ov511 *);
+static int sensor_get_picture(struct usb_ov511 *, struct video_picture *);
+static int sensor_get_exposure(struct usb_ov511 *, unsigned char *);
+static int ov51x_check_snapshot(struct usb_ov511 *);
+static int ov51x_control_ioctl(struct inode *, struct file *, unsigned int,
+ unsigned long);
+
static struct file_operations ov511_control_fops = {
.ioctl = ov51x_control_ioctl,
};
@@ -460,6 +460,8 @@
symbolic(senlist, ov->sensor));
out += sprintf(out, "packet_size : %d\n", ov->packet_size);
out += sprintf(out, "framebuffer : 0x%p\n", ov->fbuf);
+ out += sprintf(out, "packet_numbering: %d\n", ov->packet_numbering);
+ out += sprintf(out, "topology : %s\n", ov->usb_path);
len = out - page;
len -= off;
@@ -637,7 +639,12 @@
remove_proc_entry("ov511", video_proc_entry);
}
-#endif /* CONFIG_PROC_FS && CONFIG_VIDEO_PROC_FS */
+#else
+static inline void create_proc_ov511_cam(struct usb_ov511 *ov) { }
+static inline void destroy_proc_ov511_cam(struct usb_ov511 *ov) { }
+static inline void proc_ov511_create(void) { }
+static inline void proc_ov511_destroy(void) { }
+#endif /* #ifdef CONFIG_VIDEO_PROC_FS */
/**********************************************************************
*
@@ -1116,7 +1123,7 @@
* when calling this. This should not be called from outside the i2c I/O
* functions.
*/
-static inline int
+static int
i2c_set_slave_internal(struct usb_ov511 *ov, unsigned char slave)
{
int rc;
@@ -1357,7 +1364,7 @@
}
}
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
+#if defined(CONFIG_VIDEO_PROC_FS)
/* Checks the status of the snapshot button. Returns 1 if it was pressed since
* it was last cleared, and zero in all other cases (including errors) */
static int
@@ -1970,7 +1977,7 @@
/* -------------------------------------------------------------------------- */
-static inline int
+static int
sensor_set_picture(struct usb_ov511 *ov, struct video_picture *p)
{
int rc;
@@ -2001,7 +2008,7 @@
return 0;
}
-static inline int
+static int
sensor_get_picture(struct usb_ov511 *ov, struct video_picture *p)
{
int rc;
@@ -2032,7 +2039,7 @@
return 0;
}
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
+#if defined(CONFIG_VIDEO_PROC_FS)
// FIXME: Exposure range is only 0x00-0x7f in interlace mode
/* Sets current exposure for sensor. This only has an effect if auto-exposure
* is off */
@@ -2117,7 +2124,7 @@
#endif /* CONFIG_PROC_FS && CONFIG_VIDEO_PROC_FS */
/* Turns on or off the LED. Only has an effect with OV511+/OV518(+) */
-static inline void
+static void
ov51x_led_control(struct usb_ov511 *ov, int enable)
{
PDEBUG(4, " (%s)", enable ? "turn on" : "turn off");
@@ -2198,7 +2205,7 @@
* Unsupported: KS0127, KS0127B, SAA7111A
* Returns: 0 for success
*/
-static inline int
+static int
sensor_set_banding_filter(struct usb_ov511 *ov, int enable)
{
int rc;
@@ -2226,7 +2233,7 @@
* Unsupported: KS0127, KS0127B, SAA7111A
* Returns: 0 for success
*/
-static inline int
+static int
sensor_set_auto_brightness(struct usb_ov511 *ov, int enable)
{
int rc;
@@ -2254,7 +2261,7 @@
* Unsupported: KS0127, KS0127B, SAA7111A
* Returns: 0 for success
*/
-static inline int
+static int
sensor_set_auto_exposure(struct usb_ov511 *ov, int enable)
{
PDEBUG(4, " (%s)", enable ? "turn on" : "turn off");
@@ -2333,7 +2340,7 @@
return 0;
}
-static inline int
+static int
sensor_set_mirror(struct usb_ov511 *ov, int enable)
{
PDEBUG(4, " (%s)", enable ? "turn on" : "turn off");
@@ -2434,7 +2441,7 @@
i2c_w(ov, 0x14, qvga?0x24:0x04);
break;
case SEN_OV6630:
- i2c_w(ov, 0x14, qvga?0xa4:0x84);
+ i2c_w(ov, 0x14, qvga?0xa0:0x80);
break;
default:
err("Invalid sensor");
@@ -2448,13 +2455,33 @@
/* these aren't valid on the OV6620/OV7620/6630? */
i2c_w_mask(ov, 0x0e, 0x40, 0x40);
}
- i2c_w_mask(ov, 0x13, 0x20, 0x20);
+
+ if (ov->sensor == SEN_OV6630 && ov->bridge == BRG_OV518
+ && ov518_color) {
+ i2c_w_mask(ov, 0x12, 0x00, 0x10);
+ i2c_w_mask(ov, 0x13, 0x00, 0x20);
+ } else {
+ i2c_w_mask(ov, 0x13, 0x20, 0x20);
+ }
} else {
if (ov->sensor == SEN_OV7610 || ov->sensor == SEN_OV76BE) {
/* not valid on the OV6620/OV7620/6630? */
i2c_w_mask(ov, 0x0e, 0x00, 0x40);
}
- i2c_w_mask(ov, 0x13, 0x00, 0x20);
+
+ /* 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 */
+
+ if (ov->sensor == SEN_OV6630 && ov->bridge == BRG_OV518
+ && ov518_color) {
+ i2c_w_mask(ov, 0x12, 0x10, 0x10);
+ i2c_w_mask(ov, 0x13, 0x20, 0x20);
+ } else {
+ i2c_w_mask(ov, 0x13, 0x00, 0x20);
+ }
}
/******** Clock programming ********/
@@ -2781,8 +2808,29 @@
reg_w(ov, 0x3d, 0);
reg_w(ov, 0x3e, 0);
- reg_w(ov, 0x28, (mode == VIDEO_PALETTE_GREY) ? 0x00:0x80);
- reg_w(ov, 0x38, (mode == VIDEO_PALETTE_GREY) ? 0x00:0x80);
+ if (ov->bridge == BRG_OV518 && ov518_color) {
+ /* OV518 needs U and V swapped */
+ i2c_w_mask(ov, 0x15, 0x00, 0x01);
+
+ if (mode == VIDEO_PALETTE_GREY) {
+ /* Set 16-bit input format (UV data are ignored) */
+ reg_w_mask(ov, 0x20, 0x00, 0x08);
+
+ /* Set 8-bit (4:0:0) output format */
+ reg_w_mask(ov, 0x28, 0x00, 0xf0);
+ reg_w_mask(ov, 0x38, 0x00, 0xf0);
+ } else {
+ /* Set 8-bit (YVYU) input format */
+ reg_w_mask(ov, 0x20, 0x08, 0x08);
+
+ /* Set 12-bit (4:2:0) output format */
+ reg_w_mask(ov, 0x28, 0x80, 0xf0);
+ reg_w_mask(ov, 0x38, 0x80, 0xf0);
+ }
+ } else {
+ reg_w(ov, 0x28, (mode == VIDEO_PALETTE_GREY) ? 0x00:0x80);
+ reg_w(ov, 0x38, (mode == VIDEO_PALETTE_GREY) ? 0x00:0x80);
+ }
hsegs = width / 16;
vsegs = height / 4;
@@ -3074,7 +3122,7 @@
}
/*
- * For RAW BW (YUV400) images, data shows up in 256 byte segments.
+ * For RAW BW (YUV 4:0:0) images, data show up in 256 byte segments.
* The segments represent 4 squares of 8x8 pixels as follows:
*
* 0 1 ... 7 64 65 ... 71 ... 192 193 ... 199
@@ -3105,7 +3153,7 @@
}
/*
- * For YUV4:2:0 images, the data shows up in 384 byte segments.
+ * For YUV 4:2:0 images, the data show up in 384 byte segments.
* The first 64 bytes of each segment are U, the next 64 are V. The U and
* V are arranged as follows:
*
@@ -3124,8 +3172,8 @@
* ... ... ...
* 56 57 ... 63 120 121 ... 127 ... 248 249 ... 255
*
- * Note that the U and V data in one segment represents a 16 x 16 pixel
- * area, but the Y data represents a 32 x 8 pixel area. If the width is not an
+ * Note that the U and V data in one segment represent a 16 x 16 pixel
+ * area, but the Y data represent a 32 x 8 pixel area. If the width is not an
* even multiple of 32, the extra 8x8 blocks within a 32x8 block belong to the
* next horizontal stripe.
*
@@ -3133,7 +3181,7 @@
* verbatim, in order, into the frame. When used with vidcat -f ppm -s 640x480
* this puts the data on the standard output and can be analyzed with the
* parseppm.c utility I wrote. That's a much faster way for figuring out how
- * this data is scrambled.
+ * these data are scrambled.
*/
/* Converts from raw, uncompressed segments at pIn0 to a YUV420P frame at pOut0.
@@ -4285,7 +4333,6 @@
}
file->private_data = NULL;
-
return 0;
}
@@ -4752,7 +4799,7 @@
return rc;
}
-static inline int
+static int
ov51x_v4l1_read(struct file *file, char *buf, size_t cnt, loff_t *ppos)
{
struct video_device *vdev = file->private_data;
@@ -4882,7 +4929,7 @@
PDEBUG(4, "{copy} count used=%ld, new bytes_read=%ld",
count, frame->bytes_read);
- /* If all data has been read... */
+ /* If all data have been read... */
if (frame->bytes_read
>= get_frame_length(frame)) {
frame->bytes_read = 0;
@@ -4966,7 +5013,7 @@
.fops = &ov511_fops,
};
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
+#if defined(CONFIG_VIDEO_PROC_FS)
static int
ov51x_control_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long ularg)
@@ -5453,14 +5500,12 @@
{ OV511_I2C_BUS, 0x4f, 0x04 },
// Do 50-53 have any effect?
// Toggle 0x12[2] off and on here?
- { OV511_DONE_BUS, 0x0, 0x00 },
+ { OV511_DONE_BUS, 0x0, 0x00 }, /* END MARKER */
};
- /* This chip is undocumented so many of these are guesses. OK=verified,
- * A=Added since 6620, U=unknown function (not a 6620 reg) */
static struct ov511_regvals aRegvalsNorm6x30[] = {
/*OK*/ { OV511_I2C_BUS, 0x12, 0x80 }, /* reset */
- /*00?*/ { OV511_I2C_BUS, 0x11, 0x01 },
+ { OV511_I2C_BUS, 0x11, 0x00 },
/*OK*/ { OV511_I2C_BUS, 0x03, 0x60 },
/*0A?*/ { OV511_I2C_BUS, 0x05, 0x7f }, /* For when autoadjust is off */
{ OV511_I2C_BUS, 0x07, 0xa8 },
@@ -5468,16 +5513,8 @@
/*OK*/ { OV511_I2C_BUS, 0x0c, 0x24 },
/*OK*/ { OV511_I2C_BUS, 0x0d, 0x24 },
/*A*/ { OV511_I2C_BUS, 0x0e, 0x20 },
-
-// /*24?*/ { OV511_I2C_BUS, 0x12, 0x28 }, /* Enable AGC */
-// { OV511_I2C_BUS, 0x12, 0x24 }, /* Enable AGC */
-
-// /*A*/ { OV511_I2C_BUS, 0x13, 0x21 },
-// /*A*/ { OV511_I2C_BUS, 0x13, 0x25 }, /* Tristate Y and UV busses */
-
// /*04?*/ { OV511_I2C_BUS, 0x14, 0x80 },
- /* 0x16: 0x06 helps frame stability with moving objects */
- /*03?*/ { OV511_I2C_BUS, 0x16, 0x06 },
+ { OV511_I2C_BUS, 0x16, 0x03 },
// /*OK*/ { OV511_I2C_BUS, 0x20, 0x30 }, /* Aperture correction enable */
// 21 & 22? The suggested values look wrong. Go with default
/*A*/ { OV511_I2C_BUS, 0x23, 0xc0 },
@@ -5490,49 +5527,34 @@
/*OK*/ { OV511_I2C_BUS, 0x2a, 0x04 }, /* Disable framerate adjust */
// /*OK*/ { OV511_I2C_BUS, 0x2b, 0xac }, /* Framerate; Set 2a[7] first */
-// /*U*/ { OV511_I2C_BUS, 0x2c, 0xa0 },
{ OV511_I2C_BUS, 0x2d, 0x99 },
// /*A*/ { OV511_I2C_BUS, 0x33, 0x26 }, // Reserved bits on 6620
// /*d2?*/ { OV511_I2C_BUS, 0x34, 0x03 }, /* Max A/D range */
-// /*U*/ { OV511_I2C_BUS, 0x36, 0x8f }, // May not be necessary
-// /*U*/ { OV511_I2C_BUS, 0x37, 0x80 }, // May not be necessary
// /*8b?*/ { OV511_I2C_BUS, 0x38, 0x83 },
// /*40?*/ { OV511_I2C_BUS, 0x39, 0xc0 }, // 6630 adds bit 7
// { OV511_I2C_BUS, 0x3c, 0x39 }, /* Enable AEC mode changing */
// { OV511_I2C_BUS, 0x3c, 0x3c }, /* Change AEC mode */
// { OV511_I2C_BUS, 0x3c, 0x24 }, /* Disable AEC mode changing */
- /*OK*/ { OV511_I2C_BUS, 0x3d, 0x80 },
+ { OV511_I2C_BUS, 0x3d, 0x80 },
// /*A*/ { OV511_I2C_BUS, 0x3f, 0x0e },
-// /*U*/ { OV511_I2C_BUS, 0x40, 0x00 },
-// /*U*/ { OV511_I2C_BUS, 0x41, 0x00 },
-// /*U*/ { OV511_I2C_BUS, 0x42, 0x80 },
-// /*U*/ { OV511_I2C_BUS, 0x43, 0x3f },
-// /*U*/ { OV511_I2C_BUS, 0x44, 0x80 },
-// /*U*/ { OV511_I2C_BUS, 0x45, 0x20 },
-// /*U*/ { OV511_I2C_BUS, 0x46, 0x20 },
-// /*U*/ { OV511_I2C_BUS, 0x47, 0x80 },
-// /*U*/ { OV511_I2C_BUS, 0x48, 0x7f },
-// /*U*/ { OV511_I2C_BUS, 0x49, 0x00 },
/* These next two registers (0x4a, 0x4b) are undocumented. They
* control the color balance */
// /*OK?*/ { OV511_I2C_BUS, 0x4a, 0x80 }, // Check these
// /*OK?*/ { OV511_I2C_BUS, 0x4b, 0x80 },
-// /*U*/ { OV511_I2C_BUS, 0x4c, 0xd0 },
- /*d2?*/ { OV511_I2C_BUS, 0x4d, 0x10 }, /* This reduces noise a bit */
+ { OV511_I2C_BUS, 0x4d, 0x10 }, /* U = 0.563u, V = 0.714v */
/*c1?*/ { OV511_I2C_BUS, 0x4e, 0x40 },
- /*04?*/ { OV511_I2C_BUS, 0x4f, 0x07 },
-// /*U*/ { OV511_I2C_BUS, 0x50, 0xff },
- /*U*/ { OV511_I2C_BUS, 0x54, 0x23 },
-// /*U*/ { OV511_I2C_BUS, 0x55, 0xff },
-// /*U*/ { OV511_I2C_BUS, 0x56, 0x12 },
- /*U*/ { OV511_I2C_BUS, 0x57, 0x81 },
-// /*U*/ { OV511_I2C_BUS, 0x58, 0x75 },
- /*U*/ { OV511_I2C_BUS, 0x59, 0x01 },
- /*U*/ { OV511_I2C_BUS, 0x5a, 0x2c },
- /*U*/ { OV511_I2C_BUS, 0x5b, 0x0f },
-// /*U*/ { OV511_I2C_BUS, 0x5c, 0x10 },
- { OV511_DONE_BUS, 0x0, 0x00 },
+
+ /* UV average mode, color killer: strongest */
+ { OV511_I2C_BUS, 0x4f, 0x07 },
+
+ { OV511_I2C_BUS, 0x54, 0x23 }, /* Max AGC gain: 18dB */
+ { OV511_I2C_BUS, 0x57, 0x81 }, /* (default) */
+ { OV511_I2C_BUS, 0x59, 0x01 }, /* AGC dark current comp: +1 */
+ { OV511_I2C_BUS, 0x5a, 0x2c }, /* (undocumented) */
+ { OV511_I2C_BUS, 0x5b, 0x0f }, /* AWB chrominance levels */
+// { OV511_I2C_BUS, 0x5c, 0x10 },
+ { OV511_DONE_BUS, 0x0, 0x00 }, /* END MARKER */
};
PDEBUG(4, "starting sensor configuration");
@@ -5553,16 +5575,19 @@
return -1;
}
- if ((rc & 3) == 0)
+ if ((rc & 3) == 0) {
ov->sensor = SEN_OV6630;
- else if ((rc & 3) == 1)
+ info("Sensor is an OV6630");
+ } else if ((rc & 3) == 1) {
ov->sensor = SEN_OV6620;
- else if ((rc & 3) == 2)
+ info("Sensor is an OV6620");
+ } else if ((rc & 3) == 2) {
ov->sensor = SEN_OV6630;
- else if ((rc & 3) == 3)
+ info("Sensor is an OV6630AE");
+ } else if ((rc & 3) == 3) {
ov->sensor = SEN_OV6630;
-
- info("Sensor is an %s", symbolic(senlist, ov->sensor));
+ info("Sensor is an OV6630AF");
+ }
/* Set sensor-specific vars */
ov->maxwidth = 352;
@@ -5922,7 +5947,7 @@
{ OV511_REG_BUS, 0x5d, 0x03 },
{ OV511_REG_BUS, 0x24, 0x9f },
{ OV511_REG_BUS, 0x25, 0x90 },
- { OV511_REG_BUS, 0x20, 0x00 }, /* Was 0x08 */
+ { OV511_REG_BUS, 0x20, 0x00 },
{ OV511_REG_BUS, 0x51, 0x04 },
{ OV511_REG_BUS, 0x71, 0x19 },
{ OV511_DONE_BUS, 0x0, 0x00 },
@@ -5935,7 +5960,7 @@
{ OV511_REG_BUS, 0x5d, 0x03 },
{ OV511_REG_BUS, 0x24, 0x9f },
{ OV511_REG_BUS, 0x25, 0x90 },
- { OV511_REG_BUS, 0x20, 0x60 }, /* Was 0x08 */
+ { OV511_REG_BUS, 0x20, 0x60 },
{ OV511_REG_BUS, 0x51, 0x02 },
{ OV511_REG_BUS, 0x71, 0x19 },
{ OV511_REG_BUS, 0x40, 0xff },
@@ -6151,6 +6176,11 @@
ov->buf_state = BUF_NOT_ALLOCATED;
+ if (usb_make_path(dev, ov->usb_path, OV511_USB_PATH_LEN) < 0) {
+ err("usb_make_path error");
+ goto error_dealloc;
+ }
+
/* Allocate control transfer buffer. */
/* Must be kmalloc()'ed, for DMA compatibility */
ov->cbuf = kmalloc(OV511_CBUF_SIZE, GFP_KERNEL);
@@ -6212,20 +6242,16 @@
goto error;
}
- info("Device registered on minor %d", ov->vdev.minor);
+ info("Device at %s registered to minor %d", ov->usb_path,
+ ov->vdev.minor);
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
create_proc_ov511_cam(ov);
-#endif
dev_set_drvdata (&intf->dev, ov);
- return 0;
+ return 0;
error:
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
- /* Safe to call even if entry doesn't exist */
destroy_proc_ov511_cam(ov);
-#endif
if (ov->cbuf) {
down(&ov->cbuf_lock);
@@ -6274,12 +6300,9 @@
wake_up_interruptible(&ov->wq);
ov->streaming = 0;
-
ov51x_unlink_isoc(ov);
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
destroy_proc_ov511_cam(ov);
-#endif
ov->dev = NULL;
@@ -6396,9 +6419,7 @@
static int __init
usb_ov511_init(void)
{
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
proc_ov511_create();
-#endif
if (usb_register(&ov511_driver) < 0)
return -1;
@@ -6414,9 +6435,7 @@
usb_deregister(&ov511_driver);
info("driver deregistered");
-#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
proc_ov511_destroy();
-#endif
}
module_init(usb_ov511_init);
diff -Nru a/drivers/usb/media/ov511.h b/drivers/usb/media/ov511.h
--- a/drivers/usb/media/ov511.h Wed Nov 27 00:59:08 2002
+++ b/drivers/usb/media/ov511.h Wed Nov 27 00:59:08 2002
@@ -253,6 +253,9 @@
/* Control transfers use up to 4 bytes */
#define OV511_CBUF_SIZE 4
+/* Size of usb_make_path() buffer */
+#define OV511_USB_PATH_LEN 64
+
/* Bridge types */
enum {
BRG_UNKNOWN,
@@ -450,6 +453,7 @@
int customid;
char *desc;
unsigned char iface;
+ char usb_path[OV511_USB_PATH_LEN];
/* Determined by sensor type */
int maxwidth;
===================================================================
This BitKeeper patch contains the following changesets:
1.1056
## Wrapped with gzip_uu ##
begin 664 bkpatch2123
M'XL(`%R)Y#T``^U:;7/;1@[^+/X*C#/MR:DMD<L7D>KY6MM24DT3V^.W3NYR
MHZ'(E<2QQ-61E&RWSG^_9W>I5\LO26_ZZ3*N(7,!$,`"#["KOJ&KG&?-RCC,
M;HPW](O(BV9E&(X"TS1K\7T:IWE-9`,LG0N!I?HX+>I#,>:L+D7JQ7A2[]W4
MIWEOG]5<`WQG81$-:<:SO%FQ:O;B27$_X<W*>?O]U8?#<\,X.*#C89@.^`4O
MZ.#`Z-W\'$_YJ':3B7`H7_FP6'Y@IFE9%G--V_4L]X'YMNT\6)[9B_$Q9HV@
MW_,"8Y#QP<]:/!+C=7$&<8_9S+;M!PB[GM$BJV:9KD<FJUM6G37(-)M.T&3.
MONDW39.D>S\_C@3]8-.^:1S1GS?XV(CHZN*(Q,RU+(JS!$%KTM4D#@M.A5`Q
M3$0*0ST;K&_IB`^2E,8\`QG0Z;5K^12)D<@HGTXF(BL4UPF_I2@$5]BD]N\B
M3:*<VO\\#L?4Z2B&-TD_YGTZ/CUYUWG?O>ZTVJ?=L_/3X^Z["XI&/$RG$\7W
M,;SA-,TYB3Y(KSO&W]U)6`RKNVK]*MU/TE&2<LJ1$-2?IE$!>W.U>'KM>;9)
MV),D+WA&4^567B]?H)DNX7,2CN#$>,S3@OK)W7Q)RQ^VZX?OZ)9GG'I<.IVD
MD<@R'A6C>^B6/O.8PKQD-WXEVW4=9IPMD\O8_\I_AF&&IO&/+1NLMRB7V5Y7
MFU8;+K?:,0/+>W`<V[$>&D[@.([KAK8?]3GO/95,:QK'/$["5;TR:1NF[P2,
M/;CX<[M1+1%-9?!"&?L5TXJ[E3QT+!,9:#+?]1^XSYCK-`*7F[U&$-E/&O>"
MYJ5Y%G+;L]@K8Q9MQLP.S(`],-N);1Z:4<^U@[CQU2&+-D/F.8'?4$#SC"/;
MH>=/QW03C%X*)>+@FPXR-Y`[[=L:GM@C<+)>`J?@?PI.6Z&HJ>IS[I%"+[^K
M86@29@`>E#L*4:?$*>UGM^H'A77VW$Y\0YUVF-N@P"`Z.?S8;JY:@F>7G\[P
M+$D+/@#\5(^$D,BSBY56^]WAU8?+)IE4%?V^?G1Q#+1,P]Z(;P/6&ET.DYSP
M`P'JW1,`-)R."LH!2)R2@F+!\_1OA5&Y%=D-C=%')6P60X0O&?,:=?IT+Z9T
M&R)D"&B1W4-J3ST;3\$<CG)!(Q'&1D7[$7,DSH1NDV*HU.RD8CH[,'>605XH
M':"%)N-))B;P5-D-.S.C@N(8B!3X*D$ZAY9,3`=:6S(.!WP/$)H7859(+1G-
MDI@+"B<3"[email protected]&95S/N%A(7$VY1'/\S"[KQF?56T]68[;*^M;X6"S
MH%Y``=/&C^M:[,%!X]?E9`>/RHF]5$X60[>W3.<O*:G_M_>7V[L&]0U4>3(9
MO@%36IY-EM%1O]\@CM+_UGGGNGW>Q7\7G=,3VIG)/:,^-N9#DD[O")/OCM&1
MN6(9N<2V2.+.*A[]B.7`)69\/&U=?6AWSP[//U97UO=H)]G9_7%UN2LQ:8-G
M"T!5^1VJ/E&@.MJ5.CK,LV!(Y0^R;$<*;23)#GW9`Q/,@8=)G[23<75;PNP:
M'5229.1IG/2-ELT<LAS0()!ATN056AS3)M^HOZ6S3!1"G@5R>EN?1VLFDEB%
MZZXK$RCKYFDXR8>BJ.9%-HT*E9]Z3'X+#U=BG/,T%UD7"-B=)%$QS?@6D3TJ
MGRF$FS,^HPHQ%?E3NJ9IG@S@*D7#,-M44CHQY-'-ZYTHA41:9&+43032?RZ3
MI"+F*Q[TDQ%?,P+R>T:E4B'];_%\)-(!WO(9H?<8$J\BI@7]<$#Y)(-(OXH_
MD1N3,+J!O^ETW$,2I8,F?1=_3G?V8-+^/S87H6Z[ED),D(N#^](&@I9\H45Z
M+5$%TBW/,55Q@7A(J5'.EV%02*,2(<K0;`!%F8ATO+K`NRU!%+-=^H.^;%,1
MHZ]EXOY/Z5B55195Y>/7L)=O7^'7Y4/UY]$9!=%"'U&55=)EEF#)]E3X2OIR
MU;6LH*'0K*2KRM"R'+E4TO4EV]5+]NLPHL4LIBPKZ4I58XV9EEK3=.U%C`5Z
MB6WZRN1HIY8475NR;4\M:;JVY-A:2M-*)6%1]Q8@ND?FG04P_,]L$/YDWH5F
MT[SS39F2S'&U>9+ZJ!<(]3$7(G,U(&".H8OV2;?L>-]_K[*ZER7Q@,NUH_/W
M707(ABY"Q;``;6R_K$YE!SIL?C,WALG?IJD^2T.V,ME+)J:9OI"LFJ>4VIIS
ME5]Y6`9%4D>YB$2\',X;2<IYG*.D>22;=2%S7;:3&AV.BJ&:&'NB'$(7CK[5
M,Z)ZI.)2CB@48O#?[R4EUE)OF@,&4K1SR>N37/FD%6!)#M0AP#@<@0&C2%Q3
M9EU=SQ>+!%"&86F`R36-:UH0+!E']\7\NF*`]@*\/4RW*?G*B#%F]&0RXG<\
MUK(`K`D@;*Q0M?X7;[?UFNUF7[G=YN9V-WP'>-\!Q<!A&PO_MOBPU?KZV[6\
MN%([?4WY+4X&V`U$;9LM[M(6TU*-IT+JU2K4>&F)&8<?VI>7[>[[\_:G,EAX
MG[P#+-,F2>7^8'?'.'!4D0F8*T,*T:[1U[#G`%1E006CY[H).G"E";XV8:%=
MIT/5::+R=^=94+[E*7W^4E^_W+-'3/9CIM4]6W_[I^M/5[OK'C[OB[_5%XO-
MG6%?Z8S_&F?6F+X8J_XHB16-SV[N3RHP<Z!=%[:_4AAY;9L-!6,E12V_0[6>
M'_Y&1[\AM,B4<G/5T1:HHQ('\]<M#B<2$9CKX>2.PU?.!Q+?\AJ46J:OE&I:
M*M7*$-R%+HDSF_ILU-EC?3A<,JF/^:#RN";D<6^(G9$ZYL6D=$&'2!?B\KR#
MX[C\)#&4[N2O27+'1U(-"B#<`RIJ-9^T@E4)FT'"UP**6]T.2.;;)`9Z`TQ3
M`<94&JD;:$FA'6PY7U9:'F7A&`<-`&[+8;Z,3,MIN&HH*.EJUW5\7R]I*M,4
MKP:F:XW#<":/=SR%O6%<J]74G.,$GNK])7W%D.$ZKC*[I!4<<"1.6=W6Z4F[
M>W1UH8I%ER...-*,]DF+/AZ>_]H^5^^$9(!=`=6'O)(N-778\5R192TT28&&
M10U%I0((^N:3@IX2M$O!0+Y!TH9ZLZNGKI)N56#'N@JU`M>$LZ;\P"SU:I>Q
MIR2=6/<72,I1\XH.R*RYGCW=0\K)SPW+F>E(N/(<I]3)&<^:#P5(?.Q6AJ17
M+7*O/&3>)*.1_&Y"CK4I"J*$F6TF])7W#6G\Y^TLKJ/@PRZM_!C>T>'[8Y)7
M34VR_/CH2>5N0T7&*B6KY27<[M,"@>Y'I8!\31QF-Q1-LTR6C;QA:](/UM,*
M0F5K-'\CAI#R!G/1B+9)]=1K^_/7_G:$LV(FQDD:RMO"$9\!4:5TO;Y=/EKL
MXS>EN5L6BJ:J"U>SB+XG>U?BK2D;K^3R2RX)5>CI:5]4=R[T%"0'L[0<K784
M`NLNL*G+*G7IDXFBS^ABS^IB<UVLU,6>M^NP_9PV>Z[-T67CN2]H>[=3=AHW
M8`K/2KK<@?/V^_D&H$&C@RX!(K!U,#5]5L13(AW/<FUR]>ZL7[_%?+9^=-XK
ME5U='*%-7O[2_=`^V:6_ZXVL5'B657?65!`>B4SY4QD(S,3J;YQ+`<HB4EY^
MQFF<6<I/11$;'9H6GR5(4C2L[_+%_9Z>PI'`"-IW\<;)'DFJCOWRV0S&UQ2?
M.N\S2_9J20--%7AU2HJ1H)AF*9F*E4DC)/4U:Z,455`K*5-47SG)JP1+T_(5
MCGK%<U?2P]=>2;_R6[W7WDD/U[[BL>T'Q_*]0'_%XW_]G;3S5WW%<QC'BV.=
MO.S<O"3^E?2WDJ^\C1U^VS<\+MGRWO`B^7W;335&HGZ?9Q+WYK>UCVNEXCGJ
J(LQ52:>N[>:Y^Z_'W/_^<?F_,:B+O'PZ/@AYT'?Z;L/X+X,8@_\Q(0``
`
end
