Version 0.4.0 from FTP

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@135 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 20 insertions, 0 deletions

diff --git a/wcusb.h b/wcusb.h
index 63d174a..7571b2f 100755
--- a/wcusb.h
+++ b/wcusb.h
@@ -6,6 +6,12 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/usb.h>
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19)
+#define USB2420
+#endif
+
 #include "zaptel.h"
 
 #define WC_MAX_IFACES           128
@@ -63,7 +69,11 @@ typedef enum {
 
 struct wc_keypad_data {
         keypad_state_t state; /* Current state in the keypad detect routine */
+#ifdef USB2420
+        struct urb urb;  /* urb used for the keypad data transport ... can't remember whether it is used or not */
+#else
         urb_t urb;  /* urb used for the keypad data transport ... can't remember whether it is used or not */
+#endif
 	int running;
         char data;
         char data12;
@@ -77,8 +87,13 @@ struct wc_keypad_data {
 };
 
 struct stinky_urb {
+#ifdef USB2420
+        struct urb urb;
+        struct iso_packet_descriptor isoframe[1];
+#else
         urb_t urb;
         iso_packet_descriptor_t isoframe[1];
+#endif
 };
 
 struct wc_usb_pvt {
@@ -90,8 +105,13 @@ struct wc_usb_pvt {
         struct zt_chan chan;
         struct stinky_urb dataread[2];
         struct stinky_urb datawrite[2];
+#ifdef USB2420
+        struct urb          control;
+        struct usb_ctrlrequest      dr;
+#else
         urb_t           control;
         devrequest      dr;
+#endif
         proslic_state_t controlstate;
         int urbcount;
         int flags;