summaryrefslogtreecommitdiffstats
path: root/firmware/eeprom_settings.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2007-01-12 18:34:00 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2007-01-12 18:34:00 +0000
commit0ea4d3197ed7e56f39c630741cb69152ac9e41de (patch)
treebc29ccef30da139df3e928fd3b8ff3801407b58c /firmware/eeprom_settings.c
parent12ef310466937551dbedb2165769d7832b11156c (diff)
downloadrockbox-0ea4d3197ed7e56f39c630741cb69152ac9e41de.tar.gz
rockbox-0ea4d3197ed7e56f39c630741cb69152ac9e41de.tar.bz2
rockbox-0ea4d3197ed7e56f39c630741cb69152ac9e41de.zip
Prepare core support for the iriver bootloader supporting ROM images
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11991 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/eeprom_settings.c')
-rw-r--r--firmware/eeprom_settings.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/eeprom_settings.c b/firmware/eeprom_settings.c
index ad2c9c848f..f3be2ec2b3 100644
--- a/firmware/eeprom_settings.c
+++ b/firmware/eeprom_settings.c
@@ -36,7 +36,7 @@ static bool reset_config(void)
#else
firmware_settings.version = EEPROM_SETTINGS_VERSION;
firmware_settings.initialized = true;
- firmware_settings.boot_disk = false;
+ firmware_settings.bootmethod = BOOT_RECOVERY;
firmware_settings.bl_version = 0;
#endif
@@ -51,7 +51,7 @@ bool eeprom_settings_init(void)
eeprom_24cxx_init();
/* Check if player has been flashed. */
- if (!detect_flashed_rockbox())
+ if (detect_original_firmware())
{
memset(&firmware_settings, 0, sizeof(struct eeprom_settings));
firmware_settings.initialized = false;
@@ -61,7 +61,7 @@ bool eeprom_settings_init(void)
ret = eeprom_24cxx_read(0, &firmware_settings,
sizeof(struct eeprom_settings));
-
+
if (ret < 0)
{
memset(&firmware_settings, 0, sizeof(struct eeprom_settings));
@@ -101,7 +101,7 @@ bool eeprom_settings_store(void)
int ret;
uint32_t sum;
- if (!firmware_settings.initialized || !detect_flashed_rockbox())
+ if (!firmware_settings.initialized || detect_original_firmware())
{
logf("Rockbox in flash is required");
return false;