4 files changed, 6 insertions, 16 deletions

diff --git a/apps/codecs/libmusepack/internal.h b/apps/codecs/libmusepack/internal.h
index a912bfc0ab..27656d5a54 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 36076caf25..2806409dd5 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;
         }
diff --git a/apps/metadata.c b/apps/metadata.c
index 0cf0890886..86e0887231 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -152,7 +152,7 @@ static void convert_endian(void *data, const char *format)
             {
                 long* d = (long*) data;
                 
-                *d = SWAB32(*d);
+                *d = letoh32(*d);
                 data = d + 1;
             }
             
@@ -162,7 +162,7 @@ static void convert_endian(void *data, const char *format)
             {
                 short* d = (short*) data;
                 
-                *d = SWAB16(*d);
+                *d = letoh16(*d);
                 data = d + 1;
             }
             
diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c
index 23b6811542..6f1866cd58 100644
--- a/apps/plugins/midi/guspat.c
+++ b/apps/plugins/midi/guspat.c
@@ -97,12 +97,11 @@ struct GWaveform * loadWaveform(int file)
     */
 
 
-    /* Iriver needs byteswapping.. big endian, go figure. Gus files are little endian */
-
-#if !defined(SIMULATOR)
+#ifdef ROCKBOX_BIG_ENDIAN
+    /* Byte-swap if necessary. Gus files are little endian */
     for(a=0; a<wav->numSamples; a++)
     {
-        ((unsigned short *) wav->data)[a] = SWAB16(((unsigned short *) wav->data)[a]);
+        ((unsigned short *) wav->data)[a] = letoh16(((unsigned short *) wav->data)[a]);
     }
 #endif