Merge with the main gspca tree.

From: Erik Andrén <erik.andren@gmail.com>

Priority: normal

Signed-off-by: Erik Andrén <erik.andren@gmail.com>

1 files changed, 92 insertions, 5 deletions

diff --git a/v4l/compat.h b/v4l/compat.h
index 3c0c2e345..49c89ea2d 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -27,9 +27,14 @@
 #include <sound/driver.h>
 #endif
 
+#ifdef NEED_ALGO_CONTROL
+#include <linux/i2c.h>
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 #define set_freezable()
 #define cancel_delayed_work_sync cancel_rearming_delayed_work
+#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
 #endif
 
 #ifndef __pure
@@ -163,7 +168,8 @@ do {									\
 #define put_unaligned_le64(r, a)				\
 	put_unaligned(cpu_to_le64(r), ((u64 *)(a)))
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
+
+#ifdef NEED_PROC_CREATE
 #ifdef CONFIG_PROC_FS
 static inline struct proc_dir_entry *proc_create(const char *a,
 	mode_t b, struct proc_dir_entry *c, const struct file_operations *d)
@@ -215,19 +221,31 @@ static inline struct proc_dir_entry *proc_create_data(const char *a,
 typedef unsigned long uintptr_t;
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
-#define div64_u64(a,b) div64_64(a,b)
+#ifdef NEED_IS_SINGULAR
+static inline int list_is_singular(const struct list_head *head)
+{
+	return !list_empty(head) && (head->next == head->prev);
+}
+#endif
 
+#ifdef NEED_CLAMP
 #define clamp( x, l, h )        max_t( __typeof__( x ),		\
 				      ( l ),			\
 				      min_t( __typeof__( x ),	\
 					     ( h ),        	\
 					     ( x ) ) )
+#endif
 
-static inline int list_is_singular(const struct list_head *head)
+#ifdef NEED_ALGO_CONTROL
+static inline int dummy_algo_control(struct i2c_adapter *adapter,
+			     unsigned int cmd, unsigned long arg)
 {
-	return !list_empty(head) && (head->next == head->prev);
+	return 0;
 }
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+#define div64_u64(a,b) div64_64(a,b)
 
 #define dev_name(dev)	((dev)->bus_id)
 
@@ -252,10 +270,79 @@ static inline int list_is_singular(const struct list_head *head)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)
 #define snd_BUG_ON(cond)	WARN((cond), "BUG? (%s)\n", __stringify(cond))
+
+#define pci_ioremap_bar(pci, a)				\
+	 ioremap_nocache(pci_resource_start(pci, a),	\
+			 pci_resource_len(pci, a))
 #endif
 
 #ifndef PCI_DEVICE_ID_MARVELL_88ALP01_CCIC
 #define PCI_DEVICE_ID_MARVELL_88ALP01_CCIC     0x4102
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+#ifdef __LINUX_USB_H
+/*
+ * usb_endpoint_* functions
+ *
+ * Included in Linux 2.6.19
+ * Backported to 2.6.18 in Red Hat Enterprise Linux 5.2
+ */
+
+#ifdef RHEL_RELEASE_CODE
+#if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5, 2)
+#define RHEL_HAS_USB_ENDPOINT
+#endif
+#endif
+
+#ifndef RHEL_HAS_USB_ENDPOINT
+static inline int
+usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
+{
+	return (epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN;
+}
+
+static inline int
+usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
+{
+	return (epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+		USB_ENDPOINT_XFER_INT;
+}
+
+static inline int
+usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd)
+{
+	return (epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+		USB_ENDPOINT_XFER_ISOC;
+}
+
+static inline int
+usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd)
+{
+	return (epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+		USB_ENDPOINT_XFER_BULK;
+}
+
+static inline int
+usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
+{
+	return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
+}
+#endif /* RHEL_HAS_USB_ENDPOINT */
+#endif /* __LINUX_USB_H */
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+/*
+ * Linked list API
+ */
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
+
+/*
+ * uninitialized_var() macro
+ */
+#define uninitialized_var(x) x = x
+#endif
+
 #endif