Rockbox - Rockbox mail archive

From: Maurus Cuelenaere <mcuelenaere_at_gmail.com>
Date: Thu, 02 Sep 2010 03:18:45 +0200

Op 02-09-10 02:24, mailer_at_svn.rockbox.org schreef:
> Date: 2010-09-02 02:24:40 +0200 (Thu, 02 Sep 2010)
> New Revision: 27977
>
> Log Message:
> 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
>
> Added:
> trunk/android/android.make
> trunk/firmware/target/hosted/android/powermgmt-android.c
> Modified:
> trunk/firmware/export/storage.h
> trunk/tools/root.make
> trunk/uisimulator/common/SOURCES
>
>
> Modified: trunk/firmware/export/storage.h
> ===================================================================
> --- trunk/firmware/export/storage.h 2010-09-01 23:49:28 UTC (rev 27976)
> +++ trunk/firmware/export/storage.h 2010-09-02 00:24:40 UTC (rev 27977)
> _at__at_ -51,12 +51,31 _at__at_
> char *revision;
> };
>
> -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(CONFIG_STORAGE_MULTI)
> +#if (CONFIG_STORAGE == 0)
> +/* stubs for the plugin api */
> +static inline void stub_storage_sleep(void) {}
> +static inline void stub_storage_spin(void) {}
> +static inline void stub_storage_spindown(int timeout) { (void)timeout; }
> +#endif
> +
> +#if defined(CONFIG_STORAGE) && !defined(CONFIG_STORAGE_MULTI)
> /* storage_spindown, storage_sleep and storage_spin are passed as
> * pointers, which doesn't work with argument-macros.
> */
> #define storage_num_drives() NUM_DRIVES
> - #if (CONFIG_STORAGE & STORAGE_ATA)
> + #if (CONFIG_STORAGE == 0) /* application */
> + #define STORANGE_FUNCTION(NAME) (stub_## NAME)

Shouldn't this be STORAGE_FUNCTION?

> + #define storage_spindown stub_storage_spindown
> + #define storage_sleep stub_storage_sleep
> + #define storage_spin stub_storage_spin
> +
> + #define storage_enable(on)
> + #define storage_sleepnow()
> + #define storage_disk_is_active()
> + #define storage_soft_reset()
> + #define storage_init()
> + #define storage_close()
> + #elif (CONFIG_STORAGE & STORAGE_ATA)
> #define STORAGE_FUNCTION(NAME) (ata_## NAME)
> #define storage_spindown ata_spindown
> #define storage_sleep ata_sleep
>

-- 
Maurus Cuelenaere

Received on 2010-09-02

Rockbox mail archive

Re: kugel: r27977 - in trunk: android firmware/export firmware/target/hosted/android tools uisimulator/common