r5u870

commit 8df0d3bfb02fafee0b1d28e8adfc212e31e4ac57
parent 74c042b6ec0df645c3c569072fca095ebbd6194e
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Thu, 24 Jan 2008 07:23:14 +0000

* Change 1812 camera to use UVC controls from Pavilion camera.
* Spew all debugging if debug=1 is passed.
* Bump versions in usbcam.h/usbcam_fops.c to 0.11.0.
* (C) -> (c) in other usbcam files.


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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
r5u870.c
 | 
2
+-
M
usbcam/usbcam.h
 | 
7
+++----
M
usbcam/usbcam_buf.c
 | 
2
+-
M
usbcam/usbcam_fops.c
 | 
5
+++--
M
usbcam/usbcam_priv.h
 | 
2
+-
M
usbcam/usbcam_skel.c
 | 
2
+-
M
usbcam/usbcam_util.c
 | 
2
+-

8 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+    * usbcam/usbcam.h: Spew all debug by default; bump version to 0.11.0.
+    * usbcam/usbcam_fops.c: Bump version to 0.11.0 prior to release.    
+
 2008-01-18  Alexander Hixon  <hixon.alexander@mediati.org>
     * usbcam/usbcam_fops.c: Provide working V4L1 support. Probably needs a bit
       of a cleanup, but works perfectly fine.
diff --git a/r5u870.c b/r5u870.c
@@ -2957,9 +2957,9 @@ static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(0x05CA, 0x1833), .driver_info = R5U870_DI_VGP_VCC2_AR1 },
 	{ USB_DEVICE(0x05CA, 0x1834), .driver_info = R5U870_DI_VGP_VCC2_AR2 },
 	{ USB_DEVICE(0x05CA, 0x1870), .driver_info = R5U870_DI_HP_PAVWC_WDM },
-	{ USB_DEVICE(0X05CA, 0x1812), .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) },
 	{ 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_VFLIP) },
diff --git a/usbcam/usbcam.h b/usbcam/usbcam.h
@@ -1,8 +1,8 @@
 /*
  * USBCAM abstraction library for USB webcam drivers
- * Version 0.1.1
+ * Version 0.11.0
  * 
- * Copyright (C) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2007 Sam Revitch <samr7 cs washington edu>
  *
  * 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
@@ -65,8 +65,7 @@ struct usbcam_curframe;
 
 #if defined(CONFIG_USB_USBCAM_DEBUG)
 #define usbcam_dbg(UDP, SUBSYS, FMT, ARG...) do {			\
-	if ((UDP)->ud_debug &&						\
-	    (*(UDP)->ud_debug & (1UL << USBCAM_DBG_ ## SUBSYS)))	\
+	if ((UDP)->ud_debug)                            \
 		printk(KERN_DEBUG "%s: " FMT "\n",			\
 		       (UDP)->ud_dev_name, ## ARG);			\
 } while (0)
diff --git a/usbcam/usbcam_buf.c b/usbcam/usbcam_buf.c
@@ -1,7 +1,7 @@
 /*
  * USBCAM abstraction library for USB webcam drivers
  *
- * Copyright (C) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2007 Sam Revitch <samr7 cs washington edu>
  *
  * 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 --git a/usbcam/usbcam_fops.c b/usbcam/usbcam_fops.c
@@ -1,8 +1,9 @@
 /*
  * USBCAM abstraction library for USB webcam drivers
- * Version 0.1.1
+ * Version 0.11.0
  *
- * Copyright (C) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2008 Alexander Hixon <hixon.alexander@mediati.org>
  *
  * 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 --git a/usbcam/usbcam_priv.h b/usbcam/usbcam_priv.h
@@ -1,7 +1,7 @@
 /*
  * USBCAM abstraction library for USB webcam drivers
  *
- * Copyright (C) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2007 Sam Revitch <samr7 cs washington edu>
  *
  * 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 --git a/usbcam/usbcam_skel.c b/usbcam/usbcam_skel.c
@@ -1,7 +1,7 @@
 /*
  * USBCAM abstraction library for USB webcam drivers
  *
- * Copyright (C) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2007 Sam Revitch <samr7 cs washington edu>
  *
  * This driver is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/usbcam/usbcam_util.c b/usbcam/usbcam_util.c
@@ -1,7 +1,7 @@
 /*
  * USBCAM abstraction library for USB webcam drivers
  *
- * Copyright (C) 2007 Sam Revitch <samr7 cs washington edu>
+ * Copyright (c) 2007 Sam Revitch <samr7 cs washington edu>
  *
  * 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