Separated normal read and RTR assisted read transfer.

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

diff --git a/lincan/src/cc_can104.c b/lincan/src/cc_can104.c
index 68e476baabad6db2da1615b19fa1259b4bce953a..6d0da981ac1477b2594622de34cc0181824b1d8d 100644 (file)
--- a/lincan/src/cc_can104.c
+++ b/lincan/src/cc_can104.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
  */ 
 
 #include "../include/can.h"
@@ -109,7 +109,6 @@ int cc104_init_hw_data(struct candevice_t *candev)
        return 0;
 }
 
-#define CHIP_TYPE "sja1000"
 /**
  * template_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -141,7 +140,7 @@ int cc104_init_hw_data(struct candevice_t *candev)
  */
 int cc104_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type=CHIP_TYPE;
+       sja1000_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=candev->io_addr;
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->flags = 0;
@@ -169,7 +168,7 @@ int cc104_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int cc104_init_obj_data(struct chip_t *chip, int objnr)
+int cc104_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;