From bdb5974c0ef05ca548beabdd2ece0512a60024f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Fri, 17 Jul 2009 16:34:34 +0000 Subject: Revert r21912 : "Storage API : remove undeeded target-specific functions" After a discussion mixed on mailing list and irc, it was agreed that more abstraction for plugins is better (so developers don't have to add a check to HAVE_DISK_STORAGE when writing disk-specific code) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21923 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/mmc.h | 3 +++ firmware/export/nand.h | 3 +++ firmware/export/sd.h | 3 +++ firmware/export/storage.h | 18 +++++++++--------- 4 files changed, 18 insertions(+), 9 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h index bd4b7f9..06d99d2 100644 --- a/firmware/export/mmc.h +++ b/firmware/export/mmc.h @@ -28,6 +28,8 @@ struct storage_info; void mmc_enable(bool on); +void mmc_spindown(int seconds); +void mmc_sleep(void); void mmc_sleepnow(void); bool mmc_disk_is_active(void); int mmc_soft_reset(void); @@ -35,6 +37,7 @@ int mmc_init(void); void mmc_close(void); int mmc_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf); int mmc_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf); +void mmc_spin(void); int mmc_spinup_time(void); #ifdef STORAGE_GET_INFO diff --git a/firmware/export/nand.h b/firmware/export/nand.h index 64416b9..a5b0a1c 100644 --- a/firmware/export/nand.h +++ b/firmware/export/nand.h @@ -28,12 +28,15 @@ struct storage_info; void nand_enable(bool on); +void nand_spindown(int seconds); +void nand_sleep(void); bool nand_disk_is_active(void); int nand_soft_reset(void); int nand_init(void); void nand_close(void); int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf); int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf); +void nand_spin(void); #ifdef STORAGE_GET_INFO void nand_get_info(IF_MV2(int drive,) struct storage_info *info); diff --git a/firmware/export/sd.h b/firmware/export/sd.h index f100f30..d313a4c 100644 --- a/firmware/export/sd.h +++ b/firmware/export/sd.h @@ -30,12 +30,15 @@ struct storage_info; void sd_enable(bool on); +void sd_spindown(int seconds); +void sd_sleep(void); bool sd_disk_is_active(void); int sd_soft_reset(void); int sd_init(void); void sd_close(void); int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf); int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf); +void sd_spin(void); #ifdef STORAGE_GET_INFO void sd_get_info(IF_MV2(int drive,) struct storage_info *info); diff --git a/firmware/export/storage.h b/firmware/export/storage.h index 73ec970..47d8abd 100644 --- a/firmware/export/storage.h +++ b/firmware/export/storage.h @@ -81,9 +81,9 @@ struct storage_info #define storage_present(drive) ata_present(IF_MV(drive)) #endif #elif (CONFIG_STORAGE & STORAGE_SD) - #define storage_spindown(seconds) (void)0 - #define storage_sleep() (void)0 - #define storage_spin() (void)0 + #define storage_spindown sd_spindown + #define storage_sleep sd_sleep + #define storage_spin sd_spin #define storage_enable(on) sd_enable(on) #define storage_sleepnow() sd_sleepnow() @@ -105,9 +105,9 @@ struct storage_info #define storage_present(drive) sd_present(IF_MV(drive)) #endif #elif (CONFIG_STORAGE & STORAGE_MMC) - #define storage_spindown(seconds) (void)0 - #define storage_sleep() (void)0 - #define storage_spin() (void)0 + #define storage_spindown mmc_spindown + #define storage_sleep mmc_sleep + #define storage_spin mmc_spin #define storage_enable(on) mmc_enable(on) #define storage_sleepnow() mmc_sleepnow() @@ -129,9 +129,9 @@ struct storage_info #define storage_present(drive) mmc_present(IF_MV(drive)) #endif #elif (CONFIG_STORAGE & STORAGE_NAND) - #define storage_spindown(seconds) (void)0 - #define storage_sleep() (void)0 - #define storage_spin() (void)0 + #define storage_spindown nand_spindown + #define storage_sleep nand_sleep + #define storage_spin nand_spin #define storage_enable(on) (void)0 #define storage_sleepnow() nand_sleepnow() -- cgit v1.1