diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/battery_bench.c | 4 | ||||
-rw-r--r-- | apps/plugins/clock/clock_settings.c | 2 | ||||
-rw-r--r-- | apps/plugins/jpeg/jpeg.c | 8 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/disk_buf.c | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/stream_mgr.h | 2 | ||||
-rw-r--r-- | apps/plugins/video.c | 2 | ||||
-rw-r--r-- | apps/plugins/wavplay.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index ef4795a0e1..fff93b2a3a 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -344,7 +344,7 @@ void thread(void) | |||
344 | bat[buf_idx].flags = charge_state(); | 344 | bat[buf_idx].flags = charge_state(); |
345 | #endif | 345 | #endif |
346 | buf_idx++; | 346 | buf_idx++; |
347 | rb->register_ata_idle_func(flush_buffer); | 347 | rb->register_storage_idle_func(flush_buffer); |
348 | } | 348 | } |
349 | 349 | ||
350 | /* What to do when the measurement buffer is full: | 350 | /* What to do when the measurement buffer is full: |
@@ -386,7 +386,7 @@ void thread(void) | |||
386 | } | 386 | } |
387 | 387 | ||
388 | /* unregister flush callback and flush to disk */ | 388 | /* unregister flush callback and flush to disk */ |
389 | rb->unregister_ata_idle_func(flush_buffer, true); | 389 | rb->unregister_storage_idle_func(flush_buffer, true); |
390 | 390 | ||
391 | /* log end of bench and exit reason */ | 391 | /* log end of bench and exit reason */ |
392 | fd = rb->open(BATTERY_LOG, O_RDWR | O_CREAT | O_APPEND); | 392 | fd = rb->open(BATTERY_LOG, O_RDWR | O_CREAT | O_APPEND); |
diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c index 44a6f164a7..1147055ce5 100644 --- a/apps/plugins/clock/clock_settings.c +++ b/apps/plugins/clock/clock_settings.c | |||
@@ -173,7 +173,7 @@ void load_settings(void){ | |||
173 | draw_message(display, MESSAGE_ERRLOAD, 1); | 173 | draw_message(display, MESSAGE_ERRLOAD, 1); |
174 | display->update(); | 174 | display->update(); |
175 | } | 175 | } |
176 | rb->ata_sleep(); | 176 | rb->storage_sleep(); |
177 | rb->sleep(HZ); | 177 | rb->sleep(HZ); |
178 | } | 178 | } |
179 | 179 | ||
diff --git a/apps/plugins/jpeg/jpeg.c b/apps/plugins/jpeg/jpeg.c index ed1b181e92..d8775dd176 100644 --- a/apps/plugins/jpeg/jpeg.c +++ b/apps/plugins/jpeg/jpeg.c | |||
@@ -438,14 +438,14 @@ int show_menu(void) /* return 1 to quit */ | |||
438 | #if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) | 438 | #if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) |
439 | /* change ata spindown time based on slideshow time setting */ | 439 | /* change ata spindown time based on slideshow time setting */ |
440 | immediate_ata_off = false; | 440 | immediate_ata_off = false; |
441 | rb->ata_spindown(rb->global_settings->disk_spindown); | 441 | rb->storage_spindown(rb->global_settings->disk_spindown); |
442 | 442 | ||
443 | if (slideshow_enabled) | 443 | if (slideshow_enabled) |
444 | { | 444 | { |
445 | if(jpeg_settings.ss_timeout < 10) | 445 | if(jpeg_settings.ss_timeout < 10) |
446 | { | 446 | { |
447 | /* slideshow times < 10s keep disk spinning */ | 447 | /* slideshow times < 10s keep disk spinning */ |
448 | rb->ata_spindown(0); | 448 | rb->storage_spindown(0); |
449 | } | 449 | } |
450 | else if (!rb->mp3_is_playing()) | 450 | else if (!rb->mp3_is_playing()) |
451 | { | 451 | { |
@@ -1057,7 +1057,7 @@ int load_and_show(char* filename) | |||
1057 | else if(immediate_ata_off) | 1057 | else if(immediate_ata_off) |
1058 | { | 1058 | { |
1059 | /* running slideshow and time is long enough: power down disk */ | 1059 | /* running slideshow and time is long enough: power down disk */ |
1060 | rb->ata_sleep(); | 1060 | rb->storage_sleep(); |
1061 | } | 1061 | } |
1062 | #endif | 1062 | #endif |
1063 | 1063 | ||
@@ -1259,7 +1259,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
1259 | 1259 | ||
1260 | #if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) | 1260 | #if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE) |
1261 | /* set back ata spindown time in case we changed it */ | 1261 | /* set back ata spindown time in case we changed it */ |
1262 | rb->ata_spindown(rb->global_settings->disk_spindown); | 1262 | rb->storage_spindown(rb->global_settings->disk_spindown); |
1263 | #endif | 1263 | #endif |
1264 | 1264 | ||
1265 | /* Turn on backlight timeout (revert to settings) */ | 1265 | /* Turn on backlight timeout (revert to settings) */ |
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c index 7ba4025f1e..df5e005b50 100644 --- a/apps/plugins/mpegplayer/disk_buf.c +++ b/apps/plugins/mpegplayer/disk_buf.c | |||
@@ -171,7 +171,7 @@ static inline void disk_buf_buffer(void) | |||
171 | if (!stream_get_window(&sw)) | 171 | if (!stream_get_window(&sw)) |
172 | { | 172 | { |
173 | disk_buf.state = TSTATE_DATA; | 173 | disk_buf.state = TSTATE_DATA; |
174 | rb->ata_sleep(); | 174 | rb->storage_sleep(); |
175 | break; | 175 | break; |
176 | } | 176 | } |
177 | 177 | ||
@@ -186,7 +186,7 @@ static inline void disk_buf_buffer(void) | |||
186 | /* Free space is less than one page */ | 186 | /* Free space is less than one page */ |
187 | disk_buf.state = TSTATE_DATA; | 187 | disk_buf.state = TSTATE_DATA; |
188 | disk_buf.low_wm = DISK_BUF_LOW_WATERMARK; | 188 | disk_buf.low_wm = DISK_BUF_LOW_WATERMARK; |
189 | rb->ata_sleep(); | 189 | rb->storage_sleep(); |
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | 192 | ||
@@ -208,7 +208,7 @@ static inline void disk_buf_buffer(void) | |||
208 | { | 208 | { |
209 | /* Error or end of stream */ | 209 | /* Error or end of stream */ |
210 | disk_buf.state = TSTATE_EOS; | 210 | disk_buf.state = TSTATE_EOS; |
211 | rb->ata_sleep(); | 211 | rb->storage_sleep(); |
212 | break; | 212 | break; |
213 | } | 213 | } |
214 | 214 | ||
diff --git a/apps/plugins/mpegplayer/stream_mgr.h b/apps/plugins/mpegplayer/stream_mgr.h index c94fa84089..e3ea9207e6 100644 --- a/apps/plugins/mpegplayer/stream_mgr.h +++ b/apps/plugins/mpegplayer/stream_mgr.h | |||
@@ -153,7 +153,7 @@ static inline bool stream_can_seek(void) | |||
153 | static inline void stream_keep_disk_active(void) | 153 | static inline void stream_keep_disk_active(void) |
154 | { | 154 | { |
155 | #ifdef HAVE_DISK_STORAGE | 155 | #ifdef HAVE_DISK_STORAGE |
156 | rb->ata_spin(); | 156 | rb->storage_spin(); |
157 | #endif | 157 | #endif |
158 | } | 158 | } |
159 | 159 | ||
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index 6a380b8e3c..1ba2b89e37 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -661,7 +661,7 @@ int PlayTick(int fd) | |||
661 | #endif | 661 | #endif |
662 | ) | 662 | ) |
663 | { | 663 | { |
664 | rb->ata_sleep(); /* no point in leaving the disk run til timeout */ | 664 | rb->storage_sleep(); /* no point in leaving the disk run til timeout */ |
665 | gPlay.bDiskSleep = true; | 665 | gPlay.bDiskSleep = true; |
666 | } | 666 | } |
667 | 667 | ||
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index c37b656d1c..dc0992abac 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c | |||
@@ -3598,7 +3598,7 @@ int play_file(char* filename) | |||
3598 | if (free_space <= 0) | 3598 | if (free_space <= 0) |
3599 | { | 3599 | { |
3600 | filling = false; | 3600 | filling = false; |
3601 | rb->ata_sleep(); | 3601 | rb->storage_sleep(); |
3602 | } | 3602 | } |
3603 | else | 3603 | else |
3604 | { | 3604 | { |