Replace SWAB16 and SWAB32 with a comprehensive set of byte-swap macros - letoh16, letoh32, htole16, htole32, betoh16, betoh32, htobe16 and htobe32

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7584 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 1 insertions, 10 deletions

diff --git a/apps/codecs/libmusepack/internal.h b/apps/codecs/libmusepack/internal.h
index a912bfc..27656d5 100644
--- a/apps/codecs/libmusepack/internal.h
+++ b/apps/codecs/libmusepack/internal.h
@@ -42,15 +42,6 @@ enum {
     MPC_DECODER_SYNTH_DELAY = 481
 };
 
-/// Big/little endian 32 bit byte swapping routine.
-static inline
-mpc_uint32_t swap32(mpc_uint32_t val) {
-    const unsigned char* src = (const unsigned char*)&val;
-    return 
-        (mpc_uint32_t)src[0] | 
-        ((mpc_uint32_t)src[1] << 8) | ((mpc_uint32_t)src[2] << 16) | ((mpc_uint32_t)src[3] << 24);
-}
-
 /// Searches for a ID3v2-tag and reads the length (in bytes) of it.
 /// \param reader supplying raw stream data
 /// \return size of tag, in bytes
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index 36076ca..2806409 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -482,7 +482,7 @@ enum codec_status codec_start(struct codec_api* api)
         else if (bitspersample > 8) {
             /* Byte-swap data. */
             for (i=0;i<n/2;i++) {
-                int16_samples[i]=(int16_t)SWAB16(wavbuf[i]);
+                int16_samples[i]=(int16_t)letoh16(wavbuf[i]);
             }
             wavbufsize = n;
         }