X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/5282a3d5b5624f59a4a11b061368e523934fe5f0..4e95a8113be1f7fb1538faec4d0d84e5c3fd4979:/lincan/src/i82527.c

diff --git a/lincan/src/i82527.c b/lincan/src/i82527.c
index d5c7b24..eb89220 100644
--- a/lincan/src/i82527.c
+++ b/lincan/src/i82527.c
@@ -248,7 +248,7 @@ int i82527_clear_objects(struct canchip_t *chip)
 
 	DEBUGMSG("Cleared all message objects on chip\n");
 
-	for (i=1; i<=15; i++) {
+	for (i=0; i<chip->max_objects; i++) {
 		obj=chip->msgobj[i];
 		canobj_write_reg(chip,obj,(INTPD_RES|RXIE_RES|TXIE_RES|MVAL_RES),iMSGCTL0);
 		canobj_write_reg(chip,obj,(NEWD_RES|MLST_RES|TXRQ_RES|RMPD_RES), iMSGCTL1);
@@ -616,6 +616,8 @@ void i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 			}
 		}
 
+		mb();
+
 		can_msgobj_clear_fl(obj,TX_LOCK);
 		if(can_msgobj_test_fl(obj,TX_REQUEST))
 			continue;
@@ -630,6 +632,7 @@ int i82527_irq_handler(int irq, struct canchip_t *chip)
 	unsigned char msgcfg;
 
 	unsigned irq_register;
+	unsigned status_register;
 	unsigned object;
 	struct msgobj_t *obj;
 	int loop_cnt=CHIP_MAX_IRQLOOP;
@@ -656,14 +659,15 @@ int i82527_irq_handler(int irq, struct canchip_t *chip)
 		DEBUGMSG("i82527: iIRQ 0x%02x\n",irq_register);
 		
 		if (irq_register == 0x01) {
-			DEBUGMSG("Status register: 0x%x\n",can_read_reg(chip, iSTAT));
+			status_register=can_read_reg(chip, iSTAT);
+			CANMSG("Status register: 0x%x\n",status_register);
 			continue;
 			/*return CANCHIP_IRQ_NONE;*/
 		}
 		
 		if (irq_register == 0x02)
 			object = 14;
-		else if(irq_register < 14)
+		else if(irq_register <= 13+3)
 			object = irq_register-3;
 		else
 			return CANCHIP_IRQ_NONE;