From c88af798fcccad5bdd5bbefecde119fd7824efa5 Mon Sep 17 00:00:00 2001 From: ppisa Date: Fri, 30 Jan 2009 19:32:45 +0000 Subject: [PATCH] Corrected bug caused by "The first round of I/O space pointers separation." patch. The can_{in,out}{lw} has been mapped to the byte size operations. The corrected version has been tested on KVASER PCIcan-Q card. --- lincan/include/can_sysdep.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h index 2123ba7..77f9d8a 100644 --- a/lincan/include/can_sysdep.h +++ b/lincan/include/can_sysdep.h @@ -161,20 +161,20 @@ #define can_ulong2ioptr(addr) ((unsigned long)(addr)) #define can_inb(ioaddr) inb(ioaddr) #define can_outb(data,ioaddr) outb(data,ioaddr) - #define can_inw(ioaddr) inb(ioaddr) - #define can_outw(data,ioaddr) outb(data,ioaddr) - #define can_inl(ioaddr) inb(ioaddr) - #define can_outl(data,ioaddr) outb(data,ioaddr) + #define can_inw(ioaddr) inw(ioaddr) + #define can_outw(data,ioaddr) outw(data,ioaddr) + #define can_inl(ioaddr) inl(ioaddr) + #define can_outl(data,ioaddr) outl(data,ioaddr) #else /* >=2.6.9 */ typedef void __iomem * can_ioptr_t; #define can_ioptr2ulong(ioaddr) ((unsigned long __force)(ioaddr)) #define can_ulong2ioptr(addr) ((can_ioptr_t)(addr)) #define can_inb(ioaddr) inb(can_ioptr2ulong(ioaddr)) #define can_outb(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr)) - #define can_inw(ioaddr) inb(can_ioptr2ulong(ioaddr)) - #define can_outw(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr)) - #define can_inl(ioaddr) inb(can_ioptr2ulong(ioaddr)) - #define can_outl(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr)) + #define can_inw(ioaddr) inw(can_ioptr2ulong(ioaddr)) + #define can_outw(data,ioaddr) outw(data,can_ioptr2ulong(ioaddr)) + #define can_inl(ioaddr) inl(can_ioptr2ulong(ioaddr)) + #define can_outl(data,ioaddr) outl(data,can_ioptr2ulong(ioaddr)) #endif #define can_readb readb -- 2.39.2