X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/6250b3805fb7e368adf1e3f7ca39c8cc617bccff..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/eb8245.c diff --git a/lincan/src/eb8245.c b/lincan/src/eb8245.c index b871305..ff1f1c5 100644 --- a/lincan/src/eb8245.c +++ b/lincan/src/eb8245.c @@ -36,13 +36,13 @@ */ int eb8245_request_io(struct candevice_t *candev) { - int remap_addr; + can_ioptr_t remap_addr; if (!can_request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME " - eb8245")) { CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr); return -ENODEV; } - if ( !( remap_addr = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) { + if ( !( remap_addr = ioremap( candev->io_addr, IO_RANGE ) ) ) { CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr); can_release_mem_region(candev->io_addr,IO_RANGE); return -ENODEV; @@ -241,11 +241,11 @@ int eb8245_program_irq(struct candevice_t *candev) * Return Value: The function does not return a value * File: src/eb8245.c */ -void eb8245_write_register(unsigned data, unsigned long address) +void eb8245_write_register(unsigned data, can_ioptr_t address) { /*DEBUGMSG("eb8245_write_register: addr=0x%lx data=0x%x", address,data);*/ - writeb(data,address); + can_writeb(data,address); } /** @@ -258,9 +258,9 @@ void eb8245_write_register(unsigned data, unsigned long address) * Return Value: The function returns the value stored in @address * File: src/eb8245.c */ -unsigned eb8245_read_register(unsigned long address) +unsigned eb8245_read_register(can_ioptr_t address) { - return readb(address); + return can_readb(address); } /* !!! Don't change this function !!! */