summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-11-04 19:57:36 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-11-04 19:57:36 +0000
commit059fff29ec662ffa0b2c2e5ebc91d574007b81a8 (patch)
treebda825cb629e1114cad8afef3eb73cddd03fb42d
parent5a00367a08a54893712566d9f075684fae964d23 (diff)
downloadrockbox-059fff29ec662ffa0b2c2e5ebc91d574007b81a8.tar.gz
rockbox-059fff29ec662ffa0b2c2e5ebc91d574007b81a8.zip
Since *set_led_enabled() is actually an ata-specific feature, move it back to ata_* only
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19006 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/recorder/recording.c14
-rw-r--r--firmware/export/mmc.h4
-rw-r--r--firmware/export/nand.h4
-rw-r--r--firmware/export/ramdisk.h4
-rw-r--r--firmware/export/sd.h4
-rw-r--r--firmware/export/storage.h18
6 files changed, 10 insertions, 38 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 5a2aa096db..b2c81cd21b 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -66,6 +66,10 @@
66#include "talk.h" 66#include "talk.h"
67#include "sound.h" 67#include "sound.h"
68#include "storage.h" 68#include "storage.h"
69#if (CONFIG_STORAGE & STORAGE_ATA) && (CONFIG_LED == LED_REAL) \
70 && !defined(SIMULATOR)
71#include "ata.h"
72#endif
69#include "splash.h" 73#include "splash.h"
70#include "screen_access.h" 74#include "screen_access.h"
71#include "action.h" 75#include "action.h"
@@ -1033,8 +1037,9 @@ bool recording_screen(bool no_source)
1033 struct audio_recording_options rec_options; 1037 struct audio_recording_options rec_options;
1034 rec_status = RCSTAT_IN_RECSCREEN; 1038 rec_status = RCSTAT_IN_RECSCREEN;
1035 1039
1036#if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR) 1040#if (CONFIG_STORAGE & STORAGE_ATA) && (CONFIG_LED == LED_REAL) \
1037 storage_set_led_enabled(false); 1041 && !defined(SIMULATOR)
1042 ata_set_led_enabled(false);
1038#endif 1043#endif
1039 1044
1040#if CONFIG_CODEC == SWCODEC 1045#if CONFIG_CODEC == SWCODEC
@@ -1904,8 +1909,9 @@ rec_abort:
1904 if (rec_status & (RCSTAT_CREATED_DIRECTORY | RCSTAT_HAVE_RECORDED)) 1909 if (rec_status & (RCSTAT_CREATED_DIRECTORY | RCSTAT_HAVE_RECORDED))
1905 reload_directory(); 1910 reload_directory();
1906 1911
1907#if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR) 1912#if (CONFIG_STORAGE & STORAGE_ATA) && (CONFIG_LED == LED_REAL) \
1908 storage_set_led_enabled(true); 1913 && !defined(SIMULATOR)
1914 ata_set_led_enabled(true);
1909#endif 1915#endif
1910 1916
1911#if CONFIG_TUNER 1917#if CONFIG_TUNER
diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h
index 0d99fac0ca..06d99d219e 100644
--- a/firmware/export/mmc.h
+++ b/firmware/export/mmc.h
@@ -40,10 +40,6 @@ int mmc_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const v
40void mmc_spin(void); 40void mmc_spin(void);
41int mmc_spinup_time(void); 41int mmc_spinup_time(void);
42 42
43#if (CONFIG_LED == LED_REAL)
44void mmc_set_led_enabled(bool enabled);
45#endif
46
47#ifdef STORAGE_GET_INFO 43#ifdef STORAGE_GET_INFO
48void mmc_get_info(IF_MV2(int drive,) struct storage_info *info); 44void mmc_get_info(IF_MV2(int drive,) struct storage_info *info);
49#endif 45#endif
diff --git a/firmware/export/nand.h b/firmware/export/nand.h
index 1757a1421a..a5b0a1ceee 100644
--- a/firmware/export/nand.h
+++ b/firmware/export/nand.h
@@ -38,10 +38,6 @@ int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* b
38int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf); 38int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf);
39void nand_spin(void); 39void nand_spin(void);
40 40
41#if (CONFIG_LED == LED_REAL)
42void nand_set_led_enabled(bool enabled);
43#endif
44
45#ifdef STORAGE_GET_INFO 41#ifdef STORAGE_GET_INFO
46void nand_get_info(IF_MV2(int drive,) struct storage_info *info); 42void nand_get_info(IF_MV2(int drive,) struct storage_info *info);
47#endif 43#endif
diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h
index 5fb78ed386..a0c011fadd 100644
--- a/firmware/export/ramdisk.h
+++ b/firmware/export/ramdisk.h
@@ -39,10 +39,6 @@ int ramdisk_write_sectors(IF_MV2(int drive,) unsigned long start, int count, con
39void ramdisk_spin(void); 39void ramdisk_spin(void);
40void ramdisk_sleepnow(void); 40void ramdisk_sleepnow(void);
41 41
42#if (CONFIG_LED == LED_REAL)
43void ramdisk_set_led_enabled(bool enabled);
44#endif
45
46#ifdef STORAGE_GET_INFO 42#ifdef STORAGE_GET_INFO
47void ramdisk_get_info(IF_MV2(int drive,) struct storage_info *info); 43void ramdisk_get_info(IF_MV2(int drive,) struct storage_info *info);
48#endif 44#endif
diff --git a/firmware/export/sd.h b/firmware/export/sd.h
index 8f1c8fe413..11923fdc92 100644
--- a/firmware/export/sd.h
+++ b/firmware/export/sd.h
@@ -38,10 +38,6 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf
38int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf); 38int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf);
39void sd_spin(void); 39void sd_spin(void);
40 40
41#if (CONFIG_LED == LED_REAL)
42void sd_set_led_enabled(bool enabled);
43#endif
44
45#ifdef STORAGE_GET_INFO 41#ifdef STORAGE_GET_INFO
46void sd_get_info(IF_MV2(int drive,) struct storage_info *info); 42void sd_get_info(IF_MV2(int drive,) struct storage_info *info);
47#endif 43#endif
diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index 14cd481f74..47d8abda52 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -73,9 +73,6 @@ struct storage_info
73 #define storage_spinup_time() ata_spinup_time() 73 #define storage_spinup_time() ata_spinup_time()
74 #define storage_get_identify() ata_get_identify() 74 #define storage_get_identify() ata_get_identify()
75 75
76 #if (CONFIG_LED == LED_REAL)
77 #define storage_set_led_enabled(enabled) ata_set_led_enabled(enabled)
78 #endif
79 #ifdef STORAGE_GET_INFO 76 #ifdef STORAGE_GET_INFO
80 #define storage_get_info(drive, info) ata_get_info(IF_MV2(drive,) info) 77 #define storage_get_info(drive, info) ata_get_info(IF_MV2(drive,) info)
81 #endif 78 #endif
@@ -100,9 +97,6 @@ struct storage_info
100 #define storage_spinup_time() 0 97 #define storage_spinup_time() 0
101 #define storage_get_identify() sd_get_identify() 98 #define storage_get_identify() sd_get_identify()
102 99
103 #if (CONFIG_LED == LED_REAL)
104 #define storage_set_led_enabled(enabled) sd_set_led_enabled(enabled)
105 #endif
106 #ifdef STORAGE_GET_INFO 100 #ifdef STORAGE_GET_INFO
107 #define storage_get_info(drive, info) sd_get_info(IF_MV2(drive,) info) 101 #define storage_get_info(drive, info) sd_get_info(IF_MV2(drive,) info)
108 #endif 102 #endif
@@ -127,9 +121,6 @@ struct storage_info
127 #define storage_spinup_time() 0 121 #define storage_spinup_time() 0
128 #define storage_get_identify() mmc_get_identify() 122 #define storage_get_identify() mmc_get_identify()
129 123
130 #if (CONFIG_LED == LED_REAL)
131 #define storage_set_led_enabled(enabled) mmc_set_led_enabled(enabled)
132 #endif
133 #ifdef STORAGE_GET_INFO 124 #ifdef STORAGE_GET_INFO
134 #define storage_get_info(drive, info) mmc_get_info(IF_MV2(drive,) info) 125 #define storage_get_info(drive, info) mmc_get_info(IF_MV2(drive,) info)
135 #endif 126 #endif
@@ -154,9 +145,6 @@ struct storage_info
154 #define storage_spinup_time() 0 145 #define storage_spinup_time() 0
155 #define storage_get_identify() nand_get_identify() 146 #define storage_get_identify() nand_get_identify()
156 147
157 #if (CONFIG_LED == LED_REAL)
158 #define storage_set_led_enabled(enabled) nand_set_led_enabled(enabled)
159 #endif
160 #ifdef STORAGE_GET_INFO 148 #ifdef STORAGE_GET_INFO
161 #define storage_get_info(drive, info) nand_get_info(IF_MV2(drive,) info) 149 #define storage_get_info(drive, info) nand_get_info(IF_MV2(drive,) info)
162 #endif 150 #endif
@@ -181,9 +169,6 @@ struct storage_info
181 #define storage_spinup_time() 0 169 #define storage_spinup_time() 0
182 #define storage_get_identify() ramdisk_get_identify() 170 #define storage_get_identify() ramdisk_get_identify()
183 171
184 #if (CONFIG_LED == LED_REAL)
185 #define storage_set_led_enabled(enabled) ramdisk_set_led_enabled(enabled)
186 #endif
187 #ifdef STORAGE_GET_INFO 172 #ifdef STORAGE_GET_INFO
188 #define storage_get_info(drive, info) ramdisk_get_info(IF_MV2(drive,) info) 173 #define storage_get_info(drive, info) ramdisk_get_info(IF_MV2(drive,) info)
189 #endif 174 #endif
@@ -212,9 +197,6 @@ int storage_read_sectors(int drive, unsigned long start, int count, void* buf);
212int storage_write_sectors(int drive, unsigned long start, int count, const void* buf); 197int storage_write_sectors(int drive, unsigned long start, int count, const void* buf);
213void storage_spin(void); 198void storage_spin(void);
214void storage_spindown(int seconds); 199void storage_spindown(int seconds);
215#if (CONFIG_LED == LED_REAL)
216void storage_set_led_enabled(bool enabled);
217#endif
218long storage_last_disk_activity(void); 200long storage_last_disk_activity(void);
219int storage_spinup_time(void); 201int storage_spinup_time(void);
220#ifdef STORAGE_GET_INFO 202#ifdef STORAGE_GET_INFO