Rewrite filesystem code (WIP)

This patch redoes the filesystem code from the FAT driver up to the
clipboard code in onplay.c.

Not every aspect of this is finished therefore it is still "WIP". I
don't wish to do too much at once (haha!). What is left to do is get
dircache back in the sim and find an implementation for the dircache
indicies in the tagcache and playlist code or do something else that
has the same benefit. Leaving these out for now does not make anything
unusable. All the basics are done.

Phone app code should probably get vetted (and app path handling
just plain rewritten as environment expansions); the SDL app and
Android run well.

Main things addressed:
1) Thread safety: There is none right now in the trunk code. Most of
what currently works is luck when multiple threads are involved or
multiple descriptors to the same file are open.

2) POSIX compliance: Many of the functions behave nothing like their
counterparts on a host system. This leads to inconsistent code or very
different behavior from native to hosted. One huge offender was
rename(). Going point by point would fill a book.

3) Actual running RAM usage: Many targets will use less RAM and less
stack space (some more RAM because I upped the number of cache buffers
for large memory). There's very little memory lying fallow in rarely-used
areas (see 'Key core changes' below). Also, all targets may open the same
number of directory streams whereas before those with less than 8MB RAM
were limited to 8, not 12 implying those targets will save slightly
less.

4) Performance: The test_disk plugin shows markedly improved performance,
particularly in the area of (uncached) directory scanning, due partly to
more optimal directory reading and to a better sector cache algorithm.
Uncached times tend to be better while there is a bit of a slowdown in
dircache due to it being a bit heavier of an implementation. It's not
noticeable by a human as far as I can say.

Key core changes:
1) Files and directories share core code and data structures.

2) The filesystem code knows which descriptors refer to same file.
This ensures that changes from one stream are appropriately reflected
in every open descriptor for that file (fileobj_mgr.c).

3) File and directory cache buffers are borrowed from the main sector
cache. This means that when they are not in use by a file, they are not
wasted, but used for the cache. Most of the time, only a few of them
are needed. It also means that adding more file and directory handles
is less expensive. All one must do in ensure a large enough cache to
borrow from.

4) Relative path components are supported and the namespace is unified.
It does not support full relative paths to an implied current directory;
what is does support is use of "." and "..". Adding the former would
not be very difficult. The namespace is unified in the sense that
volumes may be specified several times along with relative parts, e.g.:
"/<0>/foo/../../<1>/bar" :<=> "/<1>/bar".

5) Stack usage is down due to sharing of data, static allocation and
less duplication of strings on the stack. This requires more
serialization than I would like but since the number of threads is
limited to a low number, the tradoff in favor of the stack seems
reasonable.

6) Separates and heirarchicalizes (sic) the SIM and APP filesystem
code. SIM path and volume handling is just like the target. Some
aspects of the APP file code get more straightforward (e.g. no path
hashing is needed).

Dircache:
Deserves its own section. Dircache is new but pays homage to the old.
The old one was not compatible and so it, since it got redone, does
all the stuff it always should have done such as:

1) It may be update and used at any time during the build process.
No longer has one to wait for it to finish building to do basic file
management (create, remove, rename, etc.).

2) It does not need to be either fully scanned or completely disabled;
it can be incomplete (i.e. overfilled, missing paths), still be
of benefit and be correct.

3) Handles mounting and dismounting of individual volumes which means
a full rebuild is not needed just because you pop a new SD card in the
slot. Now, because it reuses its freed entry data, may rebuild only
that volume.

4) Much more fundamental to the file code. When it is built, it is
the keeper of the master file list whether enabled or not ("disabled"
is just a state of the cache). Its must always to ready to be started
and bind all streams opened prior to being enabled.

5) Maintains any short filenames in OEM format which means that it does
not need to be rebuilt when changing the default codepage.

Miscellaneous Compatibility:
1) Update any other code that would otherwise not work such as the
hotswap mounting code in various card drivers.

2) File management: Clipboard needed updating because of the behavioral
changes. Still needs a little more work on some finer points.

3) Remove now-obsolete functionality such as the mutex's "no preempt"
flag (which was only for the prior FAT driver).

4) struct dirinfo uses time_t rather than raw FAT directory entry
time fields. I plan to follow up on genericizing everything there
(i.e. no FAT attributes).

5) unicode.c needed some redoing so that the file code does not try
try to load codepages during a scan, which is actually a problem with
the current code. The default codepage, if any is required, is now
kept in RAM separarately (bufalloced) from codepages specified to
iso_decode() (which must not be bufalloced because the conversion
may be done by playback threads).

Brings with it some additional reusable core code:
1) Revised file functions: Reusable code that does things such as
safe path concatenation and parsing without buffer limitations or
data duplication. Variants that copy or alter the input path may be
based off these.

To do:
1) Put dircache functionality back in the sim. Treating it internally
as a different kind of file system seems the best approach at this
time.

2) Restore use of dircache indexes in the playlist and database or
something effectively the same. Since the cache doesn't have to be
complete in order to be used, not getting a hit on the cache doesn't
unambiguously say if the path exists or not.

Change-Id: Ia30f3082a136253e3a0eae0784e3091d138915c8
Reviewed-on: http://gerrit.rockbox.org/566
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested: Michael Sevakis <jethead71@rockbox.org>

9 files changed, 140 insertions, 200 deletions

diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index c80c7f7491..ead40eac3c 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -449,21 +449,12 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-        {
-            int microsd_init = 1;
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
+        case SYS_HOTSWAP_EXTRACTED:;
+            int success = 1;
 
-            /* We now have exclusive control of fat cache and ata */
+            disk_unmount(SD_SLOT_AS3525); /* release "by force" */
 
-            disk_unmount(SD_SLOT_AS3525);     /* release "by force", ensure file
-                                    descriptors aren't leaked and any busy
-                                    ones are invalid if mounting */
+            mutex_lock(&sd_mtx); /* lock-out card activity */
 
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
@@ -471,29 +462,32 @@ static void sd_thread(void)
 
             if (ev.id == SYS_HOTSWAP_INSERTED)
             {
+                success = 0;
                 sd_enable(true);
                 init_pl180_controller(SD_SLOT_AS3525);
-                microsd_init = sd_init_card(SD_SLOT_AS3525);
-                if (microsd_init < 0) /* initialisation failed */
-                    panicf("microSD init failed : %d", microsd_init);
-
-                microsd_init = disk_mount(SD_SLOT_AS3525); /* 0 if fail */
+                int rc = sd_init_card(SD_SLOT_AS3525);
+                sd_enable(false);
+                if (rc >= 0)
+                    success = 2;
+                else /* initialisation failed */
+                    panicf("microSD init failed : %d", rc);
             }
 
+            mutex_unlock(&sd_mtx);
+
+            if (success > 1)
+                success = disk_mount(SD_SLOT_AS3525); /* 0 if fail */
+
             /*
              * Mount succeeded, or this was an EXTRACTED event,
              * in both cases notify the system about the changed filesystems
              */
-            if (microsd_init)  
+            if (success)
                 queue_broadcast(SYS_FS_CHANGED, 0);
 
-            /* Access is now safe */
-            mutex_unlock(&sd_mtx);
-            fat_unlock();
-            sd_enable(false);
-        }
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
+
         case SYS_TIMEOUT:
             if (TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
             {
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index ae3dde4495..b4ac40152b 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -598,21 +598,13 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-        {
-            int changed = 1;
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
-
-            /* We now have exclusive control of fat cache and ata */
-
-            disk_unmount(SD_SLOT_AS3525);     /* release "by force", ensure file
-                                    descriptors aren't leaked and any busy
-                                    ones are invalid if mounting */
+        case SYS_HOTSWAP_EXTRACTED:;
+            int success = 1;
+
+            disk_unmount(SD_SLOT_AS3525); /* release "by force" */
+
+            mutex_lock(&sd_mtx); /* lock-out card activity */
+
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
             card_info[SD_SLOT_AS3525].initialized = 0;
@@ -620,24 +612,25 @@ static void sd_thread(void)
             if (ev.id == SYS_HOTSWAP_INSERTED)
             {
                 sd_enable(true);
-                changed = (sd_init_card(SD_SLOT_AS3525) == 0) && disk_mount(SD_SLOT_AS3525); /* 0 if fail */
+                success = sd_init_card(SD_SLOT_AS3525) == 0 ? 2 : 0;
+                sd_enable(false);
             }
 
+            mutex_unlock(&sd_mtx);
+
+            if (success > 1)
+                success = disk_mount(SD_SLOT_AS3525); /* 0 if fail */
+
             /*
              * Mount succeeded, or this was an EXTRACTED event,
              * in both cases notify the system about the changed filesystems
              */
-            if (changed)
+            if (success)
                 queue_broadcast(SYS_FS_CHANGED, 0);
 
-            sd_enable(false);
-
-            /* Access is now safe */
-            mutex_unlock(&sd_mtx);
-            fat_unlock();
-            }
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
+
         case SYS_TIMEOUT:
             if (TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
             {
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index 8f293543ab..87548aef53 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -766,14 +766,7 @@ static void sdmmc_thread(void)
         case SYS_HOTSWAP_INSERTED:
         case SYS_HOTSWAP_EXTRACTED:
         {
-            int microsd_init = 1;
-             /* lock-out FAT activity first -
-              * prevent deadlocking via disk_mount that
-              * would cause a reverse-order attempt with
-              * another thread */
-#ifdef HAVE_HOTSWAP
-            fat_lock();
-#endif
+            int microsd_init = ev.id == SYS_HOTSWAP_INSERTED ? 0 : 1;
 
             /* We now have exclusive control of fat cache and sd.
              * Release "by force", ensure file
@@ -785,35 +778,37 @@ static void sdmmc_thread(void)
                 /* Skip non-removable drivers */
                 if(!sdmmc_removable(drive))
                     continue;
-                /* lock-out card activity - direct calls
-                 * into driver that bypass the fat cache */
-                mutex_lock(&mutex[drive]);
+
                 disk_unmount(sd_first_drive + sd_drive);
+
+                mutex_lock(&mutex[drive]); /* lock-out card activity */
+
                 /* Force card init for new card, re-init for re-inserted one or
                  * clear if the last attempt to init failed with an error. */
                 SDMMC_INFO(sd_map[sd_drive]).initialized = 0;
 
+                int rc = -1;
                 if(ev.id == SYS_HOTSWAP_INSERTED)
                 {
-                    microsd_init = init_drive(drive);
-                    if(microsd_init < 0) /* initialisation failed */
-                        panicf("%s init failed : %d", SDMMC_CONF(sd_map[sd_drive]).name, microsd_init);
-
-                    microsd_init = disk_mount(sd_first_drive + sd_drive); /* 0 if fail */
+                    rc = init_drive(drive);
+                    if(rc < 0) /* initialisation failed */
+                        panicf("%s init failed : %d", SDMMC_CONF(sd_map[sd_drive]).name, rc);
                 }
-                /*
-                * Mount succeeded, or this was an EXTRACTED event,
-                * in both cases notify the system about the changed filesystems
-                */
-                if(microsd_init)
-                    queue_broadcast(SYS_FS_CHANGED, 0);
+
                 /* unlock card */
                 mutex_unlock(&mutex[drive]);
+
+                if (rc >= 0)
+                    microsd_init += disk_mount(sd_first_drive + sd_drive); /* 0 if fail */
             }
             /* Access is now safe */
-#ifdef HAVE_HOTSWAP
-            fat_unlock();
-#endif
+           /*
+            * One or more mounts succeeded, or this was an EXTRACTED event,
+            * in both cases notify the system about the changed filesystems
+            */
+            if(microsd_init)
+                queue_broadcast(SYS_FS_CHANGED, 0);
+
             break;
         }
 #endif
diff --git a/firmware/target/arm/pp/ata-sd-pp.c b/firmware/target/arm/pp/ata-sd-pp.c
index bcf8a660c2..2a11b40fee 100644
--- a/firmware/target/arm/pp/ata-sd-pp.c
+++ b/firmware/target/arm/pp/ata-sd-pp.c
@@ -19,7 +19,6 @@
  *
  ****************************************************************************/
 #include "config.h" /* for HAVE_MULTIDRIVE */
-#include "fat.h"
 #include "sdmmc.h"
 #include "gcc_extensions.h"
 #ifdef HAVE_HOTSWAP
@@ -1125,35 +1124,28 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
+        case SYS_HOTSWAP_EXTRACTED:;
+            int success = 1;
 
-            /* We now have exclusive control of fat cache and ata */
+            disk_unmount(sd_first_drive+1); /* release "by force" */
 
-            disk_unmount(sd_first_drive+1); /* release "by force", ensure file
-                                        descriptors aren't leaked and any busy
-                                        ones are invalid if mounting */
+            mutex_lock(&sd_mtx); /* lock-out card activity */
 
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
             card_info[1].initialized = 0;
             sd_status[1].retry = 0; 
 
-            if (ev.id == SYS_HOTSWAP_INSERTED)
-                disk_mount(sd_first_drive+1);
-
-            queue_broadcast(SYS_FS_CHANGED, 0);
-
             /* Access is now safe */
             mutex_unlock(&sd_mtx);
-            fat_unlock();
+
+            if (ev.id == SYS_HOTSWAP_INSERTED)
+                success = disk_mount(sd_first_drive+1); /* 0 if fail */
+
+            if (success)
+                queue_broadcast(SYS_FS_CHANGED, 0);
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
         case SYS_TIMEOUT:
             if (TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
             {
diff --git a/firmware/target/arm/rk27xx/sd-rk27xx.c b/firmware/target/arm/rk27xx/sd-rk27xx.c
index deca8a1fa7..9d6821ee38 100644
--- a/firmware/target/arm/rk27xx/sd-rk27xx.c
+++ b/firmware/target/arm/rk27xx/sd-rk27xx.c
@@ -22,7 +22,6 @@
  ****************************************************************************/
 
 #include "config.h" /* for HAVE_MULTIVOLUME */
-#include "fat.h"
 #include "thread.h"
 #include "gcc_extensions.h"
 #include "led.h"
@@ -331,50 +330,45 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-        {
-            int microsd_init = 1;
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
-
-            /* We now have exclusive control of fat cache and ata */
-
-            disk_unmount(sd_first_drive);     /* release "by force", ensure file
-                                    descriptors aren't leaked and any busy
-                                    ones are invalid if mounting */
+        case SYS_HOTSWAP_EXTRACTED:;
+            int success = 1;
+
+            disk_unmount(sd_first_drive); /* release "by force" */
+
+            mutex_lock(&sd_mtx); /* lock-out card activity */
+
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
             card_info.initialized = 0;
 
             if (ev.id == SYS_HOTSWAP_INSERTED)
             {
+                success = 0;
                 sd_enable(true);
-                microsd_init = sd_init_card(sd_first_drive);
-                if (microsd_init < 0) /* initialisation failed */
-                    panicf("microSD init failed : %d", microsd_init);
-
-                microsd_init = disk_mount(sd_first_drive); /* 0 if fail */
+                int rc = sd_init_card(sd_first_drive);
+                sd_enable(false);
+                if (rc >= 0)
+                    success = 2;
+                else /* initialisation failed */
+                    panicf("microSD init failed : %d", rc);
             }
 
+            /* Access is now safe */
+            mutex_unlock(&sd_mtx);
+
+            if (success > 1)
+                success = disk_mount(sd_first_drive); /* 0 if fail */
+
             /*
              * Mount succeeded, or this was an EXTRACTED event,
              * in both cases notify the system about the changed filesystems
              */
-            if (microsd_init)
+            if (success)
                 queue_broadcast(SYS_FS_CHANGED, 0);
 
-            sd_enable(false);
-
-            /* Access is now safe */
-            mutex_unlock(&sd_mtx);
-            fat_unlock();
-            }
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
+
         case SYS_TIMEOUT:
             if (TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
             {
diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index 6658fa1515..e8de3ac78d 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -34,7 +34,6 @@
 #ifdef HAVE_HOTSWAP
 #include "sdmmc.h"
 #include "disk.h"
-#include "fat.h"
 #endif
 #include "dma-target.h"     
 #include "system-target.h"
@@ -585,48 +584,29 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-        {
+        case SYS_HOTSWAP_EXTRACTED:;
             int success = 1;
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
 
-            /* We now have exclusive control of fat cache and ata */
+            disk_unmount(0);     /* release "by force" */
 
-            disk_unmount(0);     /* release "by force", ensure file
-                                    descriptors aren't leaked and any busy
-                                    ones are invalid if mounting */
+            mutex_lock(&sd_mtx); /* lock-out card activity */
 
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
             card_info[0].initialized = 0;
 
+            /* Access is now safe */
+            mutex_unlock(&sd_mtx);
+
             if (ev.id == SYS_HOTSWAP_INSERTED)
-            {
-                /* FIXME: once sd_enabled is implement properly,
-                 * reinitializing the controllers might be needed */
-                sd_enable(true);
-                if (success < 0) /* initialisation failed */
-                    panicf("SD init failed : %d", success);
                 success = disk_mount(0); /* 0 if fail */
-            }
 
             /* notify the system about the changed filesystems
              */
             if (success)
                 queue_broadcast(SYS_FS_CHANGED, 0);
-
-            /* Access is now safe */
-            mutex_unlock(&sd_mtx);
-            fat_unlock();
-            sd_enable(false);
-        }
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
         }        
     }
 }
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
index 395c0f49e6..0fd74787d1 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
@@ -32,7 +32,7 @@
 #include "s5l8702.h"
 #include "led.h"
 #include "ata_idle_notify.h"
-#include "fat.h"
+#include "disk_cache.h"
 #include "splash.h"
 
 
@@ -68,6 +68,7 @@ static struct semaphore mmc_wakeup;
 static struct semaphore mmc_comp_wakeup;
 static int spinup_time = 0;
 static int dma_mode = 0;
+static char aligned_buffer[SECTOR_SIZE] __attribute__((aligned(0x10)));
 
 
 #ifdef ATA_HAVE_BBT
@@ -857,8 +858,25 @@ int ata_bbt_translate(uint64_t sector, uint32_t count, uint64_t* phys, uint32_t*
 static int ata_rw_sectors(uint64_t sector, uint32_t count, void* buffer, bool write)
 {
     if (((uint32_t)buffer) & 0xf)
-        panicf("ATA: Misaligned data buffer at %08X (sector %lu, count %lu)",
-               (unsigned int)buffer, (long unsigned int)sector,  (long unsigned int)count);
+    {
+        while (count)
+        {
+            if (write)
+                memcpy(aligned_buffer, buffer, SECTOR_SIZE);
+
+            PASS_RC(ata_rw_sectors(sector, 1, aligned_buffer, write), 0, 0);
+
+            if (!write)
+                memcpy(buffer, aligned_buffer, SECTOR_SIZE);
+
+            buffer += SECTOR_SIZE;
+            sector++;
+            count--;
+        }
+
+        return 0;
+    }
+
 #ifdef ATA_HAVE_BBT
     if (sector + count > ata_virtual_sectors) RET_ERR(0);
     if (ata_bbt)
@@ -1117,14 +1135,13 @@ int ata_init(void)
          -- Michael Sparmann (theseven), 2011-10-22 */
     if (!ceata)
     {
-        unsigned char* sector = fat_get_sector_buffer();
+        unsigned char* sector = aligned_buffer;
         ata_rw_sectors(0, 1, sector, false);
         if (sector[510] == 0xaa && sector[511] == 0x55)
         {
             ata_swap = true;
             splashf(5000, "Wrong HDD endianness, please update your emCORE version!");
         }
-        fat_release_sector_buffer();
     }
     
     create_thread(ata_thread, ata_stack,
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c
index 55ae4e7c70..b7abea8be4 100644
--- a/firmware/target/arm/tcc780x/sd-tcc780x.c
+++ b/firmware/target/arm/tcc780x/sd-tcc780x.c
@@ -28,7 +28,6 @@
 #include "led.h"
 #include "thread.h"
 #include "disk.h"
-#include "fat.h"
 #include "ata_idle_notify.h"
 #include "usb.h"
 
@@ -657,35 +656,30 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
-
-            /* We now have exclusive control of fat cache and ata */
-
-            /* Release "by force", ensure file descriptors aren't leaked and
-               any busy ones are invalid if mounting */
+        case SYS_HOTSWAP_EXTRACTED:;
+            int success = 1;
+
+            /* Release "by force" */
             disk_unmount(sd_first_drive + CARD_NUM_SLOT); 
 
+            mutex_lock(&sd_mtx); /* lock-out card activity */
+
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
             card_info[CARD_NUM_SLOT].initialized = 0;
             sd_status[CARD_NUM_SLOT].retry = 0; 
 
+            mutex_unlock(&sd_mtx);
+
             if (ev.id == SYS_HOTSWAP_INSERTED)
-                disk_mount(sd_first_drive + CARD_NUM_SLOT);
+                success = disk_mount(sd_first_drive + CARD_NUM_SLOT);
 
-            queue_broadcast(SYS_FS_CHANGED, 0);
+            if (success)
+                queue_broadcast(SYS_FS_CHANGED, 0);
 
-            /* Access is now safe */
-            mutex_unlock(&sd_mtx);
-            fat_unlock();
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
+
         case SYS_TIMEOUT:
             if (TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
             {
diff --git a/firmware/target/arm/tms320dm320/sdmmc-dm320.c b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
index 284061e1ad..d46dbf5e40 100644
--- a/firmware/target/arm/tms320dm320/sdmmc-dm320.c
+++ b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
@@ -592,48 +592,29 @@ static void sd_thread(void)
         {
 #ifdef HAVE_HOTSWAP
         case SYS_HOTSWAP_INSERTED:
-        case SYS_HOTSWAP_EXTRACTED:
-        {
+        case SYS_HOTSWAP_EXTRACTED:;
             int success = 1;
-            fat_lock();          /* lock-out FAT activity first -
-                                    prevent deadlocking via disk_mount that
-                                    would cause a reverse-order attempt with
-                                    another thread */
-            mutex_lock(&sd_mtx); /* lock-out card activity - direct calls
-                                    into driver that bypass the fat cache */
 
-            /* We now have exclusive control of fat cache and ata */
+            disk_unmount(0);     /* release "by force" */
 
-            disk_unmount(0);     /* release "by force", ensure file
-                                    descriptors aren't leaked and any busy
-                                    ones are invalid if mounting */
+            mutex_lock(&sd_mtx); /* lock-out card activity */
 
             /* Force card init for new card, re-init for re-inserted one or
              * clear if the last attempt to init failed with an error. */
             card_info[0].initialized = 0;
 
+            mutex_unlock(&sd_mtx);
+
             if (ev.id == SYS_HOTSWAP_INSERTED)
-            {
-                /* FIXME: once sd_enabled is implement properly,
-                 * reinitializing the controllers might be needed */
-                sd_enable(true);
-                if (success < 0) /* initialisation failed */
-                    panicf("SD init failed : %d", success);
                 success = disk_mount(0); /* 0 if fail */
-            }
 
-            /* notify the system about the changed filesystems
-             */
+            /* notify the system about the changed filesystems */
             if (success)
                 queue_broadcast(SYS_FS_CHANGED, 0);
 
-            /* Access is now safe */
-            mutex_unlock(&sd_mtx);
-            fat_unlock();
-            sd_enable(false);
-        }
             break;
-#endif
+#endif /* HAVE_HOTSWAP */
+
         case SYS_TIMEOUT:
             if (TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
             {