X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/src/sja1000.c

diff --git a/lincan/src/sja1000.c b/lincan/src/sja1000.c
index 4ade9af..507d911 100644
--- a/lincan/src/sja1000.c
+++ b/lincan/src/sja1000.c
@@ -93,23 +93,23 @@ int sja1000_chip_config(struct canchip_t *chip)
 		return -ENODEV;
 
 	/* Set mode, clock out, comparator */
-	can_write_reg(chip,chip->sja_cdr_reg,SJACDR); 
+	can_write_reg(chip,chip->sja_cdr_reg,SJACDR);
 	/* Set driver output configuration */
-	can_write_reg(chip,chip->sja_ocr_reg,SJAOCR); 
+	can_write_reg(chip,chip->sja_ocr_reg,SJAOCR);
 
 	if (sja1000_standard_mask(chip,0x0000, 0xffff))
 		return -ENODEV;
-	
+
 	if (!chip->baudrate)
 		chip->baudrate=1000000;
 	if (sja1000_baud_rate(chip,chip->baudrate,chip->clock,0,75,0))
 		return -ENODEV;
 
 	/* Enable hardware interrupts */
-	can_write_reg(chip,(sjaCR_RIE|sjaCR_TIE|sjaCR_EIE|sjaCR_OIE),SJACR); 
+	can_write_reg(chip,(sjaCR_RIE|sjaCR_TIE|sjaCR_EIE|sjaCR_OIE),SJACR);
 
 	sja1000_disable_configuration(chip);
-	
+
 	return 0;
 }
 
@@ -120,16 +120,16 @@ int sja1000_standard_mask(struct canchip_t *chip, unsigned short code, unsigned
 	if (sja1000_enable_configuration(chip))
 		return -ENODEV;
 
-	/* The acceptance code bits (SJAACR bits 0-7) and the eight most 
+	/* The acceptance code bits (SJAACR bits 0-7) and the eight most
 	 * significant bits of the message identifier (id.10 to id.3) must be
-	 * equal to those bit positions which are marked relevant by the 
+	 * equal to those bit positions which are marked relevant by the
 	 * acceptance mask bits (SJAAMR bits 0-7).
 	 * (id.10 to id.3) = (SJAACR.7 to SJAACR.0) v (SJAAMR.7 to SJAAMR.0)
 	 * (Taken from Philips sja1000 Data Sheet)
 	 */
 	write_code = (unsigned char) code >> 3;
 	write_mask = (unsigned char) mask >> 3;
-	
+
 	can_write_reg(chip,write_code,SJAACR);
 	can_write_reg(chip,write_mask,SJAAMR);
 
@@ -154,7 +154,7 @@ int sja1000_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
 	int best_error = 1000000000, error;
 	int best_tseg=0, best_brp=0, best_rate=0, brp=0;
 	int tseg=0, tseg1=0, tseg2=0;
-	
+
 	if (sja1000_enable_configuration(chip))
 		return -ENODEV;
 
@@ -214,9 +214,9 @@ int sja1000_baud_rate(struct canchip_t *chip, int rate, int clock, int sjw,
 int sja1000_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	int i;
-	
+
 	i=can_read_reg(chip,SJASR);
-	
+
 	if (!(i&sjaSR_RBS)) {
 //Temp
 		for (i=0; i<0x20; i++)
@@ -226,7 +226,7 @@ int sja1000_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 	sja1000_start_chip(chip);
 
     // disable interrupts for a moment
-	can_write_reg(chip, 0, SJACR); 
+	can_write_reg(chip, 0, SJACR);
 
 	sja1000_irq_read_handler(chip, obj);
 
@@ -239,7 +239,7 @@ int sja1000_pre_read_config(struct canchip_t *chip, struct msgobj_t *obj)
 
 #define MAX_TRANSMIT_WAIT_LOOPS 10
 
-int sja1000_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj, 
+int sja1000_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj,
 							struct canmsg_t *msg)
 {
 	int i=0, id=0;
@@ -248,11 +248,11 @@ int sja1000_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj,
 	sja1000_start_chip(chip); //sja1000 goes automatically into reset mode on errors
 
 	/* Wait until Transmit Buffer Status is released */
-	while ( !(can_read_reg(chip, SJASR) & sjaSR_TBS) && 
+	while ( !(can_read_reg(chip, SJASR) & sjaSR_TBS) &&
 						i++<MAX_TRANSMIT_WAIT_LOOPS) {
 		udelay(i);
 	}
-	
+
 	if (!(can_read_reg(chip, SJASR) & sjaSR_TBS)) {
 		CANMSG("Transmit timed out, cancelling\n");
 		can_write_reg(chip, sjaCMR_AT, SJACMR);
@@ -280,7 +280,7 @@ int sja1000_pre_write_config(struct canchip_t *chip, struct msgobj_t *obj,
 	return 0;
 }
 
-int sja1000_send_msg(struct canchip_t *chip, struct msgobj_t *obj, 
+int sja1000_send_msg(struct canchip_t *chip, struct msgobj_t *obj,
 							struct canmsg_t *msg)
 {
 	can_write_reg(chip, sjaCMR_TR, SJACMR);
@@ -296,7 +296,7 @@ int sja1000_check_tx_stat(struct canchip_t *chip)
 		return 1;
 }
 
-int sja1000_set_btregs(struct canchip_t *chip, unsigned short btr0, 
+int sja1000_set_btregs(struct canchip_t *chip, unsigned short btr0,
 							unsigned short btr1)
 {
 	if (sja1000_enable_configuration(chip))
@@ -390,10 +390,10 @@ int sja1000_irq_handler(int irq, struct canchip_t *chip)
 			return CANCHIP_IRQ_STUCK;
 		}
 
-		if ((irq_register & sjaIR_RI) != 0) 
+		if ((irq_register & sjaIR_RI) != 0)
 			sja1000_irq_read_handler(chip, obj);
 
-		if ((irq_register & sjaIR_TI) != 0) { 
+		if ((irq_register & sjaIR_TI) != 0) {
 			can_msgobj_set_fl(obj,TX_REQUEST);
 			while(!can_msgobj_test_and_set_fl(obj,TX_LOCK)){
 				can_msgobj_clear_fl(obj,TX_REQUEST);
@@ -406,7 +406,7 @@ int sja1000_irq_handler(int irq, struct canchip_t *chip)
 			}
 		}
 
-		if ((irq_register & (sjaIR_EI|sjaIR_DOI)) != 0) { 
+		if ((irq_register & (sjaIR_EI|sjaIR_DOI)) != 0) {
 			// Some error happened
 // FIXME: chip should be brought to usable state. Transmission cancelled if in progress.
 // Reset flag set to 0 if chip is already off the bus. Full state report
@@ -424,7 +424,7 @@ int sja1000_irq_handler(int irq, struct canchip_t *chip)
 		irq_register=can_read_reg(chip, SJAIR);
 
 	} while(irq_register & (sjaIR_WUI|sjaIR_DOI|sjaIR_EI|sjaIR_TI|sjaIR_RI));
-	
+
 	return CANCHIP_IRQ_HANDLED;
 }
 
@@ -455,13 +455,13 @@ void sja1000_irq_read_handler(struct canchip_t *chip, struct msgobj_t *obj)
 void sja1000_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	int cmd;
-	
+
 	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);
 		}
@@ -501,14 +501,14 @@ void sja1000_irq_write_handler(struct canchip_t *chip, struct msgobj_t *obj)
 int sja1000_wakeup_tx(struct canchip_t *chip, struct msgobj_t *obj)
 {
 	can_preempt_disable();
-	
+
 	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) & sjaSR_TBS)
 			sja1000_irq_write_handler(chip, obj);
-	
+
 		can_msgobj_clear_fl(obj,TX_LOCK);
 		if(!can_msgobj_test_fl(obj,TX_REQUEST)) break;
 	}