The first round of I/O space pointers separation.

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

diff --git a/lincan/src/cc_can104.c b/lincan/src/cc_can104.c
index 2dafc3de921fa466134b8cd3c7d60fcc3f4a4742..15819a3441696d3e1fc40c5f9e77859ecb0c31ef 100644 (file)
--- a/lincan/src/cc_can104.c
+++ b/lincan/src/cc_can104.c
@@ -140,7 +140,7 @@ int cc104_init_hw_data(struct candevice_t *candev)
 int cc104_init_chip_data(struct candevice_t *candev, int chipnr)
 {
        sja1000_fill_chipspecops(candev->chip[chipnr]);
 int cc104_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 = sjaCDR_CBP | sjaCDR_CLK_OFF;
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->flags = 0;
        candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;


@@ -202,9 +202,9 @@ int cc104_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
  * Return Value: The function does not return a value
  * File: src/template.c
  */

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

 {
 {

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

 }
 
 /**
 }
 
 /**


@@ -217,9 +217,9 @@ void cc104_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/template.c
  */
  * Return Value: The function returns the value stored in @address
  * File: src/template.c
  */

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

 {
 {

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

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