devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

remove the 2nd last evil use of ata_disk_is_active() in apps/

Browse source 
the last abuse is in battery bench


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17292 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-04-30 09:23:12 +00:00
parent bce419d890
commit 327f845adf
2 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
apps/playlist.c
View file

@ -70,6 +70,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "playlist.h" #include "playlist.h"
#include "ata_idle_notify.h"
#include "file.h" #include "file.h"
#include "action.h" #include "action.h"
#include "dir.h" #include "dir.h"
@ -1255,6 +1256,23 @@ static int compare(const void* p1, const void* p2)
* without affecting playlist load up performance. This thread also flushes * without affecting playlist load up performance. This thread also flushes
* any pending control commands when the disk spins up. * any pending control commands when the disk spins up.
*/ */
static bool playlist_flush_callback(void)
{
struct playlist_info *playlist;
playlist = &current_playlist;
if (playlist->control_fd >= 0)
{
if (playlist->num_cached > 0)
{
mutex_lock(&playlist->control_mutex);
flush_cached_control(playlist);
mutex_unlock(&playlist->control_mutex);
}
sync_control(playlist, true);
}
return true;
}
static void playlist_thread(void) static void playlist_thread(void)
{ {
struct queue_event ev; struct queue_event ev;
@ -1288,21 +1306,10 @@ static void playlist_thread(void)
timeout or 5s, whichever is less */ timeout or 5s, whichever is less */
case SYS_TIMEOUT: case SYS_TIMEOUT:
playlist = &current_playlist; playlist = &current_playlist;
if (playlist->control_fd >= 0)
if (playlist->control_fd >= 0
# ifndef SIMULATOR
&& ata_disk_is_active()
# endif
)
{ {
if (playlist->num_cached > 0) if (playlist->num_cached > 0)
{ register_ata_idle_func(playlist_flush_callback);
mutex_lock(&playlist->control_mutex);
flush_cached_control(playlist);
mutex_unlock(&playlist->control_mutex);
}
sync_control(playlist, true);
} }
if (!dirty_pointers) if (!dirty_pointers)

4
firmware/export/ata.h
View file

@ -40,6 +40,10 @@ extern void ata_enable(bool on);
extern void ata_spindown(int seconds); extern void ata_spindown(int seconds);
extern void ata_sleep(void); extern void ata_sleep(void);
extern void ata_sleepnow(void); extern void ata_sleepnow(void);
/* NOTE: DO NOT use this to poll for disk activity.
If you are waiting for the disk to become active before
doing something use ata_idle_notify.h
*/
extern bool ata_disk_is_active(void); extern bool ata_disk_is_active(void);
extern int ata_hard_reset(void); extern int ata_hard_reset(void);
extern int ata_soft_reset(void); extern int ata_soft_reset(void);