Hello,
Well, I finally manages to get my 2.5. kernel up and running and test the
latest changes to my driver. Fortunately, things worked out of the box
right away, so here it goes...
This patch is against 2.5.6; anybody who, in the mean time, managed to make
this patch incompatible with 2.5.7 or later is going to experience the
unpleasant feeling of 4 [1] USB cords wound very tightly around his or her
neck *grmpf*.
- Nemosoft
[1] This is the amount of Philips webcams I own.
--
Linux Philips webcam driver page: http://www.smcc.demon.nl/webcam/
Includes FAQs, links to working programs and lots of info.
diff -ur linux-2.5.6-dist/drivers/usb/pwc-ctrl.c linux-2.5.6/drivers/usb/pwc-ctrl.c
--- linux-2.5.6-dist/drivers/usb/pwc-ctrl.c Fri Jan 4 03:52:28 2002
+++ linux-2.5.6/drivers/usb/pwc-ctrl.c Sun Mar 10 02:08:09 2002
@@ -1,7 +1,7 @@
/* Driver for Philips webcam
Functions that send various control messages to the webcam, including
video modes.
- (C) 1999-2001 Nemosoft Unv. ([EMAIL PROTECTED])
+ (C) 1999-2002 Nemosoft Unv. ([EMAIL PROTECTED])
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
@@ -78,10 +78,12 @@
#define READ_SHUTTER_FORMATTER 0x0600
#define READ_RED_GAIN_FORMATTER 0x0700
#define READ_BLUE_GAIN_FORMATTER 0x0800
+#define SENSOR_TYPE_FORMATTER1 0x0C00
#define READ_RAW_Y_MEAN_FORMATTER 0x3100
#define SET_POWER_SAVE_MODE_FORMATTER 0x3200
#define MIRROR_IMAGE_FORMATTER 0x3300
#define LED_FORMATTER 0x3400
+#define SENSOR_TYPE_FORMATTER2 0x3700
/* Formatters for the Video Endpoint controls [GS]ET_EP_STREAM_CTL */
#define VIDEO_OUTPUT_CONTROL_FORMATTER 0x0100
@@ -162,6 +164,21 @@
/****************************************************************************/
+#define SendControlMsg(request, value, buflen) \
+ usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0), \
+ request, \
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, \
+ value, \
+ pdev->vcinterface, \
+ &buf, buflen, HZ / 2)
+
+#define RecvControlMsg(request, value, buflen) \
+ usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0), \
+ request, \
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, \
+ value, \
+ pdev->vcinterface, \
+ &buf, buflen, HZ / 2)
#if PWC_DEBUG
@@ -241,7 +258,7 @@
ret = send_video_command(pdev->udev, pdev->vendpoint, buf, 3);
if (ret < 0)
return ret;
- if (pEntry->compressed)
+ if (pEntry->compressed && pdev->decompressor != NULL)
pdev->decompressor->init(pdev->release, buf, pdev->decompress_data);
/* Set various parameters */
@@ -911,7 +928,7 @@
int ret;
ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
- GET_STATUS_CTL,
+ GET_CHROM_CTL,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
PRESET_MANUAL_RED_GAIN_FORMATTER,
pdev->vcinterface,
@@ -950,7 +967,7 @@
int ret;
ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
- GET_STATUS_CTL,
+ GET_CHROM_CTL,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
PRESET_MANUAL_BLUE_GAIN_FORMATTER,
pdev->vcinterface,
@@ -962,6 +979,7 @@
return (buf << 8);
}
+
/* The following two functions are different, since they only read the
internal red/blue gains, which may be different from the manual
gains set or read above.
@@ -997,11 +1015,74 @@
&buf, 1, HZ / 2);
if (ret < 0)
- return ret;
+ return ret;
return (buf << 8);
}
+
+static inline int pwc_set_wb_speed(struct pwc_device *pdev, int speed)
+{
+ unsigned char buf;
+
+ /* useful range is 0x01..0x20 */
+ buf = speed / 0x7f0;
+ return usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
+ SET_CHROM_CTL,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ AWB_CONTROL_SPEED_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+}
+
+static inline int pwc_get_wb_speed(struct pwc_device *pdev)
+{
+ unsigned char buf;
+ int ret;
+
+ ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
+ GET_CHROM_CTL,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ AWB_CONTROL_SPEED_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+ return (buf * 0x7f0);
+}
+
+
+static inline int pwc_set_wb_delay(struct pwc_device *pdev, int delay)
+{
+ unsigned char buf;
+
+ /* useful range is 0x01..0x3F */
+ buf = (delay >> 10);
+ return usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
+ SET_CHROM_CTL,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ AWB_CONTROL_DELAY_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+}
+
+static inline int pwc_get_wb_delay(struct pwc_device *pdev)
+{
+ unsigned char buf;
+ int ret;
+
+ ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
+ GET_CHROM_CTL,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ AWB_CONTROL_DELAY_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+ return (buf << 10);
+}
+
+
int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
{
unsigned char buf[2];
@@ -1055,53 +1136,242 @@
return 0;
}
+static inline int pwc_set_contour(struct pwc_device *pdev, int contour)
+{
+ unsigned char buf;
+ int ret;
+
+ if (contour < 0)
+ buf = 0xff; /* auto contour on */
+ else
+ buf = 0x0; /* auto contour off */
+ ret = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
+ SET_LUM_CTL,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ AUTO_CONTOUR_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+
+ if (contour < 0)
+ return 0;
+ if (contour > 0xffff)
+ contour = 0xffff;
+
+ buf = (contour >> 10); /* contour preset is [0..3f] */
+ ret = usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
+ SET_LUM_CTL,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ PRESET_CONTOUR_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+ return 0;
+}
+
+static inline int pwc_get_contour(struct pwc_device *pdev, int *contour)
+{
+ unsigned char buf;
+ int ret;
+
+ ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
+ GET_LUM_CTL,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ AUTO_CONTOUR_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+
+ if (buf == 0) {
+ /* auto mode off, query current preset value */
+ ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
+ GET_LUM_CTL,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ PRESET_CONTOUR_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+ *contour = (buf << 10);
+ }
+ else
+ *contour = -1;
+ return 0;
+}
+
+
+static inline int pwc_set_backlight(struct pwc_device *pdev, int backlight)
+{
+ unsigned char buf;
+
+ if (backlight)
+ buf = 0xff;
+ else
+ buf = 0x0;
+ return usb_control_msg(pdev->udev, usb_sndctrlpipe(pdev->udev, 0),
+ SET_LUM_CTL,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ BACK_LIGHT_COMPENSATION_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+}
+
+static inline int pwc_get_backlight(struct pwc_device *pdev)
+{
+ int ret;
+ unsigned char buf;
+
+ ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
+ GET_LUM_CTL,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ BACK_LIGHT_COMPENSATION_FORMATTER,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+ return buf;
+}
+
+
+static inline int pwc_set_flicker(struct pwc_device *pdev, int flicker)
+{
+ unsigned char buf;
+
+ if (flicker)
+ buf = 0xff;
+ else
+ buf = 0x0;
+ return SendControlMsg(SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);
+}
+
+static inline int pwc_get_flicker(struct pwc_device *pdev)
+{
+ int ret;
+ unsigned char buf;
+
+ ret = RecvControlMsg(SET_LUM_CTL, FLICKERLESS_MODE_FORMATTER, 1);
+ if (ret < 0)
+ return ret;
+ return buf;
+}
+
+
+static inline int pwc_set_dynamic_noise(struct pwc_device *pdev, int noise)
+{
+ unsigned char buf;
+
+ if (noise < 0)
+ noise = 0;
+ if (noise > 3)
+ noise = 3;
+ buf = noise;
+ return SendControlMsg(SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1);
+}
+
+static inline int pwc_get_dynamic_noise(struct pwc_device *pdev)
+{
+ int ret;
+ unsigned char buf;
+
+ ret = RecvControlMsg(SET_LUM_CTL, DYNAMIC_NOISE_CONTROL_FORMATTER, 1);
+ if (ret < 0)
+ return ret;
+Debug("pwc_get_dynamic_noise = %d\n", buf);
+ return buf;
+}
+
+
+int pwc_get_cmos_sensor(struct pwc_device *pdev)
+{
+ unsigned char buf;
+ int ret = -1, request;
+
+ if (pdev->type < 675)
+ request = SENSOR_TYPE_FORMATTER1;
+ else if (pdev->type < 730)
+ return -1; /* The Vesta series doesn't have this call */
+ else
+ request = SENSOR_TYPE_FORMATTER2;
+
+ ret = usb_control_msg(pdev->udev, usb_rcvctrlpipe(pdev->udev, 0),
+ GET_STATUS_CTL,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ request,
+ pdev->vcinterface,
+ &buf, 1, HZ / 2);
+ if (ret < 0)
+ return ret;
+ if (pdev->type < 675)
+ return buf | 0x100;
+ else
+ return buf;
+}
+
+
/* End of Add-Ons */
/* ************************************************* */
int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
{
+ int ret = 0;
+
switch(cmd) {
case VIDIOCPWCRUSER:
{
if (pwc_restore_user(pdev))
- return -EINVAL;
+ ret = -EINVAL;
break;
}
case VIDIOCPWCSUSER:
{
if (pwc_save_user(pdev))
- return -EINVAL;
+ ret = -EINVAL;
break;
}
case VIDIOCPWCFACTORY:
{
if (pwc_restore_factory(pdev))
- return -EINVAL;
+ ret = -EINVAL;
break;
}
case VIDIOCPWCSCQUAL:
{
- int qual, ret;
+ int qual;
if (copy_from_user(&qual, arg, sizeof(int)))
- return -EFAULT;
-
- if (qual < 0 || qual > 3)
- return -EINVAL;
- ret = pwc_try_video_mode(pdev, pdev->view.x, pdev->view.y, pdev->vframes, qual, pdev->vsnapshot);
- if (ret < 0)
- return ret;
- pdev->vcompression = qual;
+ ret = -EFAULT;
+ else {
+ if (qual < 0 || qual > 3)
+ ret = -EINVAL;
+ else
+ ret = pwc_try_video_mode(pdev, pdev->view.x, pdev->view.y, pdev->vframes, qual, pdev->vsnapshot);
+ if (ret >= 0)
+ pdev->vcompression = qual;
+ }
break;
}
case VIDIOCPWCGCQUAL:
{
if (copy_to_user(arg, &pdev->vcompression, sizeof(int)))
- return -EFAULT;
+ ret = -EFAULT;
+ break;
+ }
+
+ case VIDIOCPWCPROBE:
+ {
+ struct pwc_probe probe;
+
+ strcpy(probe.name, pdev->vdev->name);
+ probe.type = pdev->type;
+ if (copy_to_user(arg, &probe, sizeof(probe)))
+ ret = -EFAULT;
break;
}
@@ -1110,10 +1380,10 @@
int agc;
if (copy_from_user(&agc, arg, sizeof(agc)))
- return -EFAULT;
+ ret = -EFAULT;
else {
if (pwc_set_agc(pdev, agc < 0 ? 1 : 0, agc))
- return -EINVAL;
+ ret = -EINVAL;
}
break;
}
@@ -1123,42 +1393,36 @@
int agc;
if (pwc_get_agc(pdev, &agc))
- return -EINVAL;
- if (copy_to_user(arg, &agc, sizeof(agc)))
- return -EFAULT;
+ ret = -EINVAL;
+ else
+ if (copy_to_user(arg, &agc, sizeof(agc)))
+ ret = -EFAULT;
break;
}
case VIDIOCPWCSSHUTTER:
{
- int shutter_speed, ret;
+ int shutter_speed;
if (copy_from_user(&shutter_speed, arg, sizeof(shutter_speed)))
- return -EFAULT;
- else {
+ ret = -EFAULT;
+ else
ret = pwc_set_shutter_speed(pdev, shutter_speed < 0 ? 1 : 0, shutter_speed);
- if (ret < 0)
- return ret;
- }
break;
}
-
- /* ************************************************* */
- /* Begin of Add-Ons for color compensation */
-
case VIDIOCPWCSAWB:
{
struct pwc_whitebalance wb;
- int ret;
if (copy_from_user(&wb, arg, sizeof(wb)))
- return -EFAULT;
-
- ret = pwc_set_awb(pdev, wb.mode);
- if (ret >= 0 && wb.mode == PWC_WB_MANUAL) {
- pwc_set_red_gain(pdev, wb.manual_red);
- pwc_set_blue_gain(pdev, wb.manual_blue);
+ ret = -EFAULT;
+ else {
+ ret = pwc_set_awb(pdev, wb.mode);
+ if (ret >= 0 && wb.mode == PWC_WB_MANUAL) {
+ pwc_set_red_gain(pdev, wb.manual_red);
+ pwc_set_blue_gain(pdev, wb.manual_blue);
+ }
}
break;
}
@@ -1170,55 +1434,176 @@
memset(&wb, 0, sizeof(wb));
wb.mode = pwc_get_awb(pdev);
if (wb.mode < 0)
- return -EINVAL;
- wb.manual_red = pwc_get_red_gain(pdev);
- wb.manual_blue = pwc_get_blue_gain(pdev);
- if (wb.mode == PWC_WB_AUTO) {
- wb.read_red = pwc_read_red_gain(pdev);
- wb.read_blue = pwc_read_blue_gain(pdev);
+ ret = -EINVAL;
+ else {
+ if (wb.mode == PWC_WB_MANUAL) {
+ wb.manual_red = pwc_get_red_gain(pdev);
+ wb.manual_blue = pwc_get_blue_gain(pdev);
+ }
+ if (wb.mode == PWC_WB_AUTO) {
+ wb.read_red = pwc_read_red_gain(pdev);
+ wb.read_blue = pwc_read_blue_gain(pdev);
+ }
+ if (copy_to_user(arg, &wb, sizeof(wb)))
+ ret= -EFAULT;
}
- if (copy_to_user(arg, &wb, sizeof(wb)))
- return -EFAULT;
+ break;
+ }
+
+ case VIDIOCPWCSAWBSPEED:
+ {
+ struct pwc_wb_speed wbs;
+
+ if (copy_from_user(&wbs, arg, sizeof(wbs)))
+ ret = -EFAULT;
+ else {
+ if (wbs.control_speed > 0) {
+ ret = pwc_set_wb_speed(pdev, wbs.control_speed);
+ }
+ if (wbs.control_delay > 0) {
+ ret = pwc_set_wb_delay(pdev, wbs.control_delay);
+ }
+ }
+ break;
+ }
+
+ case VIDIOCPWCGAWBSPEED:
+ {
+ struct pwc_wb_speed wbs;
+
+ ret = pwc_get_wb_speed(pdev);
+ if (ret < 0)
+ break;
+ wbs.control_speed = ret;
+ ret = pwc_get_wb_delay(pdev);
+ if (ret < 0)
+ break;
+ wbs.control_delay = ret;
+ if (copy_to_user(arg, &wbs, sizeof(wbs)))
+ ret = -EFAULT;
break;
}
case VIDIOCPWCSLED:
{
- int ret;
struct pwc_leds leds;
if (copy_from_user(&leds, arg, sizeof(leds)))
- return -EFAULT;
-
- ret = pwc_set_leds(pdev, leds.led_on, leds.led_off);
- if (ret<0)
- return ret;
- break;
+ ret = -EFAULT;
+ else
+ ret = pwc_set_leds(pdev, leds.led_on, leds.led_off);
+ break;
}
-
case VIDIOCPWCGLED:
{
- int led;
struct pwc_leds leds;
- led = pwc_get_leds(pdev, &leds.led_on, &leds.led_off);
- if (led < 0)
- return -EINVAL;
+ ret = pwc_get_leds(pdev, &leds.led_on, &leds.led_off);
+ if (ret < 0)
+ break;
if (copy_to_user(arg, &leds, sizeof(leds)))
- return -EFAULT;
+ ret = -EFAULT;
break;
}
- /* End of Add-Ons */
- /* ************************************************* */
+ case VIDIOCPWCSCONTOUR:
+ {
+ int contour;
+
+ if (copy_from_user(&contour, arg, sizeof(contour)))
+ ret = -EFAULT;
+ else
+ ret = pwc_set_contour(pdev, contour);
+ break;
+ }
+
+ case VIDIOCPWCGCONTOUR:
+ {
+ int contour;
+
+ ret = pwc_get_contour(pdev, &contour);
+ if (ret < 0)
+ break;
+
+ if (copy_to_user(arg, &contour, sizeof(contour)))
+ ret = -EFAULT;
+ break;
+ }
+
+ case VIDIOCPWCSBACKLIGHT:
+ {
+ int backlight;
+
+ if (copy_from_user(&backlight, arg, sizeof(backlight)))
+ ret = -EFAULT;
+ else
+ ret = pwc_set_backlight(pdev, backlight);
+ break;
+ }
+
+ case VIDIOCPWCGBACKLIGHT:
+ {
+ ret = pwc_get_backlight(pdev);
+ if (ret < 0)
+ break;
+ if (copy_to_user(arg, &ret, sizeof(ret)))
+ ret = -EFAULT;
+ break;
+ }
+
+ case VIDIOCPWCSFLICKER:
+ {
+ int flicker;
+
+ if (copy_from_user(&flicker, arg, sizeof(flicker)))
+ ret = -EFAULT;
+ else
+ ret = pwc_set_flicker(pdev, flicker);
+ break;
+ }
+
+ case VIDIOCPWCGFLICKER:
+ {
+ ret = pwc_get_flicker(pdev);
+ if (ret < 0)
+ break;
+ if (copy_to_user(arg, &ret, sizeof(ret)))
+ ret = -EFAULT;
+ break;
+ }
+
+ case VIDIOCPWCSDYNNOISE:
+ {
+ int dynnoise;
+
+ if (copy_from_user(&dynnoise, arg, sizeof(dynnoise)))
+ ret = -EFAULT;
+ else
+ ret = pwc_set_dynamic_noise(pdev, dynnoise);
+ break;
+ }
+
+ case VIDIOCPWCGDYNNOISE:
+ {
+ ret = pwc_get_dynamic_noise(pdev);
+ if (ret < 0)
+ break;
+ if (copy_to_user(arg, &ret, sizeof(ret)))
+ ret = -EFAULT;
+ break;
+ }
+
default:
- return -ENOIOCTLCMD;
+ ret = -ENOIOCTLCMD;
break;
}
- return 0;
+
+ if (ret > 0)
+ return 0;
+ return ret;
}
diff -ur linux-2.5.6-dist/drivers/usb/pwc-if.c linux-2.5.6/drivers/usb/pwc-if.c
--- linux-2.5.6-dist/drivers/usb/pwc-if.c Sat Mar 16 12:37:24 2002
+++ linux-2.5.6/drivers/usb/pwc-if.c Mon Mar 11 22:52:40 2002
@@ -1,6 +1,6 @@
/* Linux driver for Philips webcam
USB and Video4Linux interface part.
- (C) 1999-2001 Nemosoft Unv.
+ (C) 1999-2002 Nemosoft Unv.
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
@@ -47,12 +47,12 @@
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/mm.h>
#include <linux/module.h>
#include <linux/poll.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/wrapper.h>
-#include <linux/mm.h>
#include <asm/io.h>
#include "pwc.h"
@@ -67,7 +67,7 @@
/* hotplug device table support */
static __devinitdata struct usb_device_id pwc_device_table [] = {
- { USB_DEVICE(0x0471, 0x0302) },
+ { USB_DEVICE(0x0471, 0x0302) }, /* Philips models */
{ USB_DEVICE(0x0471, 0x0303) },
{ USB_DEVICE(0x0471, 0x0304) },
{ USB_DEVICE(0x0471, 0x0307) },
@@ -76,12 +76,14 @@
{ USB_DEVICE(0x0471, 0x0310) },
{ USB_DEVICE(0x0471, 0x0311) },
{ USB_DEVICE(0x0471, 0x0312) },
- { USB_DEVICE(0x069A, 0x0001) },
- { USB_DEVICE(0x046D, 0x08b0) },
- { USB_DEVICE(0x055D, 0x9000) },
+ { USB_DEVICE(0x069A, 0x0001) }, /* Askey */
+ { USB_DEVICE(0x046D, 0x08b0) }, /* Logitech */
+ { USB_DEVICE(0x055D, 0x9000) }, /* Samsung */
{ USB_DEVICE(0x055D, 0x9001) },
- { USB_DEVICE(0x041E, 0x400C) },
- { USB_DEVICE(0x04CC, 0x8116) },
+ { USB_DEVICE(0x041E, 0x400C) }, /* Creative */
+ { USB_DEVICE(0x04CC, 0x8116) }, /* Afina Eye */
+ { USB_DEVICE(0x0d81, 0x1910) }, /* Visionite */
+ { USB_DEVICE(0x0d81, 0x1900) },
{ }
};
MODULE_DEVICE_TABLE(usb, pwc_device_table);
@@ -106,7 +108,7 @@
static int default_mbufs = 2; /* Default number of mmap() buffers */
int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX;
static int power_save = 0;
-static int led_on = 1, led_off = 0; /* defaults to LED that is on while in use */
+static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */
static struct {
int type;
@@ -126,7 +128,11 @@
static long pwc_video_write(struct video_device *vdev, const char *buf, unsigned long count, int noblock);
static unsigned int pwc_video_poll(struct video_device *vdev, struct file *file, poll_table *wait);
static int pwc_video_ioctl(struct video_device *vdev, unsigned int cmd, void *arg);
-static int pwc_video_mmap(struct vm_area_struct *vma, struct video_device *dev, const char *adr, unsigned long size);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3)
+static int pwc_video_mmap(struct vm_area_struct *vma, struct video_device *vdev, const char *adr, unsigned long size);
+#else
+static int pwc_video_mmap(struct video_device *vdev, const char *adr, unsigned long size);
+#endif
static struct video_device pwc_template = {
owner: THIS_MODULE,
@@ -164,7 +170,7 @@
succeeded. The pwc_device struct links back to both structures.
When a device is unplugged while in use it will be removed from the
- list of known USB devices; I also de-register as a V4L device, but
+ list of known USB devices; I also de-register it as a V4L device, but
unfortunately I can't free the memory since the struct is still in use
by the file descriptor. This free-ing is then deferend until the first
opportunity. Crude, but it works.
@@ -178,25 +184,65 @@
/***************************************************************************/
/* Private functions */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 5)
+/* Memory management functions, nicked from cpia.c, which nicked them from
+ bttv.c. So far, I've counted duplication of this code 6 times
+ (bttv, cpia, ibmcam, ov511, pwc, ieee1394).
+ */
+
+/* Given PGD from the address space's page table, return the kernel
+ * virtual mapping of the physical memory mapped at ADR.
+ */
+static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
+{
+ unsigned long ret = 0UL;
+ pmd_t *pmd;
+ pte_t *ptep, pte;
+
+ if (!pgd_none(*pgd)) {
+ pmd = pmd_offset(pgd, adr);
+ if (!pmd_none(*pmd)) {
+ ptep = pte_offset(pmd, adr);
+ pte = *ptep;
+ if(pte_present(pte)) {
+ ret = (unsigned long) page_address(pte_page(pte));
+ ret |= (adr & (PAGE_SIZE - 1));
+
+ }
+ }
+ }
+ return ret;
+}
+#endif
+
+
/* Here we want the physical address of the memory.
- * This is used when initializing the contents of the area.
+ * This is used when initializing the contents of the
+ * area and marking the pages as reserved.
*/
static inline unsigned long kvirt_to_pa(unsigned long adr)
{
- unsigned long kva, ret;
+ unsigned long va, kva, ret;
- kva = (unsigned long) page_address(vmalloc_to_page((void *)adr));
- kva |= adr & (PAGE_SIZE-1); /* restore the offset */
+ va = VMALLOC_VMADDR(adr);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 5)
+ kva = page_address(vmalloc_to_page(va));
+#else
+ kva = uvirt_to_kva(pgd_offset_k(va), va);
+#endif
ret = __pa(kva);
return ret;
}
-static void * rvmalloc(unsigned long size)
+static void * rvmalloc(signed long size)
{
void * mem;
- unsigned long adr;
+ unsigned long adr, page;
- size=PAGE_ALIGN(size);
+ /* Round it off to PAGE_SIZE */
+ size += (PAGE_SIZE - 1);
+ size &= ~(PAGE_SIZE - 1);
+
mem=vmalloc_32(size);
if (mem)
{
@@ -204,7 +250,8 @@
adr=(unsigned long) mem;
while (size > 0)
{
- mem_map_reserve(vmalloc_to_page((void *)adr));
+ page = kvirt_to_pa(adr);
+ mem_map_reserve(virt_to_page(__va(page)));
adr+=PAGE_SIZE;
size-=PAGE_SIZE;
}
@@ -212,16 +259,20 @@
return mem;
}
-static void rvfree(void * mem, unsigned long size)
+static void rvfree(void * mem, signed long size)
{
- unsigned long adr;
-
+ unsigned long adr, page;
+
+ /* Round it off to PAGE_SIZE */
+ size += (PAGE_SIZE - 1);
+ size &= ~(PAGE_SIZE - 1);
if (mem)
{
adr=(unsigned long) mem;
- while ((long) size > 0)
+ while (size > 0)
{
- mem_map_unreserve(vmalloc_to_page((void *)adr));
+ page = kvirt_to_pa(adr);
+ mem_map_unreserve(virt_to_page(__va(page)));
adr+=PAGE_SIZE;
size-=PAGE_SIZE;
}
@@ -312,6 +363,8 @@
for (; i < MAX_IMAGES; i++)
pdev->image_ptr[i] = NULL;
+ kbuf = NULL;
+
Trace(TRACE_MEMORY, "Leaving pwc_allocate_buffers().\n");
return 0;
}
@@ -366,6 +419,7 @@
rvfree(pdev->image_data, default_mbufs * pdev->len_per_image);
}
pdev->image_data = NULL;
+
Trace(TRACE_MEMORY, "Leaving free_buffers().\n");
}
@@ -567,12 +621,10 @@
pdev->fill_image = (pdev->fill_image + 1) % default_mbufs;
}
-/* 2001-10-14: The YUV420 is still there, but you can only set it from within
- a program (YUV420P being the default) */
+/* 2001-10-14: YUV420P is the only palette remaining. */
static int pwc_set_palette(struct pwc_device *pdev, int pal)
{
- if ( pal == VIDEO_PALETTE_YUV420
- || pal == VIDEO_PALETTE_YUV420P
+ if ( pal == VIDEO_PALETTE_YUV420P
#if PWC_DEBUG
|| pal == VIDEO_PALETTE_RAW
#endif
@@ -788,7 +840,11 @@
ret = 0;
for (i = 0; i < MAX_ISO_BUFS; i++) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 5)
urb = usb_alloc_urb(ISO_FRAMES_PER_DESC, GFP_KERNEL);
+#else
+ urb = usb_alloc_urb(ISO_FRAMES_PER_DESC);
+#endif
if (urb == NULL) {
Err("Failed to allocate urb %d\n", i);
ret = -ENOMEM;
@@ -830,7 +886,11 @@
/* link */
for (i = 0; i < MAX_ISO_BUFS; i++) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 4)
ret = usb_submit_urb(pdev->sbuf[i].urb, GFP_KERNEL);
+#else
+ ret = usb_submit_urb(pdev->sbuf[i].urb);
+#endif
if (ret)
Err("isoc_init() submit_urb %d failed with error %d\n", i, ret);
else
@@ -866,7 +926,6 @@
int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_fps, int new_compression, int new_snapshot)
{
int ret;
-
/* Stop isoc stuff */
pwc_isoc_cleanup(pdev);
/* Reset parameters */
@@ -929,6 +988,29 @@
if (usb_set_interface(pdev->udev, 0, 0))
Info("Failed to set alternate interface to 0.\n");
pdev->usb_init = 1;
+
+ if (pwc_trace & TRACE_OPEN) {
+ /* Query CMOS sensor type */
+ const char *sensor_type = NULL;
+
+ i = pwc_get_cmos_sensor(pdev);
+ switch(i) {
+ case -1: /* Unknown, show nothing */; break;
+ case 0x00: sensor_type = "Hyundai CMOS sensor"; break;
+ case 0x20: sensor_type = "Sony CCD sensor + TDA8787"; break;
+ case 0x2E: sensor_type = "Sony CCD sensor + Exas 98L59"; break;
+ case 0x2F: sensor_type = "Sony CCD sensor + ADI 9804"; break;
+ case 0x30: sensor_type = "Sharp CCD sensor + TDA8787"; break;
+ case 0x3E: sensor_type = "Sharp CCD sensor + Exas 98L59"; break;
+ case 0x3F: sensor_type = "Sharp CCD sensor + ADI 9804"; break;
+ case 0x40: sensor_type = "UPA 1021 sensor"; break;
+ case 0x100: sensor_type = "VGA sensor"; break;
+ case 0x101: sensor_type = "PAL MR sensor"; break;
+ default: sensor_type = "unknown type of sensor"; break;
+ }
+ if (sensor_type != NULL)
+ Info("Thes %s camera is equipped with a %s (%d).\n", pdev->vdev->name, sensor_type, i);
+ }
}
/* Turn on camera */
@@ -1541,7 +1623,11 @@
return 0;
}
-static int pwc_video_mmap(struct vm_area_struct *vma, struct video_device *vdev, const char *adr, unsigned long size)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3)
+static int pwc_video_mmap(struct vm_area_struct *vma, struct video_device *vdev, const char *adr, unsigned long size)
+#else
+static int pwc_video_mmap(struct video_device *vdev, const char *adr, unsigned long size)
+#endif
{
struct pwc_device *pdev;
unsigned long start = (unsigned long)adr;
@@ -1551,10 +1637,16 @@
pdev = vdev->priv;
/* FIXME - audit mmap during a read */
+ /* Nemo: 9 months and 20 kernel revisions later I still don't know what you mean by this :-) */
+ /* Make that 12 months and 25 kernels... */
pos = (unsigned long)pdev->image_data;
while (size > 0) {
page = kvirt_to_pa(pos);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3)
if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED))
+#else
+ if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED))
+#endif
return -EAGAIN;
start += PAGE_SIZE;
@@ -1582,7 +1674,7 @@
int vendor_id, product_id, type_id;
int i, hint;
int video_nr = -1; /* default: use next available device */
- char serial_number[30];
+ char serial_number[30], *name;
free_mem_leak();
@@ -1603,38 +1695,47 @@
switch (product_id) {
case 0x0302:
Info("Philips PCA645VC USB webcam detected.\n");
+ name = "Philips 645 webcam";
type_id = 645;
break;
case 0x0303:
Info("Philips PCA646VC USB webcam detected.\n");
+ name = "Philips 646 webcam";
type_id = 646;
break;
case 0x0304:
Info("Askey VC010 type 2 USB webcam detected.\n");
+ name = "Askey VC010 webcam";
type_id = 646;
break;
case 0x0307:
Info("Philips PCVC675K (Vesta) USB webcam detected.\n");
+ name = "Philips 675 webcam";
type_id = 675;
break;
case 0x0308:
Info("Philips PCVC680K (Vesta Pro) USB webcam detected.\n");
+ name = "Philips 680 webcam";
type_id = 680;
break;
case 0x030C:
Info("Philips PCVC690K (Vesta Pro Scan) USB webcam detected.\n");
+ name = "Philips 690 webcam";
type_id = 690;
break;
case 0x0310:
Info("Philips PCVC730K (ToUCam Fun) USB webcam detected.\n");
+ name = "Philips 730 webcam";
type_id = 730;
break;
case 0x0311:
Info("Philips PCVC740K (ToUCam Pro) USB webcam detected.\n");
+ name = "Philips 740 webcam";
type_id = 740;
break;
case 0x0312:
Info("Philips PCVC750K (ToUCam Pro Scan) USB webcam detected.\n");
+ name = "Philips 750 webcam";
type_id = 750;
break;
default:
@@ -1646,6 +1747,7 @@
switch(product_id) {
case 0x0001:
Info("Askey VC010 type 1 USB webcam detected.\n");
+ name = "Askey VC010 webcam";
type_id = 645;
break;
default:
@@ -1656,7 +1758,8 @@
else if (vendor_id == 0x046d) {
switch(product_id) {
case 0x08b0:
- Info("Logitech QuickCam 3000 Pro detected.\n");
+ Info("Logitech QuickCam 3000 Pro USB webcam detected.\n");
+ name = "Logitech QuickCam 3000 Pro";
type_id = 730;
break;
default:
@@ -1672,10 +1775,12 @@
switch(product_id) {
case 0x9000:
Info("Samsung MPC-C10 USB webcam detected.\n");
+ name = "Samsung MPC-C10";
type_id = 675;
break;
case 0x9001:
Info("Samsung MPC-C30 USB webcam detected.\n");
+ name = "Samsung MPC-C30";
type_id = 675;
break;
default:
@@ -1687,6 +1792,7 @@
switch(product_id) {
case 0x400c:
Info("Creative Labs Webcam 5 detected.\n");
+ name = "Creative Labs Webcam 5";
type_id = 730;
break;
default:
@@ -1697,7 +1803,8 @@
else if (vendor_id == 0x04cc) {
switch(product_id) {
case 0x8116:
- Info("SOTEC CMS-001 USB webcam detected.\n");
+ Info("Sotec Afina Eye USB webcam detected.\n");
+ name = "Sotec Afina Eye";
type_id = 730;
break;
default:
@@ -1705,7 +1812,25 @@
break;
}
}
- else return NULL; /* Not Philips, Askey, Logitech, Samsung, Creative or SOTEC, for sure. */
+ else if (vendor_id == 0x0d81) {
+ switch(product_id) {
+ case 0x1900:
+ Info("Visionite VCS-UC300 USB webcam detected.\n");
+ name = "Visionite VCS-UC300";
+ type_id = 740; /* CCD sensor */
+ break;
+ case 0x1910:
+ Info("Visionite VCS-UM100 USB webcam detected.\n");
+ name = "Visionite VCS-UM100";
+ type_id = 730; /* CMOS sensor */
+ break;
+ default:
+ return NULL;
+ break;
+ }
+ }
+ else
+ return NULL; /* Not any of the know types; but the list keeps growing. */
memset(serial_number, 0, 30);
usb_string(udev, udev->descriptor.iSerialNumber, serial_number, 29);
@@ -1739,7 +1864,7 @@
return NULL;
}
memcpy(vdev, &pwc_template, sizeof(pwc_template));
- sprintf(vdev->name, "Philips %d webcam", pdev->type);
+ strcpy(vdev->name, name);
SET_MODULE_OWNER(vdev);
pdev->vdev = vdev;
vdev->priv = pdev;
@@ -1747,7 +1872,6 @@
pdev->release = udev->descriptor.bcdDevice;
Trace(TRACE_PROBE, "Release: %04x\n", pdev->release);
-
/* Now search device_hint[] table for a match, so we can hint a node number. */
for (hint = 0; hint < MAX_DEV_HINTS; hint++) {
if (((device_hint[hint].type == -1) || (device_hint[hint].type == pdev->type)) &&
@@ -1912,11 +2036,12 @@
char *sizenames[PSZ_MAX] = { "sqcif", "qsif", "qcif", "sif", "cif", "vga" };
Info("Philips PCA645/646 + PCVC675/680/690 + PCVC730/740/750 webcam module version " PWC_VERSION " loaded.\n");
- Info("Also supports the Askey VC010, Logitech Quickcam 3000 Pro, Samsung MPC-C10 and MPC-C30, the Creative WebCam 5 and the SOTEC CMS-001.\n");
+ Info("Also supports the Askey VC010, Logitech Quickcam 3000 Pro, Samsung MPC-C10 and MPC-C30,\n");
+ Info("the Creative WebCam 5, SOTEC Afina Eye and Visionite VCS-UC300 and VCS-UM100.\n");
if (fps) {
- if (fps < 5 || fps > 30) {
- Err("Framerate out of bounds (5-30).\n");
+ if (fps < 4 || fps > 30) {
+ Err("Framerate out of bounds (4-30).\n");
return -EINVAL;
}
default_fps = fps;
@@ -1968,9 +2093,9 @@
if (power_save)
Info("Enabling power save on open/close.\n");
if (leds[0] >= 0)
- led_on = leds[0] / 100;
+ led_on = leds[0];
if (leds[1] >= 0)
- led_off = leds[1] / 100;
+ led_off = leds[1];
/* Big device node whoopla. Basicly, it allows you to assign a
device node (/dev/videoX) to a camera, based on its type
diff -ur linux-2.5.6-dist/drivers/usb/pwc-ioctl.h linux-2.5.6/drivers/usb/pwc-ioctl.h
--- linux-2.5.6-dist/drivers/usb/pwc-ioctl.h Fri Jan 4 03:52:28 2002
+++ linux-2.5.6/drivers/usb/pwc-ioctl.h Sun Mar 10 01:35:26 2002
@@ -1,7 +1,7 @@
#ifndef PWC_IOCTL_H
#define PWC_IOCTL_H
-/* (C) 2001 Nemosoft Unv. [EMAIL PROTECTED]
+/* (C) 2001-2002 Nemosoft Unv. [EMAIL PROTECTED]
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
@@ -18,7 +18,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/*
+/* This is pwc-ioctl.h belonging to PWC 8.6 */
+
+/*
Changes
2001/08/03 Alvarado Added ioctl constants to access methods for
changing white balance and red/blue gains
@@ -52,6 +54,14 @@
#define PWC_FPS_SNAPSHOT 0x00400000
+
+struct pwc_probe
+{
+ char name[32];
+ int type;
+};
+
+
/* pwc_whitebalance.mode values */
#define PWC_WB_INDOOR 0
#define PWC_WB_OUTDOOR 1
@@ -63,9 +73,9 @@
Set mode to one of the PWC_WB_* values above.
*red and *blue are the respective gains of these colour components inside
the camera; range 0..65535
- When mode == PWC_WB_MANUAL, manual_red and manual_blue are set or read;
+ When 'mode' == PWC_WB_MANUAL, 'manual_red' and 'manual_blue' are set or read;
otherwise undefined.
- read_red and read_blue are read-only.
+ 'read_red' and 'read_blue' are read-only.
*/
struct pwc_whitebalance
@@ -75,6 +85,17 @@
int read_red, read_blue; /* R/O */
};
+/*
+ 'control_speed' and 'control_delay' are used in automatic whitebalance mode,
+ and tell the camera how fast it should react to changes in lighting, and
+ with how much delay. Valid values are 0..65535.
+*/
+struct pwc_wb_speed
+{
+ int control_speed;
+ int control_delay;
+
+};
/* Used with VIDIOCPWC[SG]LED */
struct pwc_leds
@@ -104,6 +125,19 @@
/* Get preferred compression quality */
#define VIDIOCPWCGCQUAL _IOR('v', 195, int)
+
+ /* This is a probe function; since so many devices are supported, it
+ becomes difficult to include all the names in programs that want to
+ check for the enhanced Philips stuff. So in stead, try this PROBE;
+ it returns a structure with the original name, and the corresponding
+ Philips type.
+ To use, fill the structure with zeroes, call PROBE and if that succeeds,
+ compare the name with that returned from VIDIOCGCAP; they should be the
+ same. If so, you can be assured it is a Philips (OEM) cam and the type
+ is valid.
+ */
+#define VIDIOCPWCPROBE _IOR('v', 199, struct pwc_probe)
+
/* Set AGC (Automatic Gain Control); int < 0 = auto, 0..65535 = fixed */
#define VIDIOCPWCSAGC _IOW('v', 200, int)
/* Get AGC; int < 0 = auto; >= 0 = fixed, range 0..65535 */
@@ -115,9 +149,28 @@
#define VIDIOCPWCSAWB _IOW('v', 202, struct pwc_whitebalance)
#define VIDIOCPWCGAWB _IOR('v', 202, struct pwc_whitebalance)
- /* Turn LED on/off ; int range 0..65535 */
+ /* Auto WB speed */
+#define VIDIOCPWCSAWBSPEED _IOW('v', 203, struct pwc_wb_speed)
+#define VIDIOCPWCGAWBSPEED _IOR('v', 203, struct pwc_wb_speed)
+
+ /* LEDs on/off/blink; int range 0..65535 */
#define VIDIOCPWCSLED _IOW('v', 205, struct pwc_leds)
- /* Get state of LED; int range 0..65535 */
#define VIDIOCPWCGLED _IOR('v', 205, struct pwc_leds)
+
+ /* Contour (sharpness); int < 0 = auto, 0..65536 = fixed */
+#define VIDIOCPWCSCONTOUR _IOW('v', 206, int)
+#define VIDIOCPWCGCONTOUR _IOR('v', 206, int)
+
+ /* Backlight compensation; 0 = off, otherwise on */
+#define VIDIOCPWCSBACKLIGHT _IOW('v', 207, int)
+#define VIDIOCPWCGBACKLIGHT _IOR('v', 207, int)
+
+ /* Flickerless mode; = 0 off, otherwise on */
+#define VIDIOCPWCSFLICKER _IOW('v', 208, int)
+#define VIDIOCPWCGFLICKER _IOR('v', 208, int)
+
+ /* Dynamic noise reduction; 0 off, 3 = high noise reduction */
+#define VIDIOCPWCSDYNNOISE _IOW('v', 209, int)
+#define VIDIOCPWCGDYNNOISE _IOR('v', 209, int)
#endif
diff -ur linux-2.5.6-dist/drivers/usb/pwc-misc.c linux-2.5.6/drivers/usb/pwc-misc.c
--- linux-2.5.6-dist/drivers/usb/pwc-misc.c Sun Sep 16 07:21:43 2001
+++ linux-2.5.6/drivers/usb/pwc-misc.c Fri Feb 1 20:33:44 2002
@@ -1,6 +1,6 @@
/* Linux driver for Philips webcam
Various miscellaneous functions and tables.
- (C) 1999-2001 Nemosoft Unv. ([EMAIL PROTECTED])
+ (C) 1999-2002 Nemosoft Unv. ([EMAIL PROTECTED])
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
diff -ur linux-2.5.6-dist/drivers/usb/pwc-uncompress.c linux-2.5.6/drivers/usb/pwc-uncompress.c
--- linux-2.5.6-dist/drivers/usb/pwc-uncompress.c Thu Jun 21 02:42:09 2001
+++ linux-2.5.6/drivers/usb/pwc-uncompress.c Sat Feb 23 00:31:23 2002
@@ -1,6 +1,6 @@
/* Linux driver for Philips webcam
Decompression frontend.
- (C) 1999-2001 Nemosoft Unv. ([EMAIL PROTECTED])
+ (C) 1999-2002 Nemosoft Unv. ([EMAIL PROTECTED])
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
diff -ur linux-2.5.6-dist/drivers/usb/pwc-uncompress.h linux-2.5.6/drivers/usb/pwc-uncompress.h
--- linux-2.5.6-dist/drivers/usb/pwc-uncompress.h Thu Jun 21 02:42:09 2001
+++ linux-2.5.6/drivers/usb/pwc-uncompress.h Mon Mar 25 02:30:42 2002
@@ -1,4 +1,4 @@
-/* (C) 1999-2001 Nemosoft Unv. ([EMAIL PROTECTED])
+/* (C) 1999-2002 Nemosoft Unv. ([EMAIL PROTECTED])
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
@@ -20,8 +20,8 @@
significant change should be reflected by increasing the
pwc_decompressor_version major number.
*/
-#ifndef PWC_DEC_H
-#define PWC_DEC_H
+#ifndef PWC_UNCOMPRESS_H
+#define PWC_UNCOMPRESS_H
#include <linux/config.h>
#include <linux/list.h>
diff -ur linux-2.5.6-dist/drivers/usb/pwc.h linux-2.5.6/drivers/usb/pwc.h
--- linux-2.5.6-dist/drivers/usb/pwc.h Fri Jan 4 03:52:28 2002
+++ linux-2.5.6/drivers/usb/pwc.h Mon Mar 25 02:30:42 2002
@@ -1,4 +1,4 @@
-/* (C) 1999-2001 Nemosoft Unv. ([EMAIL PROTECTED])
+/* (C) 1999-2002 Nemosoft Unv. ([EMAIL PROTECTED])
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
@@ -60,8 +60,8 @@
/* Version block */
#define PWC_MAJOR 8
-#define PWC_MINOR 5
-#define PWC_VERSION "8.5"
+#define PWC_MINOR 6
+#define PWC_VERSION "8.6"
#define PWC_NAME "pwc"
/* Turn certain features on/off */
@@ -247,6 +247,7 @@
extern int pwc_set_saturation(struct pwc_device *pdev, int value);
extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);
extern int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value);
+extern int pwc_get_cmos_sensor(struct pwc_device *pdev);
/* Power down or up the camera; not supported by all models */
extern int pwc_camera_power(struct pwc_device *pdev, int power);
diff -ur linux-2.5.6-dist/Documentation/usb/philips.txt linux-2.5.6/Documentation/usb/philips.txt
--- linux-2.5.6-dist/Documentation/usb/philips.txt Tue Nov 27 02:09:10 2001
+++ linux-2.5.6/Documentation/usb/philips.txt Sat Feb 23 00:36:28 2002
@@ -189,10 +189,10 @@
The fbufs, mbufs and trace parameters are global and apply to all connected
cameras. Each camera has its own set of buffers.
-size, fps, palette only specify defaults when you open() the device; this is
-to accommodate some tools that don't set the size or colour palette. You can
-change these settings after open() with the Video4Linux ioctl() calls. The
-default of defaults is QCIF size at 10 fps, BGR order.
+size and fps only specify defaults when you open() the device; this is to
+accommodate some tools that don't set the size. You can change these
+settings after open() with the Video4Linux ioctl() calls. The default of
+defaults is QCIF size at 10 fps, BGR order.
The compression parameter is semiglobal; it sets the initial compression
preference for all camera's, but this parameter can be set per camera with
