X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/626f7414aee3ecd51ab35d093314919528f67b12..342df29e2031e12a3e928420873cbebeb85d645a:/lincan/src/bfadcan.c

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index 31c6292..78c7660 100644
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -4,7 +4,7 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */ 
 
 /* This file is intended as a bfadcan file for currently unsupported hardware.
@@ -18,7 +18,6 @@
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
-#include "../include/i82527.h"
 #include "../include/sja1000p.h"
 
 #define __NO_VERSION__
@@ -105,7 +104,7 @@ int bfadcan_reset(struct candevice_t *candev)
 {
 
 	int i;
-	struct chip_t *chip=candev->chip[0];
+	struct canchip_t *chip=candev->chip[0];
 	unsigned cdr;
 	
 	bfadcan_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
@@ -161,7 +160,6 @@ int bfadcan_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
-#define CHIP_TYPE "sja1000p"
 /**
  * bfadcan_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -197,20 +195,16 @@ int bfadcan_init_hw_data(struct candevice_t *candev)
 int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	unsigned int id1, id2;
-	candev->chip[chipnr]->chip_type=CHIP_TYPE;
+	sja1000p_fill_chipspecops(candev->chip[chipnr]);
 	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
 	candev->chip[chipnr]->clock = clock_freq;
-	candev->chip[chipnr]->int_cpu_reg = iCPU_DSC;
-	candev->chip[chipnr]->int_clk_reg = iCLK_SL1;
-	candev->chip[chipnr]->int_bus_reg = iBUS_CBY;
 	candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
-	candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL |
-								sjaOCR_TX0_LH;
+	candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;
 	id1 = inb(0xe284);
 	id2 = inb(0xe285);
 
 
-	CANMSG("can driver ver lincan-0.2, at %04lx, CPLD v%d.%d.%d.%d\n",
+	CANMSG("can driver ver lincan-0.3, at %04lx, CPLD v%d.%d.%d.%d\n",
 			                candev->chip[chipnr]->chip_base_addr,
 					                id1>>4, id1&0x0f, id2>>4, id2&0x0f);
 
@@ -235,7 +229,7 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
-int bfadcan_init_obj_data(struct chip_t *chip, int objnr)
+int bfadcan_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10;