X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/00521c85eea85fbc6b014dddb536edc68ded3054..a2eb4407e9772cf1057e7ea093250d5d38245c1d:/lincan/src/sja1000p.c

diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c
index 7b5a96a..ffadb6c 100644
--- a/lincan/src/sja1000p.c
+++ b/lincan/src/sja1000p.c
@@ -767,7 +767,8 @@ int sja1000p_irq_handler(int irq, struct canchip_t *chip)
 
 		/* (irq_register & sjaIR_TI) */
 		/*	old variant using SJAIR, collides with intended use with irq_accept */
-		if ((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING)) {
+		if (((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING))||
+		    (can_msgobj_test_fl(obj,TX_REQUEST))) {
 			DEBUGMSG("sja1000_irq_handler: TI or TX_PENDING and TBS\n");
 			obj->ret = 0;
 			can_msgobj_set_fl(obj,TX_REQUEST);
@@ -816,11 +817,15 @@ int sja1000p_irq_handler(int irq, struct canchip_t *chip)
 		}
 
 		irq_register=can_read_reg(chip,SJAIR);
-	
+
 		status=can_read_reg(chip,SJASR);
 
-	} while((irq_register & (sjaIR_BEI|sjaIR_EPI|sjaIR_DOI|sjaIR_EI|sjaIR_TI|sjaIR_RI)) ||
-	        ((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING)) ||
+		if(((status & sjaSR_TBS) && can_msgobj_test_fl(obj,TX_PENDING)) ||
+		   (irq_register & sjaIR_TI))
+			 can_msgobj_set_fl(obj,TX_REQUEST);
+
+	} while((irq_register & (sjaIR_BEI|sjaIR_EPI|sjaIR_DOI|sjaIR_EI|sjaIR_RI)) ||
+	        (can_msgobj_test_fl(obj,TX_REQUEST) && !can_msgobj_test_fl(obj,TX_LOCK)) ||
 		(status & sjaSR_RBS));
 
 	return CANCHIP_IRQ_HANDLED;