X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/043f872725a79617ec651d16d940c647ea184afc..7c1986e7d366ac059716effeac68e5e081a081c9:/lincan/src/devcommon.c

diff --git a/lincan/src/devcommon.c b/lincan/src/devcommon.c
index 16d21db..bc4157d 100644
--- a/lincan/src/devcommon.c
+++ b/lincan/src/devcommon.c
@@ -3,7 +3,7 @@
  * New CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
 #include "../include/can.h"
@@ -12,10 +12,31 @@
 #include "../include/main.h"
 #include "../include/devcommon.h"
 
+#ifdef CAN_WITH_RTL
+static inline
+void canqueue_wake_chip_worker(struct canque_ends_t *qends, struct canchip_t *chip, struct msgobj_t *obj)
+{
+	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*/
+
+
 /**
  * canqueue_notify_chip - notification callback handler for CAN chips ends of queues
  * @qends: pointer to the callback side ends structure
- * @qedge: edge which invoked notification 
+ * @qedge: edge which invoked notification
  * @what: notification type
  *
  * This function has to deal with more possible cases. It can be called from
@@ -25,7 +46,7 @@
  */
 void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qedge, int what)
 {
-	struct chip_t *chip=qends->endinfo.chipinfo.chip;
+	struct canchip_t *chip=qends->endinfo.chipinfo.chip;
 	struct msgobj_t *obj=qends->endinfo.chipinfo.msgobj;
 
 	DEBUGMSG("canqueue_notify_chip for edge %d and event %d\n",qedge->edge_num,what);
@@ -38,22 +59,13 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
 		case CANQUEUE_NOTIFY_PROC:
 		    #ifndef CAN_WITH_RTL
 			/*wake_up(&qends->endinfo.chipinfo.daemonq);*/
-			chip->chipspecops->wakeup_tx(chip, obj);
+			if(canque_fifo_test_fl(&qedge->fifo, READY)){
+				if ((chip) && (chip->flags & CHIP_ATTACHED))
+					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();
-				}
-			}
+			canqueue_wake_chip_worker(qends, chip, obj);
 		    #endif /*CAN_WITH_RTL*/
 			break;
 		case CANQUEUE_NOTIFY_DEAD_WANTED:
@@ -69,8 +81,10 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
 		    #ifndef CAN_WITH_RTL
 			chip->chipspecops->filtch_rq(chip, obj);
 		    #else /*CAN_WITH_RTL*/
+			can_msgobj_set_fl(obj,FILTCH_REQUEST);
+			canqueue_wake_chip_worker(qends, chip, obj);
 		    #endif /*CAN_WITH_RTL*/
-			
+
 			break;
 	}
 }
@@ -82,12 +96,12 @@ void canqueue_notify_chip(struct canque_ends_t *qends, struct canque_edge_t *qed
  * @chip: pointer to the corresponding CAN chip structure
  * @obj: pointer to the corresponding message object structure
  */
-int canqueue_ends_init_chip(struct canque_ends_t *qends, struct chip_t *chip, struct msgobj_t *obj)
+int canqueue_ends_init_chip(struct canque_ends_t *qends, struct canchip_t *chip, struct msgobj_t *obj)
 {
 	int ret;
 	ret=canqueue_ends_init_gen(qends);
 	if(ret<0) return ret;
-	
+
 	qends->context=NULL;
     #ifndef CAN_WITH_RTL
 	init_waitqueue_head(&qends->endinfo.chipinfo.daemonq);
@@ -110,7 +124,7 @@ 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 */