30 files changed, 101 insertions, 83 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index c95946dd0d..bef2b772ad 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -10,7 +10,7 @@ usb.c
 logf.c
 #endif /* ROCKBOX_HAS_LOGF */
 kernel.c
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #ifdef RB_PROFILE
 profile.c
 #endif /* RB_PROFILE */
@@ -19,7 +19,7 @@ rolo.c
 #endif /* !defined(BOOTLOADER) || defined(CPU_SH) */
 thread.c
 timer.c
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 #ifdef HAVE_SDL
 target/hosted/sdl/button-sdl.c
 target/hosted/sdl/kernel-sdl.c
@@ -40,13 +40,13 @@ panic.c
 debug.c
 
 /* Standard library */
-#if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__)
 libc/errno.c
 libc/strtok.c
 /* alsa on linux requires a more advanced sprintf, i.e. not ours */
 libc/sprintf.c
-#endif /* !SIMULATOR || __MINGW32__ || __CYGWIN__ */
-#if !defined(SIMULATOR)
+#endif /* PLATFORM_NATIVE || __MINGW32__ || __CYGWIN__ */
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 libc/atoi.c
 libc/ctype.c
 libc/memcmp.c
@@ -70,11 +70,11 @@ common/crc32.c
 #ifdef MI4_FORMAT
 common/crc32-mi4.c
 #endif
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 common/dir_uncached.c
 common/file.c
 common/disk.c
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 #ifdef HAVE_DIRCACHE
 common/dircache.c
 #endif /* HAVE_DIRCACHE */
@@ -143,21 +143,21 @@ backlight-sw-fading.c
 /* Misc. */
 drivers/led.c
 drivers/button.c
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #ifdef HAVE_DAC3550A
 drivers/dac.c
 #endif
 #ifdef HAVE_SERIAL
 drivers/serial.c
 #endif
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 #ifdef HAVE_TOUCHSCREEN
 drivers/touchscreen.c
 #endif
 
 
 /* Storage */
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #if (CONFIG_STORAGE & STORAGE_MMC)
 drivers/ata_mmc.c
 #endif
@@ -184,7 +184,7 @@ drivers/fat.c
 #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD)
 sdmmc.c
 #endif
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 /* EEPROM */
 #ifdef HAVE_EEPROM
@@ -195,7 +195,7 @@ eeprom_settings.c
 #endif /* HAVE_EEPROM */
 
 /* RTC */
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #if (CONFIG_RTC == RTC_M41ST84W)
 drivers/rtc/rtc_m41st84w.c
 #elif (CONFIG_RTC == RTC_PCF50606)
@@ -225,13 +225,13 @@ drivers/rtc/rtc_s35390a.c
 #elif (CONFIG_RTC == RTC_D2)
 drivers/rtc/rtc_d2.c
 #endif /* (CONFIG_RTC == RTC_) */
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 #ifndef BOOTLOADER
 /* Tuner */
 #if CONFIG_TUNER
 tuner.c
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #if (CONFIG_TUNER & LV24020LP)
 drivers/tuner/lv24020lp.c
 #endif /* (CONFIG_TUNER & LV24020LP) */
@@ -254,7 +254,7 @@ drivers/tuner/ipod_remote_tuner.c
 #if (CONFIG_TUNER & RDA5802)
 drivers/tuner/rda5802.c
 #endif /* (CONFIG_TUNER & RDA5802) */
-#endif /*SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 #endif /* CONFIG_TUNER */
 #endif /* BOOTLOADER */
 
@@ -285,7 +285,7 @@ drivers/mas.c
 #endif /* SWCODEC */
 
 /* Audio codec */
-#if !defined(SIMULATOR) && !defined(BOOTLOADER)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER)
 #if defined(HAVE_UDA1380)
 drivers/audio/uda1380.c
 #elif defined(HAVE_WM8751) \
@@ -319,7 +319,7 @@ drivers/audio/sdl.c
 #if CONFIG_CODEC == SWCODEC
 target/hosted/sdl/pcm-sdl.c
 #endif
-#endif /* !defined(SIMULATOR) && !defined(BOOTLOADER) */
+#endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) */
 
 /* USB Stack */
 #if !defined(SIMULATOR)
@@ -531,10 +531,10 @@ libc/memmove.c
 libc/memset.c
 common/memset16.c
 libc/strlen.c
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 crt0.S
 drivers/i2c.c
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 #endif /* defined(CPU_*) */
 
diff --git a/firmware/backlight.c b/firmware/backlight.c
index 27bc8a453f..6a5070df49 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -40,6 +40,9 @@
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
 #endif
+
+#if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT)
+
 #ifndef SIMULATOR
 #include "backlight-target.h"
 #else
@@ -51,8 +54,6 @@
 #include "backlight-sw-fading.h"
 #endif
 
-#if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT)
-
 #define BACKLIGHT_FADE_IN_THREAD \
     (CONFIG_BACKLIGHT_FADING &  (BACKLIGHT_FADING_SW_SETTING \
                                 |BACKLIGHT_FADING_SW_HW_REG \
diff --git a/firmware/buffer.c b/firmware/buffer.c
index 07d06cd4a0..015fc04b86 100644
--- a/firmware/buffer.c
+++ b/firmware/buffer.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include "buffer.h"
 
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 unsigned char audiobuffer[(MEM*1024-256)*1024];
 unsigned char *audiobufend = audiobuffer + sizeof(audiobuffer);
 #else
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index f8365e1137..0a58175d53 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -171,7 +171,7 @@ static bool check_event_queue(void)
     return false;
 }
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 /* scan and build static data (avoid redundancy on stack) */
 static struct
 {
@@ -301,7 +301,7 @@ static int dircache_scan_and_build(IF_MV2(int volume,) struct dircache_entry *ce
     
     return sab_process_dir(0, ce);
 }
-#else /* !SIMULATOR */
+#elif (CONFIG_PLATFORM & PLATFORM_HOSTED) /* PLATFORM_HOSTED */
 static char sab_path[MAX_PATH];
 
 static int sab_process_dir(struct dircache_entry *ce)
@@ -400,7 +400,7 @@ static int dircache_scan_and_build(IF_MV2(int volume,) struct dircache_entry *ce
     strlcpy(sab_path, "/", sizeof sab_path);
     return sab_process_dir(ce);
 }
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 /**
  * Internal function to get a pointer to dircache_entry for a given filename.
@@ -689,7 +689,7 @@ static void dircache_thread(void)
                 dircache_initialized = false;
                 break ;
             
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
             case SYS_USB_CONNECTED:
                 usb_acknowledge(SYS_USB_CONNECTED_ACK);
                 usb_wait_for_disconnect(&dircache_queue);
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 16c0d2c16a..171acaaded 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -33,7 +33,7 @@
 #include "serial.h"
 #include "power.h"
 #include "powermgmt.h"
-#ifdef SIMULATOR
+#ifdef HAVE_SDL
 #include "button-sdl.h"
 #else
 #include "button-target.h"
@@ -215,7 +215,7 @@ static void button_tick(void)
 
                             /* Safety net for players without hardware
                                poweroff */
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
                             if(repeat_count > POWEROFF_COUNT * 10)
                                 power_off();
 #endif
@@ -440,7 +440,7 @@ static int button_flip(int button)
 {
     int newbutton = button;
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     newbutton &=
         ~(BUTTON_LEFT | BUTTON_RIGHT
 #if defined(BUTTON_UP) && defined(BUTTON_DOWN)
diff --git a/firmware/export/ata_idle_notify.h b/firmware/export/ata_idle_notify.h
index 348165f1d1..439b883e41 100644
--- a/firmware/export/ata_idle_notify.h
+++ b/firmware/export/ata_idle_notify.h
@@ -43,7 +43,7 @@ enum {
     DISK_EVENT_SPINUP = (EVENT_CLASS_DISK|1),
 };
 
-#define USING_STORAGE_CALLBACK  !defined(SIMULATOR)             \
+#define USING_STORAGE_CALLBACK  (CONFIG_PLATFORM & PLATFORM_NATIVE) \
                             && ! ((CONFIG_STORAGE & STORAGE_NAND) \
                                && (CONFIG_NAND == NAND_IFP7XX)) \
                             && !defined(BOOTLOADER)
diff --git a/firmware/export/audio.h b/firmware/export/audio.h
index 1e09081ba5..b81597a892 100644
--- a/firmware/export/audio.h
+++ b/firmware/export/audio.h
@@ -36,7 +36,7 @@
 #endif /* CONFIG_CODEC == SWCODEC */
 
 
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 #define audio_play(x) sim_audio_play(x)
 #endif
 
diff --git a/firmware/export/buffer.h b/firmware/export/buffer.h
index 4c80471b27..ae8886bffc 100644
--- a/firmware/export/buffer.h
+++ b/firmware/export/buffer.h
@@ -23,10 +23,10 @@
 
 #include "config.h"
 /* defined in linker script */
-#ifdef SIMULATOR
-extern unsigned char *audiobufend;
-#else
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 extern unsigned char audiobufend[];
+#else
+extern unsigned char *audiobufend;
 #endif
 
 extern unsigned char *audiobuf;
diff --git a/firmware/export/config.h b/firmware/export/config.h
index de84dc3742..c06e5d110a 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -74,6 +74,13 @@
 #define AT91SAM9260  9260
 #define AS3525v2    35252
 
+/* platforms
+ * bit fields to allow PLATFORM_HOSTED to be OR'ed e.g. with a
+ * possible future PLATFORM_ANDROID (some OSes might need totally different
+ * handling to run on them than a stand-alone application) */
+#define PLATFORM_NATIVE (1<<0)
+#define PLATFORM_HOSTED (1<<1)
+
 /* CONFIG_KEYPAD */
 #define PLAYER_PAD          1
 #define RECORDER_PAD        2
@@ -497,6 +504,10 @@ Lyre prototype 1 */
 #define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING
 #endif
 
+#ifndef CONFIG_PLATFORM
+#define CONFIG_PLATFORM PLATFORM_NATIVE
+#endif
+
 #ifndef CONFIG_TUNER
 #define CONFIG_TUNER 0
 #endif
@@ -675,10 +686,10 @@ Lyre prototype 1 */
 #define HAVE_EXTENDED_MESSAGING_AND_NAME
 #define HAVE_WAKEUP_EXT_CB
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #define HAVE_PRIORITY_SCHEDULING
 #define HAVE_SCHEDULER_BOOSTCTRL
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 #define HAVE_SEMAPHORE_OBJECTS
 
@@ -744,7 +755,7 @@ Lyre prototype 1 */
 #endif
 
 /* IRAM usage */
-#if !defined(SIMULATOR) &&   /* Not for simulators */ \
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) &&   /* Not for hosted environments */ \
     (((CONFIG_CPU == SH7034) && !defined(PLUGIN)) || /* SH1 archos: core only */ \
     defined(CPU_COLDFIRE) || /* Coldfire: core, plugins, codecs */ \
     defined(CPU_PP) ||  /* PortalPlayer: core, plugins, codecs */ \
@@ -780,9 +791,10 @@ Lyre prototype 1 */
 #define IBSS_ATTR
 #define STATICIRAM static
 #endif
+
 #if (defined(CPU_PP) || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) || \
     (CONFIG_CPU == IMX31L)) \
-    && !defined(SIMULATOR) && !defined(BOOTLOADER)
+    && (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER)
 /* Functions that have INIT_ATTR attached are NOT guaranteed to survive after
  * root_menu() has been called. Their code may be overwritten by other data or
  * code in order to save RAM, and references to them might point into
@@ -799,7 +811,7 @@ Lyre prototype 1 */
 #define INIT_ATTR
 #endif
 
-#if defined(SIMULATOR) && defined(__APPLE__)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__)
 #define DATA_ATTR       __attribute__ ((section("__DATA, .data")))
 #else
 #define DATA_ATTR       __attribute__ ((section(".data")))
@@ -923,7 +935,7 @@ Lyre prototype 1 */
 
 #else /* BOOTLOADER */
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 //#define USB_ENABLE_SERIAL
 #define USB_ENABLE_STORAGE
 
@@ -941,11 +953,11 @@ Lyre prototype 1 */
 /* This attribute can be used to enable to detection of plugin file handles leaks.
  * When enabled, the plugin core will monitor open/close/creat and when the plugin exits
  * will display an error message if the plugin leaked some file handles */
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #define HAVE_PLUGIN_CHECK_OPEN_CLOSE
 #endif
 
-#if defined(HAVE_DIRCACHE) && !defined(SIMULATOR)
+#if defined(HAVE_DIRCACHE) && (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #define HAVE_IO_PRIORITY
 #endif
 
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h
index d65b0fbbf8..5dcb4f6f2d 100644
--- a/firmware/export/config/sim.h
+++ b/firmware/export/config/sim.h
@@ -101,4 +101,5 @@
 
 #define HAVE_SDL
 #define HAVE_SDL_AUDIO
+#define CONFIG_PLATFORM PLATFORM_HOSTED
 #define _ISOC99_SOURCE 1
diff --git a/firmware/export/font.h b/firmware/export/font.h
index f6915d9c09..7284564380 100644
--- a/firmware/export/font.h
+++ b/firmware/export/font.h
@@ -28,7 +28,7 @@
  */
 #include "config.h"
 
-#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
+#if defined(HAVE_LCD_BITMAP) || (CONFIG_PLATFORM & PLATFORM_HOSTED)
 #ifndef __PCTOOL__
 #include "font_cache.h"
 #include "sysfont.h"
diff --git a/firmware/export/hwcompat.h b/firmware/export/hwcompat.h
index 27fcb25e36..c37add49f9 100644
--- a/firmware/export/hwcompat.h
+++ b/firmware/export/hwcompat.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include "config.h"
 
-#if (CONFIG_CPU == SH7034) && !defined(SIMULATOR)
+#if (CONFIG_CPU == SH7034) && (CONFIG_PLATFORM & PLATFORM_NATIVE)
 
 #define ROM_VERSION (*(short *)0x020000fe)
 
@@ -49,7 +49,7 @@ static inline int tuner_detect_type(void)
 }
 #endif
 
-#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
+#endif /* (CONFIG_CPU == SH7034) && (CONFIG_PLATFORM & PLATFORM_NATIVE) */
 
 #ifdef ARCHOS_PLAYER
 bool is_new_player(void);
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index bcf51c1723..9ef5af8c0c 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -201,7 +201,7 @@ static inline void call_tick_tasks(void)
 }
 #endif
 
-#if defined(SIMULATOR) && !defined(PLUGIN) && !defined(CODEC)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(PLUGIN) && !defined(CODEC)
 #define sleep(x) sim_sleep(x)
 #endif
 
diff --git a/firmware/export/power.h b/firmware/export/power.h
index 107158767f..137f40cb01 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -81,7 +81,7 @@ void ide_power_enable(bool on);
 bool charging_state(void);
 #endif
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 
 void power_init(void) INIT_ATTR;
 
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index d86118cd9b..03b9d34d54 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -74,7 +74,7 @@ extern unsigned int power_thread_inputs;
 #include "powermgmt-target.h"
 #endif
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 
 /* Generic current values that are intentionally meaningless - config header
  * should define proper numbers.*/
@@ -129,7 +129,7 @@ extern const unsigned short percent_to_volt_charge[11];
 /* Start up power management thread */
 void powermgmt_init(void) INIT_ATTR;
 
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 /* Returns battery statust */
 int battery_level(void); /* percent */
diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index e62cf0d902..e59a5e5bf6 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -51,7 +51,7 @@ struct storage_info
     char *revision;
 };
 
-#if !defined(SIMULATOR) && !defined(CONFIG_STORAGE_MULTI)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(CONFIG_STORAGE_MULTI)
 /* storage_spindown, storage_sleep and storage_spin are passed as
  * pointers, which doesn't work with argument-macros.
  */
@@ -185,7 +185,7 @@ struct storage_info
     #else
         //#error No storage driver!
     #endif
-#else /* NOT CONFIG_STORAGE_MULTI and NOT SIMULATOR*/
+#else /* NOT CONFIG_STORAGE_MULTI and PLATFORM_NATIVE*/
 
 /* Simulator and multi-driver use normal functions */
 
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 5ac92e015d..7a04422b06 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -125,7 +125,7 @@ int get_cpu_boost_counter(void);
 
 
 /* newer? SDL includes endian.h, So we ignore it */
-#if defined(SIMULATOR) || defined(__PCTOOL__)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED) || defined(__PCTOOL__)
 #undef letoh16
 #undef letoh32
 #undef htole16
@@ -234,8 +234,11 @@ enum {
 
 #if !defined(SIMULATOR) && !defined(__PCTOOL__) 
 #include "system-target.h"
-#elif defined(HAVE_SDL) /* SIMULATOR */
+#elif defined(HAVE_SDL) /* SDL build */
 #include "system-sdl.h"
+#endif
+
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 static inline uint16_t swap16(uint16_t value)
     /*
       result[15..8] = value[ 7..0];
@@ -268,7 +271,7 @@ static inline uint32_t swap_odd_even32(uint32_t value)
     return (t >> 8) | ((t ^ value) << 8);
 }
 
-#endif /* !SIMULATOR */
+#endif /* PLATFORM_HOSTED */
 
 #ifndef BIT_N
 #define BIT_N(n) (1U << (n))
diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index d907e5dc95..c4b7d1fa22 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -81,7 +81,7 @@
 
 #define DEFAULT_STACK_SIZE 0x400 /* Bytes */
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 /* Need to keep structures inside the header file because debug_menu
  * needs them. */
 #ifdef CPU_COLDFIRE
@@ -135,15 +135,15 @@ struct regs
     uint32_t start; /*   44 - Thread start address, or NULL when started */
 };
 #endif /* CONFIG_CPU */
-#else
+#elif (CONFIG_PLATFORM & PLATFORM_HOSTED)
 struct regs
 {
-    void *t;             /* Simulator OS thread */
+    void *t;             /* OS thread */
     void *told;          /* Last thread in slot (explained in thead-sdl.c) */
     void *s;             /* Semaphore for blocking and wakeup */
     void (*start)(void); /* Start function */
 };
-#endif /* !SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 /* NOTE: The use of the word "queue" may also refer to a linked list of
    threads being maintained that are normally dealt with in FIFO order
diff --git a/firmware/export/timer.h b/firmware/export/timer.h
index b070acae31..b12ec55881 100644
--- a/firmware/export/timer.h
+++ b/firmware/export/timer.h
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "cpu.h"
 
-#if defined(SIMULATOR)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 #define TIMER_FREQ 1000000
 #endif
 
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index fa894a4b6c..461c9a3fcb 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -90,7 +90,7 @@ extern const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS];
 
 #if CONFIG_TUNER
 
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 int tuner_set(int setting, int value);
 int tuner_get(int setting);
 #ifdef HAVE_RDS_CAP
@@ -142,7 +142,7 @@ extern int (*tuner_get)(int setting);
 #include "ipod_remote_tuner.h"
 #endif
 
-#endif /* SIMULATOR */
+#endif /* PLATFORM_HOSTED */
 
 /* Additional messages that get enumerated after tuner driver headers */
 
diff --git a/firmware/include/dbgcheck.h b/firmware/include/dbgcheck.h
index e1f7aefbdb..0b38627d11 100644
--- a/firmware/include/dbgcheck.h
+++ b/firmware/include/dbgcheck.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #ifdef DEBUG
- #ifndef SIMULATOR
+ #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
   /* check whether a function is inside the valid memory location */
   #define IS_FUNCPTR(fp) ({/
      extern char _text[];/
@@ -21,4 +21,4 @@
 #endif
 
 
-#endif // #ifndef __DBGCHECK_H__
\ No newline at end of file
+#endif // #ifndef __DBGCHECK_H__
diff --git a/firmware/include/dir_uncached.h b/firmware/include/dir_uncached.h
index 4e5acf34d1..f225cf8e39 100644
--- a/firmware/include/dir_uncached.h
+++ b/firmware/include/dir_uncached.h
@@ -32,7 +32,7 @@
 #define ATTR_ARCHIVE     0x20
 #define ATTR_VOLUME      0x40 /* this is a volume, not a real directory */
 
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 #define dirent_uncached sim_dirent
 #define DIR_UNCACHED SIM_DIR
 #define opendir_uncached sim_opendir
@@ -57,7 +57,7 @@ struct dirent_uncached {
 #include "fat.h"
 
 typedef struct {
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     bool busy;
     long startcluster;
     struct fat_dir fatdir;
@@ -66,7 +66,7 @@ typedef struct {
     int volumecounter; /* running counter for faked volume entries */
 #endif
 #else
-    /* simulator: */
+    /* simulator/application: */
     void *dir; /* actually a DIR* dir */
     char *name;
 #endif
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index 9fd55fab6f..4472d5fbe0 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -36,7 +36,7 @@ struct travel_data {
     struct dircache_entry *first;
     struct dircache_entry *ce;
     struct dircache_entry *down_entry;
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
     DIR_UNCACHED *dir, *newdir;
     struct dirent_uncached *entry;
 #else
diff --git a/firmware/include/file.h b/firmware/include/file.h
index f66cc6c60e..9502f5999a 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -26,6 +26,7 @@
 #define MAX_PATH 260
 
 #include <sys/types.h>
+#include "config.h"
 #include "_ansi.h"
 
 #define MAX_OPEN_FILES 11
@@ -49,7 +50,7 @@
 #define O_TRUNC  0x10
 #endif
 
-#if  defined(SIMULATOR) && !defined(PLUGIN) && !defined(CODEC)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(PLUGIN) && !defined(CODEC)
 #define open(x, ...) sim_open(x, __VA_ARGS__)
 #define creat(x,m) sim_creat(x,m)
 #define remove(x) sim_remove(x)
@@ -78,7 +79,7 @@ extern int fsync(int fd);
 extern ssize_t read(int fd, void *buf, size_t count);
 extern off_t lseek(int fildes, off_t offset, int whence);
 extern int file_creat(const char *pathname);
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 /* posix compatibility function */
 static inline int creat(const char *pathname, mode_t mode)
 {
diff --git a/firmware/logf.c b/firmware/logf.c
index 6bdda3f424..0136600e92 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -208,7 +208,7 @@ void _logf(const char *fmt, ...)
 
     va_start(ap, fmt);
     
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
     char buf[1024];
     vsnprintf(buf, sizeof buf, fmt, ap);
     DEBUGF("%s\n", buf);
diff --git a/firmware/panic.c b/firmware/panic.c
index 36eec67f12..bd2c719607 100644
--- a/firmware/panic.c
+++ b/firmware/panic.c
@@ -41,7 +41,7 @@ void panicf( const char *fmt, ...)
 {
     va_list ap;
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     /* Disable interrupts */
 #ifdef CPU_ARM
     disable_interrupt(IRQ_FIQ_STATUS);
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index f1dd83ef52..c5f981d1f6 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -44,7 +44,7 @@
 #endif
 #include "logf.h"
 #include "lcd-remote.h"
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 #include <time.h>
 #endif
 
@@ -73,7 +73,7 @@ enum charge_state_type charge_state = DISCHARGING;
 #endif
 #endif /* CONFIG_CHARGING */
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 static int shutdown_timeout = 0;
 /*
  * Average battery voltage and charger voltage, filtered via a digital
@@ -830,7 +830,7 @@ void cancel_shutdown(void)
 
     shutdown_timeout = 0;
 }
-#endif /* SIMULATOR */
+#endif /* PLATFORM_NATIVE */
 
 /* Send system battery level update events on reaching certain significant
    levels. This must be called after battery_percent has been updated. */
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index b7e0601150..4fee7ed1d6 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -242,7 +242,7 @@ static bool scroll_process_message(int delay)
             usb_wait_for_disconnect(&scroll_queue);
             sync_display_ticks();
             return true;
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
         case SYS_REMOTE_PLUGGED:
             if (!remote_initialized)
                 sync_display_ticks();
@@ -280,7 +280,7 @@ static void scroll_thread(void)
         delay = current_tick;
 
         if (
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
             !remote_initialized ||
 #endif
             (tick_remote = lcd_remote_scroll_info.last_scroll +
diff --git a/firmware/sound.c b/firmware/sound.c
index dccca12264..76f1dd0df6 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -27,7 +27,7 @@
 #include "system.h"
 #include "i2c.h"
 #include "mas.h"  
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #if CONFIG_CPU == PNX0101
 #include "pnx0101.h"
 #endif
@@ -257,7 +257,7 @@ static void set_prescaled_volume(void)
     dsp_callback(DSP_CALLBACK_SET_SW_VOLUME, 0);
 #endif
 
-#ifndef SIMULATOR
+#ifndef HAVE_SDL_AUDIO
 #if CONFIG_CODEC == MAS3507D
     dac_volume(tenthdb2reg(l), tenthdb2reg(r), false);
 #elif defined(HAVE_UDA1380) || defined(HAVE_WM8975) || defined(HAVE_WM8758) \
@@ -276,9 +276,9 @@ static void set_prescaled_volume(void)
 #elif defined(HAVE_JZ4740_CODEC) || defined(HAVE_SDL_AUDIO)
     audiohw_set_volume(current_volume);
 #endif
-#else /* SIMULATOR */
+#else /* HAVE_SDL_AUDIO */
     audiohw_set_volume(current_volume);
-#endif /* !SIMULATOR */
+#endif /* !HAVE_SDL_AUDIO */
 }
 #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */
 
@@ -714,7 +714,7 @@ void sound_set(int setting, int value)
   && !defined(HAVE_WM8758) && !defined(HAVE_TSC2100) \
   && !defined (HAVE_WM8711) && !defined (HAVE_WM8721) \
   && !defined (HAVE_WM8731) && !defined (HAVE_WM8978) \
-  && !defined(HAVE_AK4537)) || defined(SIMULATOR)
+  && !defined(HAVE_AK4537)) || (CONFIG_PLATFORM & PLATFORM_HOSTED)
 int sound_val2phys(int setting, int value)
 {
 #if CONFIG_CODEC == MAS3587F
@@ -820,7 +820,7 @@ int sound_val2phys(int setting, int value)
     return value;
 #endif
 }
-#endif /* !defined(HAVE_AS3514) || defined(SIMULATOR) */
+#endif /* CONFIG_CODECs || PLATFORM_HOSTED */
 
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
 /* This function works by telling the decoder that we have another
diff --git a/firmware/system.c b/firmware/system.c
index 87fc40850f..7e269ee119 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -26,7 +26,7 @@
 #include "string.h"
 #include "file.h"
 
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 long cpu_frequency SHAREDBSS_ATTR = CPU_FREQ;
 #endif