3 files changed, 10 insertions, 88 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index edb3bb3dd2..43cd3ddfb2 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -1,6 +1,3 @@
-#ifdef IRIVER_H100
-main.c
-#else
 alarm_menu.c
 bookmark.c
 credits.c
@@ -45,4 +42,4 @@ recorder/radio.c
 #ifdef HAVE_RECORDING
 recorder/recording.c
 #endif
-#endif
+
diff --git a/apps/main.c b/apps/main.c
index 8bcc25ae40..8154c44dcc 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -18,46 +18,6 @@
  ****************************************************************************/
 #include "config.h"
 
-#if defined(IRIVER_H100) && !defined(SIMULATOR)
-#include "thread.h"
-#include "cpu.h"
-
-unsigned long test_thread_stack[0x1000];
-
-void yield(void)
-{
-    switch_thread();
-    wake_up_thread();
-}
-
-void test_thread(void)
-{
-    while(1)
-    {
-        GPIO1_OUT ^= 0x00020000;
-        yield();
-    }
-}
-
-int main(void)
-{
-    int i;
-
-    init_threads();
-
-    create_thread(test_thread, test_thread_stack,
-                  sizeof(test_thread_stack), "Test thread");
-    
-    GPIO1_FUNCTION |= 0x00020000;
-    GPIO1_ENABLE |= 0x00020000;
-    
-    while(1) {
-        for(i = 0;i < 10000;i++) {}
-        yield();
-    }
-}
-
-#else
 #include "ata.h"
 #include "disk.h"
 #include "fat.h"
@@ -157,9 +117,10 @@ void init(void)
 void init(void)
 {
     int rc;
+#if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034)
     /* if nobody initialized ATA before, I consider this a cold start */
     bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */
-
+#endif
     system_init();
     kernel_init();
 
@@ -204,7 +165,7 @@ void init(void)
     radio_init();
 #endif
 
-#ifdef HAVE_CHARGING
+#if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034)
     if (coldstart && charger_inserted()
         && !global_settings.car_adapter_mode
 #ifdef ATA_POWER_PLAYERSTYLE
@@ -218,8 +179,6 @@ void init(void)
         /* "On" pressed or USB connected: proceed */
         show_logo();  /* again, to provide better visual feedback */
     }
-#else
-    (void)coldstart;
 #endif
 
     rc = ata_init();
@@ -311,4 +270,4 @@ int main(void)
     return 0;
 }
 #endif
-#endif
+
diff --git a/firmware/SOURCES b/firmware/SOURCES
index fc8430b0c4..535b221127 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1,40 +1,3 @@
-#ifdef IRIVER_H100
-crt0.S
-backlight.c
-thread.c
-system.c
-kernel.c
-common/memcpy_a.S
-common/memset_a.S
-common/atoi.c
-common/ctype.c
-common/dir.c
-common/disk.c
-common/errno.c
-common/file.c
-common/random.c
-common/sprintf.c
-common/strcasecmp.c
-common/strcat.c
-common/strchr.c
-common/strcmp.c
-common/strcpy.c
-common/strlen.c
-common/strncmp.c
-common/strncpy.c
-common/strrchr.c
-common/strtok.c
-panic.c
-font.c
-drivers/lcd.S
-drivers/lcd-h100.c
-drivers/ata.c
-drivers/led.c
-drivers/adc.c
-drivers/button.c
-drivers/fat.c
-drivers/power.c
-#else
 backlight.c
 buffer.c
 common/atoi.c
@@ -96,8 +59,12 @@ drivers/lcd-player-charset.c
 drivers/lcd-player.c
 #endif
 #ifdef HAVE_LCD_BITMAP
+#if CONFIG_LCD == LCD_S1D15E06
+drivers/lcd-h100.c
+#else
 drivers/lcd-recorder.c
 #endif
+#endif
 drivers/led.c
 #if CONFIG_HWCODEC != MASNONE
 drivers/mas.c
@@ -126,6 +93,5 @@ crt0.S
 #if CONFIG_CPU == SH7034
 bitswap.S
 descramble.S
-drivers/lcd.S
-#endif
 #endif
+drivers/lcd.S