The first round of I/O space pointers separation.

[lincan.git] / lincan / src / gensja1000io.c

diff --git a/lincan/src/gensja1000io.c b/lincan/src/gensja1000io.c
index 9c1a00ec93663fe5c859478b80e0f920c27ffee3..8dcf9fb15c3c311cbccfb483ecbe6ccd74b4a7ca 100644 (file)
--- a/lincan/src/gensja1000io.c
+++ b/lincan/src/gensja1000io.c
@@ -170,7 +170,7 @@ int gensja1000io_init_chip_data(struct candevice_t *candev, int chipnr)
        /*sja1000_fill_chipspecops(candev->chip[chipnr]);*/
        sja1000p_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);
        if(candev->chip[chipnr]->clock<=0)
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->int_clk_reg = 0x0;
@@ -232,11 +232,11 @@ int gensja1000io_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/gensja1000io.c
  */
-void gensja1000io_write_register(unsigned data, unsigned long address)
+void gensja1000io_write_register(unsigned data, can_ioptr_t address)
 {
        /*DEBUGMSG("gensja1000io_write_register: addr=0x%lx data=0x%x",
                address,data);*/
-       outb(data,address);
+       can_outb(data,address);
 }
 
 /**
@@ -249,9 +249,9 @@ void gensja1000io_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/gensja1000io.c
  */
-unsigned gensja1000io_read_register(unsigned long address)
+unsigned gensja1000io_read_register(can_ioptr_t address)
 {
-       return inb(address);
+       return can_inb(address);
 }
 
 /* !!! Don't change this function !!! */