diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2012-03-04 15:34:29 +0100 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2013-06-27 13:50:11 +0200 |
commit | 0b29691324e5700f15ea653592bf29f8552d47d7 (patch) | |
tree | 00e4f77f28c813a493cd8af22170f486f6e82903 /bootloader/iriver_h1x0.c | |
parent | 46ea8bfe7c690c8db230fff3a582a69779f8e432 (diff) | |
download | rockbox-0b29691324e5700f15ea653592bf29f8552d47d7.tar.gz rockbox-0b29691324e5700f15ea653592bf29f8552d47d7.zip |
Move load_firmware() to separate file
The idea is to share loading code between bootloaders and rolo().
Change-Id: I1656ed91946d7a05cb7c9fa7a16793c3c862a5cd
Reviewed-on: http://gerrit.rockbox.org/190
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Diffstat (limited to 'bootloader/iriver_h1x0.c')
-rw-r--r-- | bootloader/iriver_h1x0.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index 9042737406..77624526e5 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -46,6 +46,8 @@ | |||
46 | #include "eeprom_settings.h" | 46 | #include "eeprom_settings.h" |
47 | #include "rbunicode.h" | 47 | #include "rbunicode.h" |
48 | #include "common.h" | 48 | #include "common.h" |
49 | #include "rb-loader.h" | ||
50 | #include "loader_strerror.h" | ||
49 | #include "version.h" | 51 | #include "version.h" |
50 | 52 | ||
51 | #include <stdarg.h> | 53 | #include <stdarg.h> |
@@ -608,9 +610,9 @@ void main(void) | |||
608 | printf("Loading firmware"); | 610 | printf("Loading firmware"); |
609 | i = load_firmware((unsigned char *)DRAM_START, BOOTFILE, MAX_LOADSIZE); | 611 | i = load_firmware((unsigned char *)DRAM_START, BOOTFILE, MAX_LOADSIZE); |
610 | if(i < 0) | 612 | if(i < 0) |
611 | printf("Error: %s", strerror(i)); | 613 | printf("Error: %s", loader_strerror(i)); |
612 | 614 | ||
613 | if (i == EOK) | 615 | if (i > 0) |
614 | start_firmware(); | 616 | start_firmware(); |
615 | 617 | ||
616 | if (!detect_original_firmware()) | 618 | if (!detect_original_firmware()) |