r5u870

Ricoh R5U870 Linux Driver
git clone https://logand.com/git/r5u870.git/
Log | Files | Refs | README | LICENSE

commit f119e7474d19c64c139bbce59b0d6d6fdd08ca88
parent d86c2d34113650f95cee3017d63bea2b0109c8da
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Wed, 16 Jan 2008 22:51:38 +0000

* Add support for 1839 UVC camera and firmware.
* Describe which new camera models we support in README.
* Added extra credit for Ubuntu Forum folk.


git-svn-id: http://svn.mediati.org/svn/r5u870/trunk@35 022568fa-442e-4ef8-a3e8-54dcafdb011a

Diffstat:
MChangeLog | 8++++++++
MMakefile | 2+-
MREADME | 8++++++++
Mr5u870.c | 22+++++++++++++++++++++-
Ar5u870_1839.fw | 0
5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,4 +1,12 @@ 2008-01-17 Alexander Hixon <hixon.alexander@mediati.org> + * r5u870.c, r5u870_1839.fw, Makefile: Added support for 1839 UVC + camera. Also not sure of which UVC camera controls this camera + completely supports, however, it appears to work. I also don't own + this camera so I can't really test/experiment. + * README: Describe which cameras we now support - 183b and 1839 UVC + cameras. Also add an extra credit. :) + +2008-01-17 Alexander Hixon <hixon.alexander@mediati.org> * r5u870.c, r5u870_183b.fw, Makefile: Added support for 183b UVC camera. Still not sure about all the WDM controls it supports. * r5u870.c: Remove R5U870_VERSION_EXTRA value, since we're at 0.11.0 - diff --git a/Makefile b/Makefile @@ -26,7 +26,7 @@ FWDIR ?= /lib/firmware # Old module name to detect and complain about when installing OLD_MODULE_NM = ry5u870.ko -FWFILES = r5u870_1830.fw r5u870_1832.fw r5u870_1833.fw r5u870_1834.fw r5u870_1835.fw r5u870_1836.fw r5u870_1870_1.fw r5u870_1870.fw r5u870_1810.fw r5u870_183a.fw r5u870_183b.fw +FWFILES = r5u870_1830.fw r5u870_1832.fw r5u870_1833.fw r5u870_1834.fw r5u870_1835.fw r5u870_1836.fw r5u870_1870_1.fw r5u870_1870.fw r5u870_1810.fw r5u870_183a.fw r5u870_183b.fw r5u870_1839.fw ifneq ($(KERNELRELEASE),) include $(src)/Kbuild diff --git a/README b/README @@ -28,7 +28,9 @@ This driver supports the following OEM webcams: 05ca:1834 Sony Visual Communication Camera VGP-VCC2 (for VAIO AR2) 05ca:1835 Sony Visual Communication Camera VGP-VCC5 (for VAIO SZ) 05ca:1836 Sony Visual Communication Camera VGP-VCC4 (for VAIO FE) +05ca:1839 Sony Visual Communication Camera VGP-VCC6 (for VAIO CR) 05ca:183a Sony Visual Communication Camera VGP-VCC7 (for VAIO SZ) +05ca:183b Sony Visual Communication Camera VGP-VCC8 (for VAIO FZ) 05ca:1870 HP Pavilion Webcam / HP Webcam 1000 @@ -162,6 +164,9 @@ The files: r5u870_1834.fw r5u870_1835.fw r5u870_1836.fw + r5u870_1839.fw + r5u870_183a.fw + r5u870_183b.fw r5u870_1870.fw r5u870_1870_1.fw @@ -192,3 +197,6 @@ webcam (05ca:1834). Thanks to Utz-Uwe Haus for getting the Sony VGP-VCC7 firmware extracted, and providing a patch against the original r5u870 driver, and providing the recode-fw.scm script. + +Some friendly folk on the Ubuntu Forums for providing extracted version of +firmwares and their associated version numbers. diff --git a/r5u870.c b/r5u870.c @@ -2667,6 +2667,18 @@ static const int r5u870_1810_183b_ctrls[] = { R5U870_WDM_CTRL_NIGHTMODE, R5U870_WDM_CTRL_LAST, }; +static const int r5u870_1810_1839_ctrls[] = { + /* TODO: Maybe there are more of these? I don't actually have a webcam + to test against the different WDM controls. */ + R5U870_WDM_CTRL_WB_RED, + R5U870_WDM_CTRL_WB_GREEN, + R5U870_WDM_CTRL_WB_BLUE, + R5U870_WDM_CTRL_WB_AUTO, + R5U870_WDM_CTRL_VFLIP, + R5U870_WDM_CTRL_HFLIP, + R5U870_WDM_CTRL_PRIVACY, + R5U870_WDM_CTRL_LAST, +}; /* @@ -2729,6 +2741,7 @@ enum { R5U870_DI_VGP_VCC2_AR2, R5U870_DI_VGP_VCC5, R5U870_DI_VGP_VCC4, + R5U870_DI_VGP_VCC6, R5U870_DI_VGP_VCC7, R5U870_DI_VGP_VCC8, R5U870_DI_HP_WEBCAM1K, @@ -2785,8 +2798,15 @@ static const struct r5u870_model r5u870_models[] = { .rm_wdm_ctrlids = r5u870_1810_1836_ctrls, .rm_uvc = 1, }, + [R5U870_DI_VGP_VCC6] = { + .rm_name = "Sony VGP-VCC6", + .rm_ucode_file = "r5u870_1839.fw", + .rm_ucode_version = 0x0113, + .rm_wdm_ctrlids = r5u870_1810_1839_ctrls, + .rm_uvc = 1, + }, [R5U870_DI_VGP_VCC7] = { - .rm_name = "Sony VGP-VCC7 (VAIO SZ)", + .rm_name = "Sony VGP-VCC7", .rm_ucode_file = "r5u870_183a.fw", .rm_ucode_version = 0x0111, .rm_wdm_ctrlids = r5u870_1810_183a_ctrls, diff --git a/r5u870_1839.fw b/r5u870_1839.fw Binary files differ.