X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/cc1811f284f00d214e198cb20b466d261201385b..b34a548a5dfd2f0b068fd835a4cd51680d851068:/lincan/src/sja1000p.c

diff --git a/lincan/src/sja1000p.c b/lincan/src/sja1000p.c
index b34e984..eafed8a 100644
--- a/lincan/src/sja1000p.c
+++ b/lincan/src/sja1000p.c
@@ -23,7 +23,7 @@ int sja1000p_enable_configuration(struct chip_t *chip)
 	int i=0;
 	enum sja1000_PeliCAN_MOD flags;
 
-	disable_irq(chip->chip_irq);
+	can_disable_irq(chip->chip_irq);
 
 	flags=can_read_reg(chip,SJAMOD);
 
@@ -37,7 +37,7 @@ int sja1000p_enable_configuration(struct chip_t *chip)
 	}
 	if (i>=10) {
 		CANMSG("Reset error\n");
-		enable_irq(chip->chip_irq);
+		can_enable_irq(chip->chip_irq);
 		return -ENODEV;
 	}
 
@@ -69,7 +69,7 @@ int sja1000p_disable_configuration(struct chip_t *chip)
 		return -ENODEV;
 	}
 
-	enable_irq(chip->chip_irq);
+	can_enable_irq(chip->chip_irq);
 
 	return 0;
 }
@@ -605,7 +605,7 @@ void sja1000p_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
  * message queues.
  * File: src/sja1000p.c
  */
-irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+can_irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
 	int irq_register, status, error_code;
 	struct chip_t *chip=(struct chip_t *)dev_id;
@@ -617,11 +617,11 @@ irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 //					can_read_reg(chip,SJASR));
 
 	if ((irq_register & (IR_BEI|IR_EPI|IR_DOI|IR_EI|IR_TI|IR_RI)) == 0)
-		return IRQ_NONE;
+		return CAN_IRQ_NONE;
 
-	if(!obj->flags & OBJ_BUFFERS_ALLOCATED) {
-		CANMSG("sja1000p_irq_handler: called with device closed, irq_register 0x%02x\n", irq_register);
-		return IRQ_NONE;
+	if(!(chip->flags&CHIP_CONFIGURED)) {
+		CANMSG("sja1000p_irq_handler: called for non-configured device, irq_register 0x%02x\n", irq_register);
+		return CAN_IRQ_NONE;
 	}
 
 	if ((irq_register & IR_RI) != 0) {
@@ -632,15 +632,15 @@ irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 	if ((irq_register & IR_TI) != 0) {
 		DEBUGMSG("sja1000_irq_handler: TI\n");
 		obj->ret = 0;
-		set_bit(OBJ_TX_REQUEST,&obj->flags);
-		while(!test_and_set_bit(OBJ_TX_LOCK,&obj->flags)){
-			clear_bit(OBJ_TX_REQUEST,&obj->flags);
+		can_msgobj_set_fl(obj,TX_REQUEST);
+		while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)){
+			can_msgobj_clear_fl(obj,TX_REQUEST);
 
 			if (can_read_reg(chip, SJASR) & SR_TBS)
 				sja1000p_irq_write_handler(chip, obj);
 
-			clear_bit(OBJ_TX_LOCK,&obj->flags);
-			if(!test_bit(OBJ_TX_REQUEST,&obj->flags)) break;
+			can_msgobj_clear_fl(obj,TX_LOCK);
+			if(!can_msgobj_test_fl(obj,TX_REQUEST)) break;
 			DEBUGMSG("TX looping in sja1000_irq_handler\n");
 		}
 	}
@@ -677,7 +677,7 @@ irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 		obj->tx_retry_cnt=0;
 	}
 
-	return IRQ_HANDLED;
+	return CAN_IRQ_HANDLED;
 }
 
 /**
@@ -690,29 +690,24 @@ irqreturn_t sja1000p_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
  */
 int sja1000p_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
 {
-	 /* dummy lock to prevent preemption fully portable way */
-	can_spinlock_t dummy_lock;
 	
-	/*  preempt_disable() */
-	can_spin_lock_init(&dummy_lock);
-	can_spin_lock(&dummy_lock);
+	can_preempt_disable();
 	
-	set_bit(OBJ_TX_REQUEST,&obj->flags);
-	while(!test_and_set_bit(OBJ_TX_LOCK,&obj->flags)){
-		clear_bit(OBJ_TX_REQUEST,&obj->flags);
+	can_msgobj_set_fl(obj,TX_REQUEST);
+	while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)){
+		can_msgobj_clear_fl(obj,TX_REQUEST);
 
 		if (can_read_reg(chip, SJASR) & SR_TBS){
 			obj->tx_retry_cnt=0;
 			sja1000p_irq_write_handler(chip, obj);
 		}
 	
-		clear_bit(OBJ_TX_LOCK,&obj->flags);
-		if(!test_bit(OBJ_TX_REQUEST,&obj->flags)) break;
+		can_msgobj_clear_fl(obj,TX_LOCK);
+		if(!can_msgobj_test_fl(obj,TX_REQUEST)) break;
 		DEBUGMSG("TX looping in sja1000p_wakeup_tx\n");
 	}
 
-	/* preempt_enable(); */
-	can_spin_unlock(&dummy_lock);
+	can_preempt_enable();
 	return 0;
 }