X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/11132ea490f9e860744ee4f851c67e7fb4444231..88915658136d08bd5a9cd77e2e008842cbd16cb1:/lincan/src/devcommon.c

diff --git a/lincan/src/devcommon.c b/lincan/src/devcommon.c
index 9cd29d0..c0b6028 100644
--- a/lincan/src/devcommon.c
+++ b/lincan/src/devcommon.c
@@ -6,16 +6,8 @@
  * Version lincan-0.2  9 Jul 2003
  */
 
-#define __NO_VERSION__
-#include <linux/module.h>
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
-#include <linux/malloc.h>
-#else
-#include <linux/slab.h>
-#endif
-#include <linux/wait.h>
 #include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/can_queue.h"
 #include "../include/main.h"
 #include "../include/devcommon.h"
@@ -30,18 +22,35 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
 		/*case CANQUEUE_NOTIFY_EMPTY:*/
 		/*case CANQUEUE_NOTIFY_SPACE:*/
 		/*case CANQUEUE_NOTIFY_NOUSR:
-			wake_up_interruptible(&qends->endinfo.chipinfo.daemonq);
+			wake_up(&qends->endinfo.chipinfo.daemonq);
 			break;*/
 		case CANQUEUE_NOTIFY_PROC:
-			/*wake_up_interruptible(&qends->endinfo.chipinfo.daemonq);*/
+		    #ifndef CAN_WITH_RTL
+			/*wake_up(&qends->endinfo.chipinfo.daemonq);*/
 			chip->chipspecops->wakeup_tx(chip, obj);
+		    #else /*CAN_WITH_RTL*/
+			can_msgobj_set_fl(obj,TX_REQUEST);
+			if(qends->endinfo.chipinfo.worker_thread){
+				can_msgobj_set_fl(obj,WORKER_WAKE);
+				pthread_kill(qends->endinfo.chipinfo.worker_thread,RTL_SIGNAL_WAKEUP);
+				rtl_schedule();
+			} else {
+				set_bit(MSGOBJ_TX_REQUEST_b,&chip->pend_flags);
+
+				if(chip->worker_thread) {
+					set_bit(MSGOBJ_WORKER_WAKE_b,&chip->pend_flags);
+					pthread_kill(chip->worker_thread,RTL_SIGNAL_WAKEUP);
+					rtl_schedule();
+				}
+			}
+		    #endif /*CAN_WITH_RTL*/
 			break;
+		case CANQUEUE_NOTIFY_DEAD_WANTED:
 		case CANQUEUE_NOTIFY_DEAD:
-			if(atomic_read(&qedge->edge_used)>0)
-				atomic_dec(&qedge->edge_used);
+			if(canque_fifo_test_and_clear_fl(&qedge->fifo, READY))
+				canque_edge_decref(qedge);
 			break;
-		case CANQUEUE_NOTIFY_ATACH:
-			atomic_inc(&qedge->edge_used);
+		case CANQUEUE_NOTIFY_ATTACH:
 			break;
 	}
 }
@@ -54,7 +63,9 @@ int canqueue_ends_init_chip(struct canque_ends_t *qends, struct chip_t *chip, st
 	if(ret<0) return ret;
 	
 	qends->context=NULL;
+    #ifndef CAN_WITH_RTL
 	init_waitqueue_head(&qends->endinfo.chipinfo.daemonq);
+    #endif /*CAN_WITH_RTL*/
 	qends->endinfo.chipinfo.chip=chip;
 	qends->endinfo.chipinfo.msgobj=obj;
 	qends->notify=canqueue_notify_chip;
@@ -64,3 +75,14 @@ int canqueue_ends_init_chip(struct canque_ends_t *qends, struct chip_t *chip, st
 }
 
 
+int canqueue_ends_done_chip(struct canque_ends_t *qends)
+{
+	int delayed;
+	
+	/* Finish or kill all outgoing edges listed in inends */
+	delayed=canqueue_ends_kill_inlist(qends, 1);
+	/* Kill all incoming edges listed in outends */
+	delayed|=canqueue_ends_kill_outlist(qends);
+
+	return delayed;
+}