Add a complete priority inheritance implementation to the scheduler (all mutex ownership and queue_send calls are inheritable). Priorities are differential so that dispatch depends on the runnable range of priorities. Codec priority can therefore be raised in small steps (pcmbuf updated to enable). Simplify the kernel functions to ease implementation and use the same kernel.c for both sim and target (I'm tired of maintaining two ;_). 1) Not sure if a minor audio break at first buffering issue will exist on large-sector disks (the main mutex speed issue was genuinely resolved earlier). At this point it's best dealt with at the buffering level. It seems a larger filechunk could be used again. 2) Perhaps 64-bit sims will have some minor issues (finicky) but a backroll of the code of concern there is a 5-minute job. All kernel objects become incompatible so a full rebuild and update is needed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16791 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 48 deletions

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index e067235d95..56b303da8d 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -95,52 +95,6 @@ static unsigned short identify_info[SECTOR_SIZE/2];
 
 #ifdef MAX_PHYS_SECTOR_SIZE
 
-/** This is temporary **/
-/* Define the mutex functions to use the special hack object */
-#define mutex_init ata_spin_init
-#define mutex_lock ata_spin_lock
-#define mutex_unlock ata_spin_unlock
-
-void ata_spin_init(struct mutex *m)
-{
-    m->thread = NULL;
-    m->locked = 0;
-    m->count = 0;
-#if CONFIG_CORELOCK == SW_CORELOCK
-    corelock_init(&m->cl);
-#endif
-}
-
-void ata_spin_lock(struct mutex *m)
-{
-    struct thread_entry *current = thread_get_current();
-
-    if (current == m->thread)
-    {
-        m->count++;
-        return;
-    }
-
-    while (test_and_set(&m->locked, 1, &m->cl))
-        yield();
-
-    m->thread = current;
-}
-
-void ata_spin_unlock(struct mutex *m)
-{
-    if (m->count > 0)
-    {
-        m->count--;
-        return;
-    }
-
-    m->thread = NULL;
-    test_and_set(&m->locked, 0, &m->cl);
-}
-
-/****/
-
 struct sector_cache_entry {
     bool inuse;
     unsigned long sectornum;  /* logical sector */
@@ -163,7 +117,7 @@ STATICIRAM int wait_for_bsy(void)
     long timeout = current_tick + HZ*30;
     while (TIME_BEFORE(current_tick, timeout) && (ATA_STATUS & STATUS_BSY)) {
         last_disk_activity = current_tick;
-        priority_yield();
+        yield();
     }
 
     if (TIME_BEFORE(current_tick, timeout))
@@ -185,7 +139,7 @@ STATICIRAM int wait_for_rdy(void)
     while (TIME_BEFORE(current_tick, timeout) &&
            !(ATA_ALT_STATUS & STATUS_RDY)) {
         last_disk_activity = current_tick;
-        priority_yield();
+        yield();
     }
 
     if (TIME_BEFORE(current_tick, timeout))