1 files changed, 1 insertions, 119 deletions

diff --git a/firmware/export/system.h b/firmware/export/system.h
index 5064fcd91d..4442eb96d7 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -133,24 +133,6 @@ int get_cpu_boost_counter(void);
 #define PTR_ADD(ptr, x) ((typeof(ptr))((char*)(ptr) + (x)))
 #define PTR_SUB(ptr, x) ((typeof(ptr))((char*)(ptr) - (x)))
 
-/* newer? SDL includes endian.h, So we ignore it */
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED) || defined(__PCTOOL__)
-#undef letoh16
-#undef letoh32
-#undef htole16
-#undef htole32
-#undef betoh16
-#undef betoh32
-#undef htobe16
-#undef htobe32
-#endif
-
-/* Android NDK contains swap16 and swap32, ignore them */
-#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
-#undef swap16
-#undef swap32
-#endif
-
 /* Get the byte offset of a type's member */
 #ifndef offsetof
 #define offsetof(type, member)  __builtin_offsetof(type, member)
@@ -206,111 +188,11 @@ enum {
 #include "system-target.h"
 #elif defined(HAVE_SDL) /* SDL build */
 #include "system-sdl.h"
-#define NEED_GENERIC_BYTESWAPS
 #elif defined(__PCTOOL__)
 #include "system-sdl.h"
-#define NEED_GENERIC_BYTESWAPS
 #endif
 #include "bitswap.h"
-
-#ifdef NEED_GENERIC_BYTESWAPS
-static inline uint16_t swap16_hw(uint16_t value)
-    /*
-      result[15..8] = value[ 7..0];
-      result[ 7..0] = value[15..8];
-    */
-{
-    return (value >> 8) | (value << 8);
-}
-
-static inline uint32_t swap32_hw(uint32_t value)
-    /*
-      result[31..24] = value[ 7.. 0];
-      result[23..16] = value[15.. 8];
-      result[15.. 8] = value[23..16];
-      result[ 7.. 0] = value[31..24];
-    */
-{
-    uint32_t hi = swap16_hw(value >> 16);
-    uint32_t lo = swap16_hw(value & 0xffff);
-    return (lo << 16) | hi;
-}
-
-static inline uint32_t swap_odd_even32_hw(uint32_t value)
-{
-    /*
-      result[31..24],[15.. 8] = value[23..16],[ 7.. 0]
-      result[23..16],[ 7.. 0] = value[31..24],[15.. 8]
-    */
-    uint32_t t = value & 0xff00ff00;
-    return (t >> 8) | ((t ^ value) << 8);
-}
-
-static inline uint32_t swaw32_hw(uint32_t value)
-{
-    /*
-      result[31..16] = value[15.. 0];
-      result[15.. 0] = value[31..16];
-    */
-    return (value >> 16) | (value << 16);
-}
-
-#endif /* NEED_GENERIC_BYTESWAPS */
-
-/* static endianness conversion */
-#define SWAP16_CONST(x) \
-    ((typeof(x))( ((uint16_t)(x) >> 8) | ((uint16_t)(x) << 8) ))
-
-#define SWAP32_CONST(x) \
-    ((typeof(x))( ((uint32_t)(x) >> 24) | \
-                 (((uint32_t)(x) & 0xff0000) >> 8) | \
-                 (((uint32_t)(x) & 0xff00) << 8) | \
-                  ((uint32_t)(x) << 24) ))
-
-#define SWAP_ODD_EVEN32_CONST(x) \
-    ((typeof(x))( ((uint32_t)SWAP16_CONST((uint32_t)(x) >> 16) << 16) | \
-                             SWAP16_CONST((uint32_t)(x))) )
-
-#define SWAW32_CONST(x) \
-    ((typeof(x))( ((uint32_t)(x) << 16) | ((uint32_t)(x) >> 16) ))
-
-/* Select best method based upon whether x is a constant expression */
-#define swap16(x) \
-    ( __builtin_constant_p(x) ? SWAP16_CONST(x) : (typeof(x))swap16_hw(x) )
-
-#define swap32(x) \
-    ( __builtin_constant_p(x) ? SWAP32_CONST(x) : (typeof(x))swap32_hw(x) )
-
-#define swap_odd_even32(x) \
-    ( __builtin_constant_p(x) ? SWAP_ODD_EVEN32_CONST(x) : (typeof(x))swap_odd_even32_hw(x) )
-
-#define swaw32(x) \
-    ( __builtin_constant_p(x) ? SWAW32_CONST(x) : (typeof(x))swaw32_hw(x) )
-
-
-#ifdef ROCKBOX_LITTLE_ENDIAN
-#define letoh16(x) (x)
-#define letoh32(x) (x)
-#define htole16(x) (x)
-#define htole32(x) (x)
-#define betoh16(x) swap16(x)
-#define betoh32(x) swap32(x)
-#define htobe16(x) swap16(x)
-#define htobe32(x) swap32(x)
-#define swap_odd_even_be32(x) (x)
-#define swap_odd_even_le32(x) swap_odd_even32(x)
-#else
-#define letoh16(x) swap16(x)
-#define letoh32(x) swap32(x)
-#define htole16(x) swap16(x)
-#define htole32(x) swap32(x)
-#define betoh16(x) (x)
-#define betoh32(x) (x)
-#define htobe16(x) (x)
-#define htobe32(x) (x)
-#define swap_odd_even_be32(x) swap_odd_even32(x)
-#define swap_odd_even_le32(x) (x)
-#endif
+#include "rbendian.h"
 
 #ifndef BIT_N
 #define BIT_N(n) (1U << (n))