3 files changed, 15 insertions, 102 deletions

diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h
index 03fb161ce4..bffb76e3ef 100644
--- a/firmware/export/hwcompat.h
+++ b/firmware/export/hwcompat.h
@@ -22,6 +22,10 @@
 #include <stdbool.h>
 #include "config.h"
 
+#if (CONFIG_CPU == SH7034) && !defined(SIMULATOR)
+
+#define ROM_VERSION (*(short *)0x020000fe)
+
 /* Bit mask values for HW compatibility */
 #define ATA_ADDRESS_200 0x0100
 #define USB_ACTIVE_HIGH 0x0100
@@ -30,11 +34,16 @@
 #define MMC_CLOCK_POLARITY 0x0400
 #define TUNER_MODEL 0x0800
 
-int read_rom_version(void);
-int read_hw_mask(void);
+#ifdef ARCHOS_PLAYER
+#define HW_MASK 0
+#else /* Recorders, Ondios */
+#define HW_MASK (*(short *)0x020000fc)
+#endif
+
+#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
 
 #ifdef ARCHOS_PLAYER
 bool is_new_player(void);
 #endif
 
-#endif
+#endif /* HWCOMPAT_H */
diff --git a/firmware/export/system.h b/firmware/export/system.h
index ea3092537c..b32d1d3a21 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -196,110 +196,14 @@ enum {
 };
 
 #ifndef SIMULATOR
-#ifdef CPU_COLDFIRE
+#if defined(CPU_COLDFIRE) || (CONFIG_CPU == S3C2440) || (CONFIG_CPU == SH7034)
 #include "system-target.h"
 #endif
 #endif
-#ifndef SIMULATOR
-#if CONFIG_CPU == S3C2440
-#include "system-target.h"
-#endif
-#endif
-
-#if CONFIG_CPU == SH7034
-#define or_b(mask, address) \
-  asm                                       \
-    ("or.b %0,@(r0,gbr)"                    \
-     :                                      \
-     : /* %0 */ I_CONSTRAINT((char)(mask)), \
-       /* %1 */ "z"(address-GBR))
-
-#define and_b(mask, address) \
-  asm                                       \
-    ("and.b %0,@(r0,gbr)"                   \
-     :                                      \
-     : /* %0 */ I_CONSTRAINT((char)(mask)), \
-       /* %1 */ "z"(address-GBR))
-
-#define xor_b(mask, address) \
-  asm                                        \
-    ("xor.b %0,@(r0,gbr)"                    \
-     :                                       \
-     : /* %0 */ I_CONSTRAINT((char)(mask)),  \
-       /* %1 */ "z"(address-GBR))
-
-
-#endif /* CONFIG_CPU == SH7034 */
 
 #ifndef SIMULATOR
 
-/****************************************************************************
- * Interrupt level setting
- * The level is left shifted 4 bits
- ****************************************************************************/
-#if CONFIG_CPU == SH7034
-#define HIGHEST_IRQ_LEVEL (15<<4)
-static inline int set_irq_level(int level)
-{
-    int i;
-    /* Read the old level and set the new one */
-    asm volatile ("stc sr, %0" : "=r" (i));
-    asm volatile ("ldc %0, sr" : : "r" (level));
-    return i;
-}
-
-static inline uint16_t swap16(uint16_t value)
-  /*
-    result[15..8] = value[ 7..0];
-    result[ 7..0] = value[15..8];
-  */
-{
-    uint16_t result;
-    asm volatile ("swap.b\t%1,%0" : "=r"(result) : "r"(value));
-    return result;
-}
-
-static inline uint32_t SWAW32(uint32_t value)
-  /*
-    result[31..16] = value[15.. 0];
-    result[15.. 0] = value[31..16];
-  */
-{
-    uint32_t result;
-    asm volatile ("swap.w\t%1,%0" : "=r"(result) : "r"(value));
-    return result;
-}
-
-static inline uint32_t swap32(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];
-  */
-{
-    asm volatile ("swap.b\t%0,%0\n"
-                  "swap.w\t%0,%0\n"
-                  "swap.b\t%0,%0\n" : "+r"(value));
-    return value;
-}
-
-static inline uint32_t swap_odd_even32(uint32_t value)
-{
-    /*
-      result[31..24],[15.. 8] = value[23..16],[ 7.. 0]
-      result[23..16],[ 7.. 0] = value[31..24],[15.. 8]
-    */
-    asm volatile ("swap.b\t%0,%0\n"
-                  "swap.w\t%0,%0\n"
-                  "swap.b\t%0,%0\n"
-                  "swap.w\t%0,%0\n" : "+r"(value));
-    return value;
-}
-
-#define invalidate_icache()
-
-#elif defined(CPU_ARM)
+#if defined(CPU_ARM)
 
 /* TODO: Implement set_irq_level and check CPU frequencies */
 
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index 590e61dedb..2e286b4cbe 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -82,7 +82,7 @@ static inline void tuner_init(void)
 {
 #ifndef SIMULATOR
 #if CONFIG_TUNER == (S1A0903X01 | TEA5767)
-    if (read_hw_mask() & TUNER_MODEL)
+    if (HW_MASK & TUNER_MODEL)
     {
         _radio_set = philips_set;
         _radio_get = philips_get;