X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/6250b3805fb7e368adf1e3f7ca39c8cc617bccff..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/aim104.c diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c index 485186b..015a793 100644 --- a/lincan/src/aim104.c +++ b/lincan/src/aim104.c @@ -161,7 +161,7 @@ int aim104_init_hw_data(struct candevice_t *candev) int aim104_init_chip_data(struct candevice_t *candev, int chipnr) { sja1000_fill_chipspecops(candev->chip[chipnr]); - candev->chip[chipnr]->chip_base_addr=candev->io_addr; + candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(candev->io_addr); candev->chip[chipnr]->clock = 16000000; candev->chip[chipnr]->flags = 0; candev->chip[chipnr]->sja_cdr_reg = 0x08; @@ -223,9 +223,9 @@ int aim104_program_irq(struct candevice_t *candev) * Return Value: The function does not return a value * File: src/template.c */ -void aim104_write_register(unsigned data, unsigned long address) +void aim104_write_register(unsigned data, can_ioptr_t address) { - outb(data,address); + can_outb(data,address); } /** @@ -238,9 +238,9 @@ void aim104_write_register(unsigned data, unsigned long address) * Return Value: The function returns the value stored in @address * File: src/template.c */ -unsigned aim104_read_register(unsigned long address) +unsigned aim104_read_register(can_ioptr_t address) { - return inb(address); + return can_inb(address); } /* !!! Don't change this function !!! */