Revision: 6318
http://ipcop.svn.sourceforge.net/ipcop/?rev=6318&view=rev
Author: owes
Date: 2012-02-05 17:22:03 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
find_task_by_vpid does not exist (anymore), do remove the whole PID finding
stuff.
Not nice but does seem to work, i.e. fcdsl* can be loaded.
Note: the fcdsl* drivers will probably not survive moving to kerel 3.0
Modified Paths:
--------------
ipcop/trunk/src/patches/fcdsl-suse93_2.6.27.patch
ipcop/trunk/src/patches/fcdsl2-suse93_2.6.27.patch
ipcop/trunk/src/patches/fcdslsl-suse93_2.6.27.patch
Modified: ipcop/trunk/src/patches/fcdsl-suse93_2.6.27.patch
===================================================================
--- ipcop/trunk/src/patches/fcdsl-suse93_2.6.27.patch 2012-02-05 16:47:59 UTC
(rev 6317)
+++ ipcop/trunk/src/patches/fcdsl-suse93_2.6.27.patch 2012-02-05 17:22:03 UTC
(rev 6318)
@@ -159,15 +159,27 @@
LOG("Thread[%d] terminated.\n", thread_pid);
}
thread_pid = -1;
-diff -ur fritz/src/driver.c.orig fritz/src/driver.c
---- fritz/src/driver.c.orig 2008-11-09 16:26:46.000000000 +0100
-+++ fritz/src/driver.c 2008-11-09 16:27:28.000000000 +0100
-@@ -1394,7 +1394,7 @@
+--- fritz/src/driver.c 2012-02-04 17:22:10.000000000 +0100
++++ fritz/src/driver.c 2012-02-04 17:25:58.000000000 +0100
+@@ -1394,9 +1394,9 @@
static void kill_thread (void) {
atomic_set (&thread_flag, 0);
- if (NULL == find_task_by_pid (thread_pid)) {
-+ if (NULL == find_task_by_vpid (thread_pid)) {
- LOG("Thread[%d] has died before!\n", thread_pid);
- } else {
+- LOG("Thread[%d] has died before!\n", thread_pid);
+- } else {
++// if (NULL == find_task_by_pid (thread_pid)) {
++// LOG("Thread[%d] has died before!\n", thread_pid);
++// } else {
if (!atomic_read (&thread_capi_flag)) {
+ SCHED_WAKEUP_CAPI;
+ } else {
+@@ -1406,7 +1406,7 @@
+ //down (&hotplug);
+ complete(&thread_sync);
+ LOG("Thread[%d] terminated.\n", thread_pid);
+- }
++// }
+ thread_pid = -1;
+ } /* kill_thread */
+
/*---------------------------------------------------------------------------*\
Modified: ipcop/trunk/src/patches/fcdsl2-suse93_2.6.27.patch
===================================================================
--- ipcop/trunk/src/patches/fcdsl2-suse93_2.6.27.patch 2012-02-05 16:47:59 UTC
(rev 6317)
+++ ipcop/trunk/src/patches/fcdsl2-suse93_2.6.27.patch 2012-02-05 17:22:03 UTC
(rev 6318)
@@ -174,28 +174,47 @@
LOG("Thread[%d] terminated.\n", thread_pid);
}
thread_pid = -1;
-diff -ur fritz/src/driver.c.orig fritz/src/driver.c
---- fritz/src/driver.c.orig 2008-11-09 16:42:06.000000000 +0100
-+++ fritz/src/driver.c 2008-11-09 16:42:58.000000000 +0100
-@@ -412,10 +412,10 @@
+--- fritz/src/driver.c 2012-02-04 17:58:25.000000000 +0100
++++ fritz/src/driver.c 2012-02-04 18:00:23.000000000 +0100
+@@ -412,14 +412,14 @@
static void exit_debug_buffer (dbg_buf_p dbp) {
assert (dbp != NULL);
- info (find_task_by_pid (dbp->pid) != NULL);
-+ info (find_task_by_vpid (dbp->pid) != NULL);
++// info (find_task_by_pid (dbp->pid) != NULL);
LOG("Stopping debug thread...\n");
atomic_set (&dbp->stop, 1);
- if (find_task_by_pid (dbp->pid)) {
-+ if (find_task_by_vpid (dbp->pid)) {
++// if (find_task_by_pid (dbp->pid)) {
wake_up_interruptible (&dbg_wait);
- } else {
- hfree (dbp);
-@@ -1432,7 +1432,7 @@
+- } else {
+- hfree (dbp);
+- }
++// } else {
++// hfree (dbp);
++// }
+ } /* exit_debug_buffer */
+
+
/*---------------------------------------------------------------------------*\
+@@ -1432,9 +1432,9 @@
static void kill_thread (void) {
atomic_set (&thread_flag, 0);
- if (NULL == find_task_by_pid (thread_pid)) {
-+ if (NULL == find_task_by_vpid (thread_pid)) {
- LOG("Thread[%d] has died before!\n", thread_pid);
- } else {
+- LOG("Thread[%d] has died before!\n", thread_pid);
+- } else {
++// if (NULL == find_task_by_pid (thread_pid)) {
++// LOG("Thread[%d] has died before!\n", thread_pid);
++// } else {
if (!atomic_read (&thread_capi_flag)) {
+ SCHED_WAKEUP_CAPI;
+ } else {
+@@ -1444,7 +1444,7 @@
+ wait_for_completion(&thread_sync);
+ //down (&thread_sync);
+ LOG("Thread[%d] terminated.\n", thread_pid);
+- }
++// }
+ thread_pid = -1;
+ } /* kill_thread */
+
Modified: ipcop/trunk/src/patches/fcdslsl-suse93_2.6.27.patch
===================================================================
--- ipcop/trunk/src/patches/fcdslsl-suse93_2.6.27.patch 2012-02-05 16:47:59 UTC
(rev 6317)
+++ ipcop/trunk/src/patches/fcdslsl-suse93_2.6.27.patch 2012-02-05 17:22:03 UTC
(rev 6318)
@@ -172,28 +172,47 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-diff -ur fritz/src/driver.c.orig fritz/src/driver.c
---- fritz/src/driver.c.orig 2008-11-09 16:42:06.000000000 +0100
-+++ fritz/src/driver.c 2008-11-09 16:42:58.000000000 +0100
-@@ -412,10 +412,10 @@
+--- fritz/src/driver.c 2012-02-04 18:04:25.000000000 +0100
++++ fritz/src/driver.c 2012-02-04 18:05:24.000000000 +0100
+@@ -412,14 +412,14 @@
static void exit_debug_buffer (dbg_buf_p dbp) {
assert (dbp != NULL);
- info (find_task_by_pid (dbp->pid) != NULL);
-+ info (find_task_by_vpid (dbp->pid) != NULL);
++// info (find_task_by_pid (dbp->pid) != NULL);
LOG("Stopping debug thread...\n");
atomic_set (&dbp->stop, 1);
- if (find_task_by_pid (dbp->pid)) {
-+ if (find_task_by_vpid (dbp->pid)) {
++// if (find_task_by_pid (dbp->pid)) {
wake_up_interruptible (&dbg_wait);
- } else {
- hfree (dbp);
-@@ -1432,7 +1432,7 @@
+- } else {
+- hfree (dbp);
+- }
++// } else {
++// hfree (dbp);
++// }
+ } /* exit_debug_buffer */
+
+
/*---------------------------------------------------------------------------*\
+@@ -1432,9 +1432,9 @@
static void kill_thread (void) {
atomic_set (&thread_flag, 0);
- if (NULL == find_task_by_pid (thread_pid)) {
-+ if (NULL == find_task_by_vpid (thread_pid)) {
- LOG("Thread[%d] has died before!\n", thread_pid);
- } else {
+- LOG("Thread[%d] has died before!\n", thread_pid);
+- } else {
++// if (NULL == find_task_by_pid (thread_pid)) {
++// LOG("Thread[%d] has died before!\n", thread_pid);
++// } else {
if (!atomic_read (&thread_capi_flag)) {
+ SCHED_WAKEUP_CAPI;
+ } else {
+@@ -1444,7 +1444,7 @@
+ //down (&thread_sync);
+ wait_for_completion(&thread_sync);
+ LOG("Thread[%d] terminated.\n", thread_pid);
+- }
++// }
+ thread_pid = -1;
+ } /* kill_thread */
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
