diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2003-03-20 06:02:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-20 06:02:01 -0800 |
| commit | df5159642fd22b4837ce0369083b41378f21e99a (patch) | |
| tree | e7e279f1bf03aa7e53d71cef686b0a1cdfb8d1e5 | |
| parent | 32e1ed98791defc5be5188a19b4bc5164e317a5a (diff) | |
[PATCH] M68k ISA memory for Amiga PCMCIA
M68k ISA: Fix ISA memory space mapping for Amiga PCMCIA (from Kars de Jong)
| -rw-r--r-- | include/asm-m68k/io.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h index cf88ccb5a47a..406a93da3f6b 100644 --- a/include/asm-m68k/io.h +++ b/include/asm-m68k/io.h @@ -162,7 +162,9 @@ static inline unsigned long isa_mtb(long addr) #ifdef CONFIG_GG2 case GG2_ISA: return GG2_ISA_MEM_B(addr); #endif - /* FIXME: any ISA mem mapping for PCMCIA? */ +#ifdef CONFIG_AMIGA_PCMCIA + case AG_ISA: return addr; +#endif default: return 0; /* avoid warnings, just in case */ } } @@ -176,6 +178,9 @@ static inline unsigned long isa_mtw(long addr) #ifdef CONFIG_GG2 case GG2_ISA: return GG2_ISA_MEM_W(addr); #endif +#ifdef CONFIG_AMIGA_PCMCIA + case AG_ISA: return addr; +#endif default: return 0; /* avoid warnings, just in case */ } } @@ -187,9 +192,9 @@ static inline unsigned long isa_mtw(long addr) #define isa_outw(val,port) (ISA_SEX ? out_be16(isa_itw(port),(val)) : out_le16(isa_itw(port),(val))) #define isa_readb(p) in_8(isa_mtb(p)) -#define isa_readw(p) in_le16(isa_mtw(p)) +#define isa_readw(p) (ISA_SEX ? in_be16(isa_mtw(p)) : in_le16(isa_mtw(p))) #define isa_writeb(val,p) out_8(isa_mtb(p),(val)) -#define isa_writew(val,p) out_le16(isa_mtw(p),(val)) +#define isa_writew(val,p) (ISA_SEX ? out_be16(isa_mtw(p),(val)) : out_le16(isa_mtw(p),(val))) static inline void isa_delay(void) { |