Changes in CAN/PCI-200 card sources to be more clean in types

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

diff --git a/lincan/src/pimx1.c b/lincan/src/pimx1.c
index a24ddd81b58946d525623aaba3ec4683d4e3f8d4..1cf71e74a9eba914b0faabd55ab42b7cb89ffe17 100644 (file)
--- a/lincan/src/pimx1.c
+++ b/lincan/src/pimx1.c
@@ -11,7 +11,7 @@
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/sja1000p.h"
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) && defined(CONFIG_GENERIC_HARDIRQS)
 #include <linux/irq.h>
 #endif /* <2.6.14 */
 #include <asm/arch/hardware.h>
@@ -79,7 +79,7 @@ int pimx1_setup_hardware(struct candevice_t *candev)
  */
 int pimx1_request_io(struct candevice_t *candev)
 {
-        int remap_addr;
+        can_ioptr_t remap_addr;
 
        if(pimx1_setup_hardware(candev)<0){
                CANMSG("PiMX1 board hardware setup failure\n");
@@ -133,11 +133,11 @@ int pimx1_release_io(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/pikronisa.c
  */
-void pimx1_write_register(unsigned data, unsigned long address)
+void pimx1_write_register(unsigned data, can_ioptr_t address)
 {
        /*DEBUGMSG("pimx1_write_register: addr=0x%lx data=0x%x\n",
                address,data);*/
-       writeb(data,address);
+       can_writeb(data,address);
 }
 
 /**
@@ -150,9 +150,9 @@ void pimx1_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/pikronisa.c
  */
-unsigned pimx1_read_register(unsigned long address)
+unsigned pimx1_read_register(can_ioptr_t address)
 {
-       return readb(address);
+       return can_readb(address);
 }
 
 /**