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))