m68k/atari: ROM port ISA adapter support
Atari ROM port ISA adapter support for EtherNEC and NetUSBee adapters 16 bit access for ROM port adapters follows debugging and clarification by David Galvez <dgalvez75@gmail.com>. The NetUSBee ISP1160 USB chip uses these macros. Signed-off-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Michael Schmitz
committed by
Geert Uytterhoeven
Geert Uytterhoeven
parent
feb20ec2bb
commit
84b16b7b0d
@@ -63,6 +63,23 @@
|
||||
#endif
|
||||
#endif /* AMIGA_PCMCIA */
|
||||
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
|
||||
#define enec_isa_read_base 0xfffa0000
|
||||
#define enec_isa_write_base 0xfffb0000
|
||||
|
||||
#define ENEC_ISA_IO_B(ioaddr) (enec_isa_read_base+((((unsigned long)(ioaddr))&0x7F)<<9))
|
||||
#define ENEC_ISA_IO_W(ioaddr) (enec_isa_read_base+((((unsigned long)(ioaddr))&0x7F)<<9))
|
||||
#define ENEC_ISA_MEM_B(madr) (enec_isa_read_base+((((unsigned long)(madr))&0x7F)<<9))
|
||||
#define ENEC_ISA_MEM_W(madr) (enec_isa_read_base+((((unsigned long)(madr))&0x7F)<<9))
|
||||
|
||||
#ifndef MULTI_ISA
|
||||
#define MULTI_ISA 0
|
||||
#else
|
||||
#undef MULTI_ISA
|
||||
#define MULTI_ISA 1
|
||||
#endif
|
||||
#endif /* ATARI_ROM_ISA */
|
||||
|
||||
|
||||
#if defined(CONFIG_PCI) && defined(CONFIG_COLDFIRE)
|
||||
@@ -111,14 +128,15 @@ void mcf_pci_outsl(u32 addr, const u32 *buf, u32 len);
|
||||
#define readw(addr) in_le16(addr)
|
||||
#define writew(v, addr) out_le16((addr), (v))
|
||||
|
||||
#elif defined(CONFIG_ISA)
|
||||
#elif defined(CONFIG_ISA) || defined(CONFIG_ATARI_ROM_ISA)
|
||||
|
||||
#if MULTI_ISA == 0
|
||||
#undef MULTI_ISA
|
||||
#endif
|
||||
|
||||
#define ISA_TYPE_Q40 (1)
|
||||
#define ISA_TYPE_AG (2)
|
||||
#define ISA_TYPE_Q40 (1)
|
||||
#define ISA_TYPE_AG (2)
|
||||
#define ISA_TYPE_ENEC (3)
|
||||
|
||||
#if defined(CONFIG_Q40) && !defined(MULTI_ISA)
|
||||
#define ISA_TYPE ISA_TYPE_Q40
|
||||
@@ -128,6 +146,10 @@ void mcf_pci_outsl(u32 addr, const u32 *buf, u32 len);
|
||||
#define ISA_TYPE ISA_TYPE_AG
|
||||
#define ISA_SEX 1
|
||||
#endif
|
||||
#if defined(CONFIG_ATARI_ROM_ISA) && !defined(MULTI_ISA)
|
||||
#define ISA_TYPE ISA_TYPE_ENEC
|
||||
#define ISA_SEX 0
|
||||
#endif
|
||||
|
||||
#ifdef MULTI_ISA
|
||||
extern int isa_type;
|
||||
@@ -151,6 +173,9 @@ static inline u8 __iomem *isa_itb(unsigned long addr)
|
||||
#endif
|
||||
#ifdef CONFIG_AMIGA_PCMCIA
|
||||
case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
|
||||
#endif
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_IO_B(addr);
|
||||
#endif
|
||||
default: return NULL; /* avoid warnings, just in case */
|
||||
}
|
||||
@@ -164,6 +189,9 @@ static inline u16 __iomem *isa_itw(unsigned long addr)
|
||||
#endif
|
||||
#ifdef CONFIG_AMIGA_PCMCIA
|
||||
case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);
|
||||
#endif
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
case ISA_TYPE_ENEC: return (u16 __iomem *)ENEC_ISA_IO_W(addr);
|
||||
#endif
|
||||
default: return NULL; /* avoid warnings, just in case */
|
||||
}
|
||||
@@ -187,6 +215,9 @@ static inline u8 __iomem *isa_mtb(unsigned long addr)
|
||||
#endif
|
||||
#ifdef CONFIG_AMIGA_PCMCIA
|
||||
case ISA_TYPE_AG: return (u8 __iomem *)addr;
|
||||
#endif
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_MEM_B(addr);
|
||||
#endif
|
||||
default: return NULL; /* avoid warnings, just in case */
|
||||
}
|
||||
@@ -200,6 +231,9 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
|
||||
#endif
|
||||
#ifdef CONFIG_AMIGA_PCMCIA
|
||||
case ISA_TYPE_AG: return (u16 __iomem *)addr;
|
||||
#endif
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
case ISA_TYPE_ENEC: return (u16 __iomem *)ENEC_ISA_MEM_W(addr);
|
||||
#endif
|
||||
default: return NULL; /* avoid warnings, just in case */
|
||||
}
|
||||
@@ -222,6 +256,36 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
|
||||
(ISA_SEX ? out_be16(isa_mtw((unsigned long)(p)),(val)) \
|
||||
: out_le16(isa_mtw((unsigned long)(p)),(val)))
|
||||
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
#define isa_rom_inb(port) rom_in_8(isa_itb(port))
|
||||
#define isa_rom_inw(port) \
|
||||
(ISA_SEX ? rom_in_be16(isa_itw(port)) \
|
||||
: rom_in_le16(isa_itw(port)))
|
||||
|
||||
#define isa_rom_outb(val, port) rom_out_8(isa_itb(port), (val))
|
||||
#define isa_rom_outw(val, port) \
|
||||
(ISA_SEX ? rom_out_be16(isa_itw(port), (val)) \
|
||||
: rom_out_le16(isa_itw(port), (val)))
|
||||
|
||||
#define isa_rom_readb(p) rom_in_8(isa_mtb((unsigned long)(p)))
|
||||
#define isa_rom_readw(p) \
|
||||
(ISA_SEX ? rom_in_be16(isa_mtw((unsigned long)(p))) \
|
||||
: rom_in_le16(isa_mtw((unsigned long)(p))))
|
||||
#define isa_rom_readw_swap(p) \
|
||||
(ISA_SEX ? rom_in_le16(isa_mtw((unsigned long)(p))) \
|
||||
: rom_in_be16(isa_mtw((unsigned long)(p))))
|
||||
#define isa_rom_readw_raw(p) rom_in_be16(isa_mtw((unsigned long)(p)))
|
||||
|
||||
#define isa_rom_writeb(val, p) rom_out_8(isa_mtb((unsigned long)(p)), (val))
|
||||
#define isa_rom_writew(val, p) \
|
||||
(ISA_SEX ? rom_out_be16(isa_mtw((unsigned long)(p)), (val)) \
|
||||
: rom_out_le16(isa_mtw((unsigned long)(p)), (val)))
|
||||
#define isa_rom_writew_swap(val, p) \
|
||||
(ISA_SEX ? rom_out_le16(isa_mtw((unsigned long)(p)), (val)) \
|
||||
: rom_out_be16(isa_mtw((unsigned long)(p)), (val)))
|
||||
#define isa_rom_writew_raw(val, p) rom_out_be16(isa_mtw((unsigned long)(p)), (val))
|
||||
#endif /* CONFIG_ATARI_ROM_ISA */
|
||||
|
||||
static inline void isa_delay(void)
|
||||
{
|
||||
switch(ISA_TYPE)
|
||||
@@ -231,6 +295,9 @@ static inline void isa_delay(void)
|
||||
#endif
|
||||
#ifdef CONFIG_AMIGA_PCMCIA
|
||||
case ISA_TYPE_AG: break;
|
||||
#endif
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
case ISA_TYPE_ENEC: break;
|
||||
#endif
|
||||
default: break; /* avoid warnings */
|
||||
}
|
||||
@@ -263,6 +330,29 @@ static inline void isa_delay(void)
|
||||
raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1))
|
||||
|
||||
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
#define isa_rom_inb_p(p) ({ u8 _v = isa_rom_inb(p); isa_delay(); _v; })
|
||||
#define isa_rom_inw_p(p) ({ u16 _v = isa_rom_inw(p); isa_delay(); _v; })
|
||||
#define isa_rom_outb_p(v, p) ({ isa_rom_outb((v), (p)); isa_delay(); })
|
||||
#define isa_rom_outw_p(v, p) ({ isa_rom_outw((v), (p)); isa_delay(); })
|
||||
|
||||
#define isa_rom_insb(port, buf, nr) raw_rom_insb(isa_itb(port), (u8 *)(buf), (nr))
|
||||
|
||||
#define isa_rom_insw(port, buf, nr) \
|
||||
(ISA_SEX ? raw_rom_insw(isa_itw(port), (u16 *)(buf), (nr)) : \
|
||||
raw_rom_insw_swapw(isa_itw(port), (u16 *)(buf), (nr)))
|
||||
|
||||
#define isa_rom_outsb(port, buf, nr) raw_rom_outsb(isa_itb(port), (u8 *)(buf), (nr))
|
||||
|
||||
#define isa_rom_outsw(port, buf, nr) \
|
||||
(ISA_SEX ? raw_rom_outsw(isa_itw(port), (u16 *)(buf), (nr)) : \
|
||||
raw_rom_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)))
|
||||
#endif /* CONFIG_ATARI_ROM_ISA */
|
||||
|
||||
#endif /* CONFIG_ISA || CONFIG_ATARI_ROM_ISA */
|
||||
|
||||
|
||||
#if defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
|
||||
#define inb isa_inb
|
||||
#define inb_p isa_inb_p
|
||||
#define outb isa_outb
|
||||
@@ -285,9 +375,43 @@ static inline void isa_delay(void)
|
||||
#define readw isa_readw
|
||||
#define writeb isa_writeb
|
||||
#define writew isa_writew
|
||||
#endif /* CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
|
||||
|
||||
#else /* CONFIG_ISA */
|
||||
#ifdef CONFIG_ATARI_ROM_ISA
|
||||
/*
|
||||
* kernel with both ROM port ISA and IDE compiled in, those have
|
||||
* conflicting defs for in/out. Simply consider port < 1024
|
||||
* ROM port ISA and everything else regular ISA for IDE. read,write defined
|
||||
* below.
|
||||
*/
|
||||
#define inb(port) ((port) < 1024 ? isa_rom_inb(port) : in_8(port))
|
||||
#define inb_p(port) ((port) < 1024 ? isa_rom_inb_p(port) : in_8(port))
|
||||
#define inw(port) ((port) < 1024 ? isa_rom_inw(port) : in_le16(port))
|
||||
#define inw_p(port) ((port) < 1024 ? isa_rom_inw_p(port) : in_le16(port))
|
||||
#define inl isa_inl
|
||||
#define inl_p isa_inl_p
|
||||
|
||||
#define outb(val, port) ((port) < 1024 ? isa_rom_outb((val), (port)) : out_8((port), (val)))
|
||||
#define outb_p(val, port) ((port) < 1024 ? isa_rom_outb_p((val), (port)) : out_8((port), (val)))
|
||||
#define outw(val, port) ((port) < 1024 ? isa_rom_outw((val), (port)) : out_le16((port), (val)))
|
||||
#define outw_p(val, port) ((port) < 1024 ? isa_rom_outw_p((val), (port)) : out_le16((port), (val)))
|
||||
#define outl isa_outl
|
||||
#define outl_p isa_outl_p
|
||||
|
||||
#define insb(port, buf, nr) ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
|
||||
#define insw(port, buf, nr) ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
|
||||
#define insl isa_insl
|
||||
#define outsb(port, buf, nr) ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
|
||||
#define outsw(port, buf, nr) ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
|
||||
#define outsl isa_outsl
|
||||
|
||||
#define readb(addr) in_8(addr)
|
||||
#define writeb(val, addr) out_8((addr), (val))
|
||||
#define readw(addr) in_le16(addr)
|
||||
#define writew(val, addr) out_le16((addr), (val))
|
||||
#endif /* CONFIG_ATARI_ROM_ISA */
|
||||
|
||||
#if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
|
||||
/*
|
||||
* We need to define dummy functions for GENERIC_IOMAP support.
|
||||
*/
|
||||
@@ -319,7 +443,7 @@ static inline void isa_delay(void)
|
||||
#define readw(addr) in_le16(addr)
|
||||
#define writew(val,addr) out_le16((addr),(val))
|
||||
|
||||
#endif /* CONFIG_ISA */
|
||||
#endif /* !CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
|
||||
|
||||
#define readl(addr) in_le32(addr)
|
||||
#define writel(val,addr) out_le32((addr),(val))
|
||||
|
||||
Reference in New Issue
Block a user