diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-07 11:53:40 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-11 10:58:20 -0500 |
commit | 7fa48faeb55fb43b6a4e727d0abd104b267c89a4 (patch) | |
tree | 4f3a735bc72009dc100045c8964d937be1cce7e4 /firmware/rolo.c | |
parent | 439b4e8bcad57fac53f4286033f431e7e9df6546 (diff) | |
download | rockbox-7fa48faeb55fb43b6a4e727d0abd104b267c89a4.tar.gz rockbox-7fa48faeb55fb43b6a4e727d0abd104b267c89a4.zip |
multiboot: Refactor duplicated functions to a separate file
The implementation of write_bootdata() and get_redirect_dir() was
copied verbatim in two different places, obviously a bad thing for
maintainability. This moves them to a new file multiboot.c as they
are only used for multiboot.
Change-Id: Id0279216e4dd019f8bf612a81d3835eff010e506
Diffstat (limited to 'firmware/rolo.c')
-rw-r--r-- | firmware/rolo.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/firmware/rolo.c b/firmware/rolo.c index f95fc4bd4d..24488e5934 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -41,23 +41,19 @@ | |||
41 | #include "loader_strerror.h" | 41 | #include "loader_strerror.h" |
42 | #if defined(MI4_FORMAT) | 42 | #if defined(MI4_FORMAT) |
43 | #include "mi4-loader.h" | 43 | #include "mi4-loader.h" |
44 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) | ||
45 | #include "bootdata.h" | ||
46 | #include "crc32.h" | ||
47 | extern int write_bootdata(unsigned char* buf, int len, unsigned int boot_volume); /*mi4-loader.c*/ | ||
48 | #endif | ||
49 | #define LOAD_FIRMWARE(a,b,c) load_mi4(a,b,c) | 44 | #define LOAD_FIRMWARE(a,b,c) load_mi4(a,b,c) |
50 | #elif defined(RKW_FORMAT) | 45 | #elif defined(RKW_FORMAT) |
51 | #include "rkw-loader.h" | 46 | #include "rkw-loader.h" |
52 | #define LOAD_FIRMWARE(a,b,c) load_rkw(a,b,c) | 47 | #define LOAD_FIRMWARE(a,b,c) load_rkw(a,b,c) |
53 | #else | 48 | #else |
54 | #include "rb-loader.h" | 49 | #include "rb-loader.h" |
50 | #define LOAD_FIRMWARE(a,b,c) load_firmware(a,b,c) | ||
51 | #endif | ||
52 | |||
55 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) | 53 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) |
54 | #include "multiboot.h" | ||
56 | #include "bootdata.h" | 55 | #include "bootdata.h" |
57 | #include "crc32.h" | 56 | #include "crc32.h" |
58 | extern int write_bootdata(unsigned char* buf, int len, unsigned int boot_volume); /*rb-loader.c*/ | ||
59 | #endif | ||
60 | #define LOAD_FIRMWARE(a,b,c) load_firmware(a,b,c) | ||
61 | #endif | 57 | #endif |
62 | 58 | ||
63 | #if CONFIG_CPU == AS3525v2 | 59 | #if CONFIG_CPU == AS3525v2 |