diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-09-02 00:24:40 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-09-02 00:24:40 +0000 |
commit | f8381d9c39a3a8c1ca8351552bbfbbf55246063a (patch) | |
tree | 7d47ff3a097de3a552e16d3d54eadbf0c9aed86c /firmware/export/storage.h | |
parent | 24424bab2ae1a7a781b727a94501a75eaa218c56 (diff) | |
download | rockbox-f8381d9c39a3a8c1ca8351552bbfbbf55246063a.tar.gz rockbox-f8381d9c39a3a8c1ca8351552bbfbbf55246063a.zip |
Android: don't compile stubs.c and kill off libuisimulator entirely.
Seperate make rules in a almost empty android.make.
Also add forgotten powermgmt-android.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27977 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/storage.h')
-rw-r--r-- | firmware/export/storage.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/firmware/export/storage.h b/firmware/export/storage.h index e59a5e5bf6..9ff493e564 100644 --- a/firmware/export/storage.h +++ b/firmware/export/storage.h | |||
@@ -51,12 +51,31 @@ struct storage_info | |||
51 | char *revision; | 51 | char *revision; |
52 | }; | 52 | }; |
53 | 53 | ||
54 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(CONFIG_STORAGE_MULTI) | 54 | #if (CONFIG_STORAGE == 0) |
55 | /* stubs for the plugin api */ | ||
56 | static inline void stub_storage_sleep(void) {} | ||
57 | static inline void stub_storage_spin(void) {} | ||
58 | static inline void stub_storage_spindown(int timeout) { (void)timeout; } | ||
59 | #endif | ||
60 | |||
61 | #if defined(CONFIG_STORAGE) && !defined(CONFIG_STORAGE_MULTI) | ||
55 | /* storage_spindown, storage_sleep and storage_spin are passed as | 62 | /* storage_spindown, storage_sleep and storage_spin are passed as |
56 | * pointers, which doesn't work with argument-macros. | 63 | * pointers, which doesn't work with argument-macros. |
57 | */ | 64 | */ |
58 | #define storage_num_drives() NUM_DRIVES | 65 | #define storage_num_drives() NUM_DRIVES |
59 | #if (CONFIG_STORAGE & STORAGE_ATA) | 66 | #if (CONFIG_STORAGE == 0) /* application */ |
67 | #define STORANGE_FUNCTION(NAME) (stub_## NAME) | ||
68 | #define storage_spindown stub_storage_spindown | ||
69 | #define storage_sleep stub_storage_sleep | ||
70 | #define storage_spin stub_storage_spin | ||
71 | |||
72 | #define storage_enable(on) | ||
73 | #define storage_sleepnow() | ||
74 | #define storage_disk_is_active() | ||
75 | #define storage_soft_reset() | ||
76 | #define storage_init() | ||
77 | #define storage_close() | ||
78 | #elif (CONFIG_STORAGE & STORAGE_ATA) | ||
60 | #define STORAGE_FUNCTION(NAME) (ata_## NAME) | 79 | #define STORAGE_FUNCTION(NAME) (ata_## NAME) |
61 | #define storage_spindown ata_spindown | 80 | #define storage_spindown ata_spindown |
62 | #define storage_sleep ata_sleep | 81 | #define storage_sleep ata_sleep |