Do some crackdown on kernel object reinitialization after they could be in use and use before initialization. For c200/e200: Be sure fat cache and ata locks are acquired in the proper order during hot swapping. Delay hotswap monitoring until after initial file mounting (address 2nd kobj concern + possible call of fat driver before init).

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

1 files changed, 18 insertions, 1 deletions

diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c
index 9dd27cf72a..f3374fc4c4 100644
--- a/firmware/drivers/fat.c
+++ b/firmware/drivers/fat.c
@@ -172,6 +172,7 @@ struct bpb
 };
 
 static struct bpb fat_bpbs[NUM_VOLUMES]; /* mounted partition info */
+static bool initialized = false;
 
 static int update_fsinfo(IF_MV_NONVOID(struct bpb* fat_bpb));
 static int flush_fat(IF_MV_NONVOID(struct bpb* fat_bpb));
@@ -202,6 +203,18 @@ static char fat_cache_sectors[FAT_CACHE_SIZE][SECTOR_SIZE];
 static struct fat_cache_entry fat_cache[FAT_CACHE_SIZE];
 static struct mutex cache_mutex NOCACHEBSS_ATTR;
 
+#ifdef HAVE_HOTSWAP
+void fat_lock(void)
+{
+    mutex_lock(&cache_mutex);
+}
+
+void fat_unlock(void)
+{
+    mutex_unlock(&cache_mutex);
+}
+#endif
+
 static long cluster2sec(IF_MV2(struct bpb* fat_bpb,) long cluster)
 {
 #ifndef HAVE_MULTIVOLUME
@@ -240,7 +253,11 @@ void fat_init(void)
 {
     unsigned int i;
 
-    mutex_init(&cache_mutex);
+    if (!initialized)
+    {
+        initialized = true;
+        mutex_init(&cache_mutex);
+    }
 
     /* mark the FAT cache as unused */
     for(i = 0;i < FAT_CACHE_SIZE;i++)