X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/09842f610105faf6b2c03da03b8916494203f765..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/adlink7841.c diff --git a/lincan/src/adlink7841.c b/lincan/src/adlink7841.c index 59107d4..248f480 100644 --- a/lincan/src/adlink7841.c +++ b/lincan/src/adlink7841.c @@ -95,14 +95,14 @@ int adlink7841_release_io(struct candevice_t *candev) } -void adlink7841_write_register(unsigned data, unsigned long address) +void adlink7841_write_register(unsigned data, can_ioptr_t address) { - outb(data,address); + can_outb(data,address); } -unsigned adlink7841_read_register(unsigned long address) +unsigned adlink7841_read_register(can_ioptr_t address) { - return inb(address); + return can_inb(address); } int adlink7841_reset(struct candevice_t *candev) @@ -194,7 +194,7 @@ int adlink7841_init_chip_data(struct candevice_t *candev, int chipnr) sja1000p_fill_chipspecops(candev->chip[chipnr]); candev->chip[chipnr]->chip_base_addr= - candev->io_addr+chipnr*ADLINK7841_BYTES_PER_CIRCUIT; + can_ioport2ioptr(candev->io_addr+chipnr*ADLINK7841_BYTES_PER_CIRCUIT); candev->chip[chipnr]->flags = 0; candev->chip[chipnr]->int_cpu_reg = 0; candev->chip[chipnr]->int_clk_reg = 0;