X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/626f7414aee3ecd51ab35d093314919528f67b12..6250b3805fb7e368adf1e3f7ca39c8cc617bccff:/lincan/src/aim104.c diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c index ab8bd27..485186b 100644 --- a/lincan/src/aim104.c +++ b/lincan/src/aim104.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" @@ -129,7 +129,6 @@ int aim104_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 @@ -161,7 +160,7 @@ int aim104_init_hw_data(struct candevice_t *candev) */ int aim104_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; @@ -188,7 +187,7 @@ int aim104_init_chip_data(struct candevice_t *candev, int chipnr) * Return Value: The function always returns zero * File: src/template.c */ -int aim104_init_obj_data(struct chip_t *chip, int objnr) +int aim104_init_obj_data(struct canchip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; chip->msgobj[objnr]->obj_flags=0;