X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a4c9ead4b64bd4de307f375c2ff313a7a07a06e0..ce93567bb929614d283a248bc8dbf4caec26e59b:/lincan/src/cc_can104.c diff --git a/lincan/src/cc_can104.c b/lincan/src/cc_can104.c index 9df4b71..2dafc3d 100644 --- a/lincan/src/cc_can104.c +++ b/lincan/src/cc_can104.c @@ -11,7 +11,6 @@ #include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/cc_can104.h" -#include "../include/i82527.h" #include "../include/sja1000.h" /* @@ -109,7 +108,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 +139,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 +167,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;