diff options
author | Michael Sparmann <theseven@rockbox.org> | 2009-10-21 20:21:41 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2009-10-21 20:21:41 +0000 |
commit | 940fd995a4abd83d79af4d6420ca51a3f0dd8e58 (patch) | |
tree | b3e76a1cdec1786d519e81b786b0afea0ee97add /firmware/rolo.c | |
parent | 4e651264c2233dbcabdb8a4db16e45f07e88a133 (diff) | |
download | rockbox-940fd995a4abd83d79af4d6420ca51a3f0dd8e58.tar.gz rockbox-940fd995a4abd83d79af4d6420ca51a3f0dd8e58.zip |
storage_flush() should be done before disabling interrupts in ROLO.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/rolo.c')
-rw-r--r-- | firmware/rolo.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/firmware/rolo.c b/firmware/rolo.c index c7927978bd..c206bca589 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -293,6 +293,9 @@ int rolo_load(const char* filename) | |||
293 | lcd_remote_update(); | 293 | lcd_remote_update(); |
294 | #endif | 294 | #endif |
295 | adc_close(); | 295 | adc_close(); |
296 | #ifdef HAVE_STORAGE_FLUSH | ||
297 | storage_flush(); | ||
298 | #endif | ||
296 | 299 | ||
297 | #ifdef CPU_ARM | 300 | #ifdef CPU_ARM |
298 | /* Should do these together since some ARM version should never have | 301 | /* Should do these together since some ARM version should never have |
@@ -348,6 +351,10 @@ int rolo_load(const char* filename) | |||
348 | lcd_puts(0, 1, "Executing "); | 351 | lcd_puts(0, 1, "Executing "); |
349 | lcd_update(); | 352 | lcd_update(); |
350 | 353 | ||
354 | #ifdef HAVE_STORAGE_FLUSH | ||
355 | storage_flush(); | ||
356 | #endif | ||
357 | |||
351 | set_irq_level(HIGHEST_IRQ_LEVEL); | 358 | set_irq_level(HIGHEST_IRQ_LEVEL); |
352 | 359 | ||
353 | /* Calling these 2 initialization routines was necessary to get the | 360 | /* Calling these 2 initialization routines was necessary to get the |
@@ -363,9 +370,6 @@ int rolo_load(const char* filename) | |||
363 | PAIOR = 0x0FA0; | 370 | PAIOR = 0x0FA0; |
364 | #endif | 371 | #endif |
365 | #endif | 372 | #endif |
366 | #ifdef HAVE_STORAGE_FLUSH | ||
367 | storage_flush(); | ||
368 | #endif | ||
369 | rolo_restart(audiobuf, ramstart, length); | 373 | rolo_restart(audiobuf, ramstart, length); |
370 | 374 | ||
371 | return 0; /* this is never reached */ | 375 | return 0; /* this is never reached */ |