X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a4c9ead4b64bd4de307f375c2ff313a7a07a06e0..542ecdc96eda5b8ab56ad87bafbe612b4f5204f2:/lincan/src/i82527.c

diff --git a/lincan/src/i82527.c b/lincan/src/i82527.c
index f71a16a..4ffad17 100644
--- a/lincan/src/i82527.c
+++ b/lincan/src/i82527.c
@@ -12,7 +12,7 @@
 #include "../include/main.h"
 #include "../include/i82527.h"
 
-void i82527_irq_rtr_handler(struct chip_t *chip, struct msgobj_t *obj, 
+void i82527_irq_rtr_handler(struct canchip_t *chip, struct msgobj_t *obj, 
 			    struct rtr_id *rtr_search, unsigned long message_id);
 
 
@@ -23,7 +23,7 @@ extern int mo15mask;
 /* helper functions for segmented cards read and write configuration and status registers
    above 0xf offset */
 
-void i82527_seg_write_reg(const struct chip_t *chip, unsigned char data, unsigned address)
+void i82527_seg_write_reg(const struct canchip_t *chip, unsigned char data, unsigned address)
 {
 	if((address > 0xf) && (chip->flags & CHIP_SEGMENTED))
 		canobj_write_reg(chip, chip->msgobj[(address>>4)-1],data, address & 0xf);
@@ -31,7 +31,7 @@ void i82527_seg_write_reg(const struct chip_t *chip, unsigned char data, unsigne
 		can_write_reg(chip, data, address);
 }
 
-unsigned i82527_seg_read_reg(const struct chip_t *chip, unsigned address)
+unsigned i82527_seg_read_reg(const struct canchip_t *chip, unsigned address)
 {
 	if((address > 0xf) && (chip->flags & CHIP_SEGMENTED))
 		return canobj_read_reg(chip, chip->msgobj[(address>>4)-1], address & 0xf);
@@ -39,7 +39,7 @@ unsigned i82527_seg_read_reg(const struct chip_t *chip, unsigned address)
 		return can_read_reg(chip, address);
 }
 
-int i82527_enable_configuration(struct chip_t *chip)
+int i82527_enable_configuration(struct canchip_t *chip)
 {
 	unsigned short flags=0;
 
@@ -49,7 +49,7 @@ int i82527_enable_configuration(struct chip_t *chip)
 	return 0;
 }
 
-int i82527_disable_configuration(struct chip_t *chip)
+int i82527_disable_configuration(struct canchip_t *chip)
 {
 	unsigned short flags=0;
 
@@ -59,7 +59,7 @@ int i82527_disable_configuration(struct chip_t *chip)
 	return 0;
 }
 
-int i82527_chip_config(struct chip_t *chip)
+int i82527_chip_config(struct canchip_t *chip)
 {
 	can_write_reg(chip,chip->int_cpu_reg,iCPU); // Configure cpu interface
 	can_write_reg(chip,(iCTL_CCE|iCTL_INI),iCTL); // Enable configuration
@@ -121,7 +121,7 @@ int i82527_chip_config(struct chip_t *chip)
  * param sampl_pt sample point in % (0-100) sets (TSEG1+2)/(TSEG1+TSEG2+3) ratio
  * param flags fields BTR1_SAM, OCMODE, OCPOL, OCTP, OCTN, CLK_OFF, CBP
  */
-int i82527_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
+int i82527_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
 							int sampl_pt, int flags)
 {
 	int best_error = 1000000000, error;
@@ -185,7 +185,7 @@ int i82527_baud_rate(struct chip_t *chip, int rate, int clock, int sjw,
 	return 0;
 }
 
-int i82527_standard_mask(struct chip_t *chip, unsigned short code, unsigned short mask)
+int i82527_standard_mask(struct canchip_t *chip, unsigned short code, unsigned short mask)
 {
 	unsigned char mask0, mask1;
 
@@ -200,7 +200,7 @@ int i82527_standard_mask(struct chip_t *chip, unsigned short code, unsigned shor
 	return 0;
 }
 
-int i82527_extended_mask(struct chip_t *chip, unsigned long code, unsigned long mask)
+int i82527_extended_mask(struct canchip_t *chip, unsigned long code, unsigned long mask)
 {
 	unsigned char mask0, mask1, mask2, mask3;
 
@@ -219,7 +219,7 @@ int i82527_extended_mask(struct chip_t *chip, unsigned long code, unsigned long
 	return 0;
 }
 
-int i82527_message15_mask(struct chip_t *chip, unsigned long code, unsigned long mask)
+int i82527_message15_mask(struct canchip_t *chip, unsigned long code, unsigned long mask)
 {
 	unsigned char mask0, mask1, mask2, mask3;
 
@@ -240,7 +240,7 @@ int i82527_message15_mask(struct chip_t *chip, unsigned long code, unsigned long
 
 }
 
-int i82527_clear_objects(struct chip_t *chip)
+int i82527_clear_objects(struct canchip_t *chip)
 {
 	int i=0,id=0,data=0;
 	struct msgobj_t *obj;
@@ -271,14 +271,14 @@ int i82527_clear_objects(struct chip_t *chip)
 	return 0;
 }
 
-int i82527_config_irqs(struct chip_t *chip, short irqs)
+int i82527_config_irqs(struct canchip_t *chip, short irqs)
 {
 	can_write_reg(chip,irqs,iCTL);
 	DEBUGMSG("Configured hardware interrupt delivery\n");
 	return 0;
 }
 
-int i82527_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
+int i82527_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	unsigned long id=obj->rx_preconfig_id;
 
@@ -306,7 +306,7 @@ int i82527_pre_read_config(struct chip_t *chip, struct msgobj_t *obj)
 	return 0;
 }
 
-int i82527_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
+int i82527_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj,
 							struct canmsg_t *msg)
 {
 	int i=0,id0=0,id1=0,id2=0,id3=0;
@@ -346,7 +346,7 @@ int i82527_pre_write_config(struct chip_t *chip, struct msgobj_t *obj,
 	return 0;
 }
 
-int i82527_send_msg(struct chip_t *chip, struct msgobj_t *obj,
+int i82527_send_msg(struct canchip_t *chip, struct msgobj_t *obj,
 							struct canmsg_t *msg)
 {
 	canobj_write_reg(chip,obj,(MVAL_SET|TXIE_SET|RXIE_RES|INTPD_RES),iMSGCTL0);
@@ -361,7 +361,7 @@ int i82527_send_msg(struct chip_t *chip, struct msgobj_t *obj,
 	return 0;
 }
 
-int i82527_check_tx_stat(struct chip_t *chip)
+int i82527_check_tx_stat(struct canchip_t *chip)
 {
 	if (can_read_reg(chip,iSTAT) & iSTAT_TXOK) {
 		can_write_reg(chip,0x0,iSTAT);
@@ -373,7 +373,7 @@ int i82527_check_tx_stat(struct chip_t *chip)
 	}
 }
 
-int i82527_remote_request(struct chip_t *chip, struct msgobj_t *obj)
+int i82527_remote_request(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	canobj_write_reg(chip,obj,(MVAL_SET|TXIE_RES|RXIE_SET|INTPD_RES),iMSGCTL0);
 	canobj_write_reg(chip,obj,(RMPD_RES|TXRQ_SET|MLST_RES|NEWD_RES),iMSGCTL1);
@@ -381,7 +381,7 @@ int i82527_remote_request(struct chip_t *chip, struct msgobj_t *obj)
 	return 0;
 }
 
-int i82527_set_btregs(struct chip_t *chip, unsigned short btr0,
+int i82527_set_btregs(struct canchip_t *chip, unsigned short btr0,
 							unsigned short btr1)
 {
 	if (i82527_enable_configuration(chip))
@@ -395,7 +395,7 @@ int i82527_set_btregs(struct chip_t *chip, unsigned short btr0,
 	return 0;
 }
 
-int i82527_start_chip(struct chip_t *chip)
+int i82527_start_chip(struct canchip_t *chip)
 {
 	unsigned short flags = 0;
 
@@ -405,7 +405,7 @@ int i82527_start_chip(struct chip_t *chip)
 	return 0;
 }
 
-int i82527_stop_chip(struct chip_t *chip)
+int i82527_stop_chip(struct canchip_t *chip)
 {
 	unsigned short flags = 0;
 
@@ -416,7 +416,7 @@ int i82527_stop_chip(struct chip_t *chip)
 }
 
 static inline 
-void i82527_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
+void i82527_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	int cmd;
 
@@ -425,6 +425,9 @@ void i82527_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
 	if(obj->tx_slot){
 		/* Do local transmitted message distribution if enabled */
 		if (processlocal){
+			/* fill CAN message timestamp */
+			can_filltimestamp(&obj->tx_slot->msg.timestamp);
+
 			obj->tx_slot->msg.flags |= MSG_LOCAL;
 			canque_filter_msg2edges(obj->qends, &obj->tx_slot->msg);
 		}
@@ -455,7 +458,7 @@ void i82527_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj)
 }
 
 static inline
-void i82527_irq_read_handler(struct chip_t *chip, struct msgobj_t *obj, int objnum)
+void i82527_irq_read_handler(struct canchip_t *chip, struct msgobj_t *obj, int objnum)
 {
 	int i;
 	unsigned long message_id;
@@ -514,6 +517,9 @@ void i82527_irq_read_handler(struct chip_t *chip, struct msgobj_t *obj, int objn
 		}
 		
 
+		/* fill CAN message timestamp */
+		can_filltimestamp(&obj->rx_msg.timestamp);
+
 		canque_filter_msg2edges(obj->qends, &obj->rx_msg);
 		
 		if (msgctl1 & NEWD_SET)
@@ -559,7 +565,7 @@ void i82527_irq_read_handler(struct chip_t *chip, struct msgobj_t *obj, int objn
 
 
 static inline 
-void i82527_irq_update_filter(struct chip_t *chip, struct msgobj_t *obj)
+void i82527_irq_update_filter(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	struct canfilt_t filt;
 
@@ -581,7 +587,7 @@ void i82527_irq_update_filter(struct chip_t *chip, struct msgobj_t *obj)
 }
 
 
-void i82527_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
+void i82527_irq_sync_activities(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)) {
 
@@ -605,14 +611,14 @@ void i82527_irq_sync_activities(struct chip_t *chip, struct msgobj_t *obj)
 	}
 }
 
-can_irqreturn_t i82527_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+int i82527_irq_handler(int irq, struct canchip_t *chip)
 {
 	unsigned char msgcfg;
 
 	unsigned irq_register;
 	unsigned object;
-	struct chip_t *chip=(struct chip_t *)dev_id;
 	struct msgobj_t *obj;
+	int loop_cnt=CHIP_MAX_IRQLOOP;
 
 	/*put_reg=device->hwspecops->write_register;*/
 	/*get_reg=device->hwspecops->read_register;*/
@@ -621,18 +627,24 @@ can_irqreturn_t i82527_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 
 	if(!irq_register) {
 		DEBUGMSG("i82527: spurious IRQ\n");
-		return CAN_IRQ_NONE;
+		return CANCHIP_IRQ_NONE;
 	}
 
 
 	do {
 
+		if(!loop_cnt--) {
+			CANMSG("i82527_irq_handler IRQ %d stuck\n",irq);
+			CANMSG("i82527_irq_register 0x%x\n",irq_register);
+			return CANCHIP_IRQ_STUCK;
+		}
+		
 		DEBUGMSG("i82527: iIRQ 0x%02x\n",irq_register);
 		
 		if (irq_register == 0x01) {
 			DEBUGMSG("Status register: 0x%x\n",can_read_reg(chip, iSTAT));
 			continue;
-			/*return CAN_IRQ_NONE;*/
+			/*return CANCHIP_IRQ_NONE;*/
 		}
 		
 		if (irq_register == 0x02)
@@ -640,7 +652,7 @@ can_irqreturn_t i82527_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 		else if(irq_register < 14)
 			object = irq_register-3;
 		else
-			return CAN_IRQ_NONE;
+			return CANCHIP_IRQ_NONE;
 
 		obj=chip->msgobj[object];
 		
@@ -655,13 +667,15 @@ can_irqreturn_t i82527_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 
 			i82527_irq_read_handler(chip, obj, object); 
 		}
+		
+		irq_register=i82527_seg_read_reg(chip, iIRQ);
 
-	} while((irq_register=i82527_seg_read_reg(chip, iIRQ)) != 0);
+	} while(irq_register != 0);
 
-	return CAN_IRQ_HANDLED;
+	return CANCHIP_IRQ_HANDLED;
 }
 
-void i82527_irq_rtr_handler(struct chip_t *chip, struct msgobj_t *obj,
+void i82527_irq_rtr_handler(struct canchip_t *chip, struct msgobj_t *obj,
 			    struct rtr_id *rtr_search, unsigned long message_id)
 {
 	short int i=0;
@@ -693,7 +707,7 @@ void i82527_irq_rtr_handler(struct chip_t *chip, struct msgobj_t *obj,
  * Return Value: negative value reports error.
  * File: src/i82527.c
  */
-int i82527_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
+int i82527_wakeup_tx(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	can_preempt_disable();
 	
@@ -707,7 +721,7 @@ int i82527_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj)
 	return 0;
 }
 
-int i82527_filtch_rq(struct chip_t *chip, struct msgobj_t *obj)
+int i82527_filtch_rq(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	can_preempt_disable();
 	
@@ -744,3 +758,11 @@ int i82527_register(struct chipspecops_t *chipspecops)
 	chipspecops->irq_handler = i82527_irq_handler;
 	return 0;
 }
+
+int i82527_fill_chipspecops(struct canchip_t *chip)
+{
+	chip->chip_type="i82527";
+	chip->max_objects=15;
+	i82527_register(chip->chipspecops);
+	return 0;
+}