summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-06-06 13:20:47 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-06-06 13:20:47 +0000
commit9c43b2ce17cbc1f88b825ab8a5021575cee46dd7 (patch)
tree8d96e95861b3b0df1a7efa6b660395c317ecb475 /apps
parent4a2cab6aa1008a4f5ac05dac44c99b7f1a05e8f4 (diff)
downloadrockbox-9c43b2ce17cbc1f88b825ab8a5021575cee46dd7.tar.gz
rockbox-9c43b2ce17cbc1f88b825ab8a5021575cee46dd7.zip
Remove card_enable_monitoring() and use a mutex instead. The card_enable_monitoring() method actually didn't eliminate the possible race conditions it was meant to fix.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26627 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/main.c b/apps/main.c
index e8043a79d4..f8dddcd9ae 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -342,6 +342,7 @@ static void init(void)
342 sb_skin_init(); 342 sb_skin_init();
343 viewportmanager_init(); 343 viewportmanager_init();
344 344
345 disk_init_subsystem();
345 storage_init(); 346 storage_init();
346 settings_reset(); 347 settings_reset();
347 settings_load(SETTINGS_ALL); 348 settings_load(SETTINGS_ALL);
@@ -506,6 +507,8 @@ static void init(void)
506 } 507 }
507#endif 508#endif
508 509
510
511 disk_init_subsystem();
509 CHART(">storage_init"); 512 CHART(">storage_init");
510 rc = storage_init(); 513 rc = storage_init();
511 CHART("<storage_init"); 514 CHART("<storage_init");