The first round of I/O space pointers separation.

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

diff --git a/lincan/src/oscar.c b/lincan/src/oscar.c
index 798e6ea51fa23c9a44605440b5321f5cb69dd2be..0c8c5afff3079ba0e8711f5e604972b128ee1643 100644 (file)
--- a/lincan/src/oscar.c
+++ b/lincan/src/oscar.c
@@ -83,7 +83,7 @@ int oscar_init_chip_data(struct candevice_t *candev, int chipnr)
     // sja1000_fill_chipspecops(candev->chip[chipnr]);
     sja1000p_fill_chipspecops(candev->chip[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);

     candev->chip[chipnr]->clock = 12000000;
     candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP;  // we use an external tranceiver
     candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;
     candev->chip[chipnr]->clock = 12000000;
     candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP;  // we use an external tranceiver
     candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;


@@ -110,14 +110,14 @@ int oscar_program_irq(struct candevice_t *candev)
     return 0;
 }
 
     return 0;
 }
 

-void oscar_write_register(unsigned data, unsigned long address)
+void oscar_write_register(unsigned data, can_ioptr_t address)

 {
 {

-       outb(data,address);
+       can_outb(data,address);

 }
 
 }
 

-unsigned oscar_read_register(unsigned long address)
+unsigned oscar_read_register(can_ioptr_t address)

 {
 {

-       return inb(address);
+       return can_inb(address);

 }
 
 /* !!! Don't change this function !!! */
 }
 
 /* !!! Don't change this function !!! */