From: <ges...@us...> - 2008-10-20 22:19:10
|
Revision: 2009 http://ipcop.svn.sourceforge.net/ipcop/?rev=2009&view=rev Author: gespinasse Date: 2008-10-20 22:19:08 +0000 (Mon, 20 Oct 2008) Log Message: ----------- Remove fcdsl usb patches Removed Paths: ------------- ipcop/trunk/src/patches/fcdslslusb-suse93-3.11-05.patch ipcop/trunk/src/patches/fcdslusb-suse93-3.11-07.patch ipcop/trunk/src/patches/fcdslusb-suse93_2.6.25.patch Deleted: ipcop/trunk/src/patches/fcdslslusb-suse93-3.11-05.patch =================================================================== --- ipcop/trunk/src/patches/fcdslslusb-suse93-3.11-05.patch 2008-10-20 22:14:52 UTC (rev 2008) +++ ipcop/trunk/src/patches/fcdslslusb-suse93-3.11-05.patch 2008-10-20 22:19:08 UTC (rev 2009) @@ -1,59 +0,0 @@ ---- orig.src/tools.h 2007-04-12 20:33:21.512571840 +0200 -+++ src/tools.h 2007-04-12 20:35:25.000000000 +0200 -@@ -71,12 +71,14 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -+#ifdef REMOVED_BY_PATCH - static inline unsigned long atomic_xchg ( - volatile atomic_t * v, - unsigned value - ) { - return __xchg (value, &v->counter, sizeof (unsigned)); - } /* atomic_xchg */ -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ ---- orig.src/driver.h 2007-04-12 20:33:21.000000000 +0200 -+++ src/driver.h 2007-04-12 20:40:08.000000000 +0200 -@@ -24,7 +24,7 @@ - #define __have_driver_h__ - - #include <asm/atomic.h> --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/skbuff.h> - #include <linux/spinlock.h> - #include <linux/usb.h> ---- orig.src/main.c 2007-04-12 20:33:21.000000000 +0200 -+++ src/main.c 2007-04-12 20:40:48.000000000 +0200 -@@ -27,7 +27,7 @@ - #include <stdarg.h> - #include <asm/uaccess.h> - #include <linux/usb.h> --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/version.h> - #include <linux/kernel.h> - #include <linux/module.h> -@@ -92,7 +92,7 @@ - - static struct usb_driver usb_driver = { - -- .owner = THIS_MODULE, -+// .owner = THIS_MODULE, - .name = TARGET, - .id_table = usb_id_table, - .probe = usb_probe, ---- orig.src/driver.c 2007-04-12 20:33:21.000000000 +0200 -+++ src/driver.c 2007-04-12 20:48:13.000000000 +0200 -@@ -434,7 +434,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ Deleted: ipcop/trunk/src/patches/fcdslusb-suse93-3.11-07.patch =================================================================== --- ipcop/trunk/src/patches/fcdslusb-suse93-3.11-07.patch 2008-10-20 22:14:52 UTC (rev 2008) +++ ipcop/trunk/src/patches/fcdslusb-suse93-3.11-07.patch 2008-10-20 22:19:08 UTC (rev 2009) @@ -1,115 +0,0 @@ -diff -Nur 1/fritz/orig.src/driver.c 1/fritz/src/driver.c ---- 1/fritz/orig.src/driver.c 2007-04-12 16:04:42.000000000 +0200 -+++ 1/fritz/src/driver.c 2007-04-12 17:27:41.000000000 +0200 -@@ -787,7 +787,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ -diff -Nur 1/fritz/orig.src/driver.h 1/fritz/src/driver.h ---- 1/fritz/orig.src/driver.h 2007-04-12 16:04:42.000000000 +0200 -+++ 1/fritz/src/driver.h 2007-04-12 17:25:02.308311984 +0200 -@@ -25,7 +25,7 @@ - - #include <asm/semaphore.h> - #include <asm/atomic.h> --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/skbuff.h> - #include <linux/capi.h> - #include <linux/isdn/capilli.h> -diff -Nur 1/fritz/orig.src/main.c 1/fritz/src/main.c ---- 1/fritz/orig.src/main.c 2007-04-12 16:04:42.000000000 +0200 -+++ 1/fritz/src/main.c 2007-04-12 17:25:02.308311984 +0200 -@@ -77,7 +77,7 @@ - - static struct usb_driver usb_driver = { - -- .owner = THIS_MODULE, -+// .owner = THIS_MODULE, - .name = TARGET, - .id_table = usb_id_table, - .probe = usb_probe, -diff -Nur 1/fritz/orig.src/tools.h 1/fritz/src/tools.h ---- 1/fritz/orig.src/tools.h 2007-04-12 16:04:42.000000000 +0200 -+++ 1/fritz/src/tools.h 2007-04-12 17:25:02.308311984 +0200 -@@ -71,12 +71,14 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -+#ifdef REMOVED_BY_PATCH - static inline unsigned long atomic_xchg ( - volatile atomic_t * v, - unsigned value - ) { - return __xchg (value, &v->counter, sizeof (unsigned)); - } /* atomic_xchg */ -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -diff -Nur 2/fritz/orig.src/driver.h 2/fritz/src/driver.h ---- 2/fritz/orig.src/driver.h 2007-04-12 16:04:47.000000000 +0200 -+++ 2/fritz/src/driver.h 2007-04-12 17:25:02.308311984 +0200 -@@ -24,7 +24,7 @@ - #define __have_driver_h__ - - #include <asm/atomic.h> --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/skbuff.h> - #include <linux/spinlock.h> - #include <linux/usb.h> -diff -Nur 2/fritz/orig.src/tools.h 2/fritz/src/tools.h ---- 2/fritz/orig.src/tools.h 2007-04-12 16:04:47.000000000 +0200 -+++ 2/fritz/src/tools.h 2007-04-12 17:25:02.309311832 +0200 -@@ -71,12 +71,14 @@ - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -+#ifdef REMOVED_BY_PATCH - static inline unsigned long atomic_xchg ( - volatile atomic_t * v, - unsigned value - ) { - return __xchg (value, &v->counter, sizeof (unsigned)); - } /* atomic_xchg */ -+#endif - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ ---- 2/fritz/orig.src/main.c 2007-04-12 16:04:47.000000000 +0200 -+++ 2/fritz/src/main.c 2007-04-12 17:46:41.000000000 +0200 -@@ -27,7 +27,7 @@ - #include <stdarg.h> - #include <asm/uaccess.h> - #include <linux/usb.h> --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/version.h> - #include <linux/kernel.h> - #include <linux/module.h> -@@ -92,7 +92,7 @@ - - static struct usb_driver usb_driver = { - -- .owner = THIS_MODULE, -+// .owner = THIS_MODULE, - .name = TARGET, - .id_table = usb_id_table, - .probe = usb_probe, ---- 2/fritz/orig.src/driver.c 2007-04-12 16:04:47.000000000 +0200 -+++ 2/fritz/src/driver.c 2007-04-12 17:49:45.000000000 +0200 -@@ -434,7 +434,7 @@ - close_func = func; - close_data = data; - -- INIT_WORK (&closing_work, closing_worker, capi_card); -+ INIT_WORK (&closing_work, closing_worker); - schedule_work (&closing_work); - LOG("Worker scheduled.\n"); - } /* start_closing_worker */ Deleted: ipcop/trunk/src/patches/fcdslusb-suse93_2.6.25.patch =================================================================== --- ipcop/trunk/src/patches/fcdslusb-suse93_2.6.25.patch 2008-10-20 22:14:52 UTC (rev 2008) +++ ipcop/trunk/src/patches/fcdslusb-suse93_2.6.25.patch 2008-10-20 22:19:08 UTC (rev 2009) @@ -1,54 +0,0 @@ -diff -Nur fritz.old/1/fritz/src/driver.c fritz/1/fritz/src/driver.c ---- fritz.old/1/fritz/src/driver.c 2008-10-19 17:01:40.000000000 +0200 -+++ fritz/1/fritz/src/driver.c 2008-10-19 16:03:38.000000000 +0200 -@@ -108,9 +108,9 @@ - static DECLARE_TASKLET(rx_tasklet, rx_task, 0); - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); --static DECLARE_MUTEX_LOCKED(hotplug); --static DECLARE_MUTEX_LOCKED(config); --static DECLARE_MUTEX_LOCKED(notify); -+static DECLARE_COMPLETION(hotplug); -+static DECLARE_COMPLETION(config); -+static DECLARE_COMPLETION(notify); - - #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } - #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } -diff -Nur fritz.old/1/fritz/src/driver.h fritz/1/fritz/src/driver.h ---- fritz.old/1/fritz/src/driver.h 2008-10-19 17:01:40.000000000 +0200 -+++ fritz/1/fritz/src/driver.h 2008-10-19 16:08:04.000000000 +0200 -@@ -59,7 +59,6 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; --typedef unsigned long uintptr_t; - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -diff -Nur fritz.old/2/fritz/src/common.h fritz/2/fritz/src/common.h ---- fritz.old/2/fritz/src/common.h 2008-10-19 17:01:40.000000000 +0200 -+++ fritz/2/fritz/src/common.h 2008-10-19 16:06:54.000000000 +0200 -@@ -51,7 +51,6 @@ - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ - typedef long intptr_t; --typedef unsigned long uintptr_t; - - /*---------------------------------------------------------------------------*\ - \*---------------------------------------------------------------------------*/ -diff -Nur fritz.old/2/fritz/src/driver.c fritz/2/fritz/src/driver.c ---- fritz.old/2/fritz/src/driver.c 2008-10-19 17:01:40.000000000 +0200 -+++ fritz/2/fritz/src/driver.c 2008-10-19 16:04:54.000000000 +0200 -@@ -131,9 +131,9 @@ - static DECLARE_TASKLET(rx_tasklet, rx_task, 0); - static DECLARE_WAIT_QUEUE_HEAD(wait); - static DECLARE_WAIT_QUEUE_HEAD(capi_wait); --static DECLARE_MUTEX_LOCKED(hotplug); --static DECLARE_MUTEX_LOCKED(config); --static DECLARE_MUTEX_LOCKED(notify); -+static DECLARE_COMPLETION(hotplug); -+static DECLARE_COMPLETION(config); -+static DECLARE_COMPLETION(notify); - - static DECLARE_WAIT_QUEUE_HEAD(dbg_wait); - static DECLARE_MUTEX_LOCKED(thread_sync); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |