To prevent future name collisions "chip_t" changed to "canchip_t"

[lincan.git] / lincan / src / bfadcan.c

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index 31c6292df653f50cd8e42e1dd3e29d1facd22532..39d52e70aad74f4a1836eb9af4521ba8d265c98c 100644 (file)
--- 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.
@@ -105,7 +105,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 +161,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,7 +196,7 @@ 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;
@@ -210,7 +209,7 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
        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 +234,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;