summaryrefslogtreecommitdiff
path: root/firmware/system.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-08-11 10:13:16 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-08-11 10:13:16 +0000
commit3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d (patch)
tree4a286c9f43aa15899857119b54759141bb68d8dd /firmware/system.c
parent1204136632777e84eac790811fb074552ef2e6b7 (diff)
downloadrockbox-3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d.zip
rockbox-3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d.tar.gz
rockbox-3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d.tar.bz2
rockbox-3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d.tar.xz
Properly handle early USB mode, dircache and tagcache state files with
flashed rockbox. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10525 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/system.c')
-rw-r--r--firmware/system.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/firmware/system.c b/firmware/system.c
index bb09dbc..c635254 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -84,7 +84,17 @@ bool detect_flashed_rockbox(void)
struct flash_header hdr;
uint8_t *src = (uint8_t *)FLASH_ENTRYPOINT;
+# ifndef BOOTLOADER
+ int oldmode;
+ oldmode = system_memory_guard(MEMGUARD_NONE);
+# endif
+
memcpy(&hdr, src, sizeof(struct flash_header));
+
+# ifndef BOOTLOADER
+ system_memory_guard(oldmode);
+# endif
+
if (hdr.magic != FLASH_MAGIC)
return false;