The first round of I/O space pointers separation.

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

diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index a3d200089b09fe37ae29b229ba4e602d223fc1b5..e01a9eb4ca0ad5b3a0964ea68f14387aa01b3c7b 100644 (file)
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -56,18 +56,18 @@ void kv_pcican_disconnect_irq(struct candevice_t *candev)
 {
        unsigned long tmp;
        /* Disable interrupts from card */
 {
        unsigned long tmp;
        /* Disable interrupts from card */

-       tmp = inl(candev->dev_base_addr + S5920_INTCSR);
+       tmp = can_inl(candev->dev_base_addr + S5920_INTCSR);

        tmp &= ~INTCSR_ADDON_INTENABLE_M;
        tmp &= ~INTCSR_ADDON_INTENABLE_M;

-       outl(tmp, candev->dev_base_addr + S5920_INTCSR);
+       can_outl(tmp, candev->dev_base_addr + S5920_INTCSR);

 }
 
 void kv_pcican_connect_irq(struct candevice_t *candev)
 {
        unsigned long tmp;
        /* Enable interrupts from card */
 }
 
 void kv_pcican_connect_irq(struct candevice_t *candev)
 {
        unsigned long tmp;
        /* Enable interrupts from card */

-       tmp = inl(candev->dev_base_addr + S5920_INTCSR);
+       tmp = can_inl(candev->dev_base_addr + S5920_INTCSR);

        tmp |= INTCSR_ADDON_INTENABLE_M;
        tmp |= INTCSR_ADDON_INTENABLE_M;

-       outl(tmp, candev->dev_base_addr + S5920_INTCSR);
+       can_outl(tmp, candev->dev_base_addr + S5920_INTCSR);

 }
 
 
 }
 
 


@@ -121,14 +121,14 @@ int kv_pcican_release_io(struct candevice_t *candev)
 }
 
 
 }
 
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 int kv_pcican_reset(struct candevice_t *candev)
 }
 
 int kv_pcican_reset(struct candevice_t *candev)


@@ -140,7 +140,7 @@ int kv_pcican_reset(struct candevice_t *candev)
        DEBUGMSG("Resetting kv_pcican hardware ...\n");
 
        /* Assert PTADR# - we're in passive mode so the other bits are not important */
        DEBUGMSG("Resetting kv_pcican hardware ...\n");
 
        /* Assert PTADR# - we're in passive mode so the other bits are not important */

-       outl(0x80808080L, candev->dev_base_addr + S5920_PTCR);
+       can_outl(0x80808080L, candev->dev_base_addr + S5920_PTCR);

 
        kv_pcican_disconnect_irq(candev);
 
 
        kv_pcican_disconnect_irq(candev);