diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-02-03 08:36:43 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-02-03 08:36:43 +0000 |
| commit | 8ef88a1815cab2cee4cd31688c01f749ac88afd2 (patch) | |
| tree | b515fbd73261c4717bc156dd59105c9e6ff0dfe8 /apps | |
| parent | 72ec431fc2025614fd3d0606f5db73f6b71ed06c (diff) | |
| download | rockbox-8ef88a1815cab2cee4cd31688c01f749ac88afd2.zip rockbox-8ef88a1815cab2cee4cd31688c01f749ac88afd2.tar.gz rockbox-8ef88a1815cab2cee4cd31688c01f749ac88afd2.tar.bz2 rockbox-8ef88a1815cab2cee4cd31688c01f749ac88afd2.tar.xz | |
Build Rockbox for iRiver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5759 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/SOURCES | 5 | ||||
| -rw-r--r-- | apps/main.c | 49 |
2 files changed, 5 insertions, 49 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index edb3bb3..43cd3dd 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 8bcc25a..8154c44 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 + |