r5u870

commit c40d79d79b24a1cf8647a6dcfb8f1d363577bfd7
parent ca7ce57675defa3fc84d6daa0bf33244a9262da4
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Fri, 18 Jan 2008 09:33:09 +0000

More stuff for 1812 driver. First try didn't work so well, possibly.


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

Diffstat:
M
r5u870.c
 | 
16
++++++++++++----
A
r5u870_1812.fw
 | 
0

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/r5u870.c b/r5u870.c
@@ -2828,7 +2828,7 @@ static const struct r5u870_model r5u870_models[] = {
 		.rm_npixfmts = ARRAY_SIZE(r5u870_vga_wdm_pixfmts),
 	},
 	[R5U870_DI_HP_PAVWC_WDM] = {
-		.rm_name = "HP Pavilion Webcam",
+		.rm_name = "HP Pavilion Webcam (WDM)",
 		.rm_ucode_file = "r5u870_1870.fw",
 		.rm_ucode_version = 0x0112,
 		.rm_wdm_ctrlids = r5u870_1870_ctrls,
@@ -2837,13 +2837,21 @@ static const struct r5u870_model r5u870_models[] = {
 		.rm_no_ctrl_reload = 1,
 	},
 	[R5U870_DI_HP_PAVWC_UVC] = {
-		.rm_name = "HP Pavilion Webcam",
+		.rm_name = "HP Pavilion Webcam (UVC)",
 		.rm_ucode_file = "r5u870_1810.fw",
 		.rm_ucode_version = 0x0115,
 		.rm_wdm_ctrlids = r5u870_1810_1836_ctrls,
 		.rm_uvc = 1,
 		.rm_no_ctrl_reload = 1,
 	},
+	[R5U870_DI_HP_PAVWC_UVC_1] = {
+		.rm_name = "HP Pavilion Webcam (testing)",
+		.rm_ucode_file = "r5u870_1812.fw",
+		.rm_ucode_version = 0x0115,
+		.rm_wdm_ctrlids = r5u870_1810_1836_ctrls,
+		.rm_uvc = 1,
+		.rm_no_ctrl_reload = 1,
+	},
 	[R5U870_DI_GENERIC_UVC] = {
 		.rm_name = "Generic UVC Webcam",
 		.rm_uvc = 1,
@@ -2851,7 +2859,7 @@ static const struct r5u870_model r5u870_models[] = {
 };
 
 /*
- * Someone clever at HP decid   ed to use 05ca:1870 for two distinct devices.
+ * Someone clever at HP decided to use 05ca:1870 for two distinct devices.
  * The Pavilion dv1xxx machines all seem to have the less common of the
  * two.  There is no known, working method to distinguish the devices
  * using USB commands only.  We resort to reading the model number out
@@ -2914,7 +2922,7 @@ static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(0x05CA, 0x1870), .driver_info = R5U870_DI_HP_PAVWC_WDM },
 
 	{ R5U870_DEVICE_UVC(0x05CA, 0x1810, R5U870_DI_HP_PAVWC_UVC) },
-	{ R5U870_DEVICE_UVC(0X05CA, 0x1812, R5U870_DI_HP_PAVWC_UVC) },
+	{ USB_DEVICE(0X05CA, 0x1812, R5U870_DI_HP_PAVWC_WDM) },
 	{ R5U870_DEVICE_UVC(0x05CA, 0x1835, R5U870_DI_VGP_VCC5) },
 	{ R5U870_DEVICE_UVC(0x05CA, 0x1836, R5U870_DI_VGP_VCC4) },
 	{ R5U870_DEVICE_UVC(0x05CA, 0x1837, R5U870_DI_VGP_VCC4) },
diff --git a/r5u870_1812.fw b/r5u870_1812.fw
Binary files differ.