Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-16 20:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/io: Make [out/in] le and be calls conditional

Browse Source 
- These calls clash with the Linux IO header in LibBSD. Making these
  conditional here means BSPs build and the imported Linux header is
  untouched.

Updates #4245
This commit is contained in:
Chris Johns
2021-02-15 12:01:57 -10:00
parent e9712e7890
commit cfef84a007
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bsps/powerpc/include/libcpu/io.h
View File

@@ -107,6 +107,7 @@ static inline void out_be16(volatile uint16_t *addr, uint16_t val)
__asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
} }
#ifndef in_le32
static inline uint32_t in_le32(const volatile uint32_t *addr) static inline uint32_t in_le32(const volatile uint32_t *addr)
{ {
uint32_t ret; uint32_t ret;
@@ -115,7 +116,9 @@ static inline uint32_t in_le32(const volatile uint32_t *addr)
"r" (addr), "m" (*addr)); "r" (addr), "m" (*addr));
return ret; return ret;
} }
#endif
#ifndef in_be32
static inline uint32_t in_be32(const volatile uint32_t *addr) static inline uint32_t in_be32(const volatile uint32_t *addr)
{ {
uint32_t ret; uint32_t ret;
@@ -123,17 +126,22 @@ static inline uint32_t in_be32(const volatile uint32_t *addr)
__asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr)); __asm__ __volatile__("lwz%U1%X1 %0,%1; eieio" : "=r" (ret) : "m" (*addr));
return ret; return ret;
} }
#endif
#ifndef out_le32
static inline void out_le32(volatile uint32_t *addr, uint32_t val) static inline void out_le32(volatile uint32_t *addr, uint32_t val)
{ {
__asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) :
"r" (val), "r" (addr)); "r" (val), "r" (addr));
} }
#endif
#ifndef out_be32
static inline void out_be32(volatile uint32_t *addr, uint32_t val) static inline void out_be32(volatile uint32_t *addr, uint32_t val)
{ {
__asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
} }
#endif
#endif /* ASM */ #endif /* ASM */
#endif /* _LIBCPU_IO_H */ #endif /* _LIBCPU_IO_H */