r5u870

commit 89b0064e4308fc13c5c1154fb4f68e93de33efd3
parent 948dc08d5a88e77622bb70cd8b9b3598f18dde82
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Wed, 30 Jan 2008 23:27:27 +0000

* Added support for experimental UVC camera - need .inf stuff, however.
* Fixed small ucode version bug.
* Updated ChangeLog, weee! :)


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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
Makefile
 | 
2
+-
M
r5u870.c
 | 
11
++++++++++-
A
r5u870_1841.fw
 | 
0

4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-21  Alexander Hixon  <hixon.alexander@mediati.org>
+    * r5u870.c, Makefile, r5u870_1841.fw: Added support for the experimental
+      1841 UVC camera.
+    * r5u870.c: Fixed small bug where the wrong ucode version would be used.
+
 2008-01-25  Alexander Hixon  <hixon.alexander@mediati.org>
     * r5u870.c: Force 1812 camera to use same controls and firmware as HP
       Pavilion webcam. Still experimental.
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 r5u870_1839.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 r5u870_1841.fw
 
 ifneq ($(KERNELRELEASE),)
 include $(src)/Kbuild
diff --git a/r5u870.c b/r5u870.c
@@ -2778,6 +2778,7 @@ enum {
 	R5U870_DI_HP_PAVWC_UVC,
 	R5U870_DI_HP_PAVWC_UVC_1,
 	R5U870_DI_GENERIC_UVC,
+	R5U870_DI_FUJITSU,
 };
 
 static const struct r5u870_model r5u870_models[] = {
@@ -2852,10 +2853,17 @@ static const struct r5u870_model r5u870_models[] = {
 	[R5U870_DI_VGP_VCC8] = {
 		.rm_name = "Sony VGP-VCC8",
 		.rm_ucode_file = "r5u870_183b.fw",
-		.rm_ucode_version = 0x0111,
+		.rm_ucode_version = 0x0131,
 		.rm_wdm_ctrlids = r5u870_1810_183b_ctrls,
 		.rm_uvc = 1,
 	},
+	[R5U870_DI_FUJITSU] = {
+	    .rm_name = "Fujitsu u810",
+	    .rm_ucode_file = "r5u870_1841.fw",
+	    .rm_ucode_version = 0xFFFF,     /* TODO: Get the version code from the inf file. */
+	    .rm_wdm_ctrlids = r5u870_1810_183a_ctrls,
+	    .rm_uvc = 1,
+	},
 	[R5U870_DI_HP_WEBCAM1K] = {
 		.rm_name = "HP Webcam 1000",
 		.rm_ucode_file = "r5u870_1870_1.fw",
@@ -2967,6 +2975,7 @@ static const struct usb_device_id id_table[] = {
 	{ R5U870_DEVICE_UVC(0x05CA, 0x1839, R5U870_DI_VGP_VCC6) },
 	{ R5U870_DEVICE_UVC(0x05CA, 0x183a, R5U870_DI_VGP_VCC7) },
 	{ R5U870_DEVICE_UVC(0x05CA, 0x183b, R5U870_DI_VGP_VCC8) },
+	{ R5U870_DEVICE_UVC(0x05CA, 0x1841, R5U870_DI_FUJITSU) },
 	{ },
 };
 
diff --git a/r5u870_1841.fw b/r5u870_1841.fw
Binary files differ.