From: ppisa <ppisa>
Date: Thu, 19 Jan 2006 18:42:20 +0000 (+0000)
Subject: Correction of the abnormal looping in SJA1000P ISR reported by Tomas Kupilik.
X-Git-Tag: CLT_COMM_CAN-lincan-0_3_2~2
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/4e95a8113be1f7fb1538faec4d0d84e5c3fd4979?hp=6e50f3ee73606b7f3df138dc79b3272e39108338

Correction of the abnormal looping in SJA1000P ISR reported by Tomas Kupilik.
---

diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c
index 7b5a96a..36319a1 100644
--- a/lincan/src/sja1000p.c
+++ b/lincan/src/sja1000p.c
@@ -816,11 +816,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_PENDING) && !can_msgobj_test_fl(obj,TX_LOCK)) ||
 		(status & sjaSR_RBS));
 
 	return CANCHIP_IRQ_HANDLED;