diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-19 13:54:25 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-24 23:40:07 +0000 |
commit | fbe9e4ac10001f931b2f3b9898e3292d36e8cc7c (patch) | |
tree | a2508a2e40e21f4591d971e4c3952ada50c59882 /bootloader/x1000/install.c | |
parent | 41a8b874d2f088896cfaebecdff81c4b98f65a2a (diff) | |
download | rockbox-fbe9e4ac10001f931b2f3b9898e3292d36e8cc7c.tar.gz rockbox-fbe9e4ac10001f931b2f3b9898e3292d36e8cc7c.zip |
x1000: bootloader: refactor splash/splash2
Allow the use of printf formatting and multiple lines of text
using newlines in the string.
Change-Id: I65919bf29c16c34c38cf3995e02d2ddbbaa4bdf3
Diffstat (limited to 'bootloader/x1000/install.c')
-rw-r--r-- | bootloader/x1000/install.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/x1000/install.c b/bootloader/x1000/install.c index e4af66443b..18b853df7c 100644 --- a/bootloader/x1000/install.c +++ b/bootloader/x1000/install.c | |||
@@ -34,7 +34,7 @@ enum { | |||
34 | static void bootloader_action(int which) | 34 | static void bootloader_action(int which) |
35 | { | 35 | { |
36 | if(check_disk(true) != DISK_PRESENT) { | 36 | if(check_disk(true) != DISK_PRESENT) { |
37 | splash2(5*HZ, "Install aborted", "Cannot access SD card"); | 37 | splashf(5*HZ, "Install aborted\nCannot access SD card"); |
38 | return; | 38 | return; |
39 | } | 39 | } |
40 | 40 | ||
@@ -46,7 +46,7 @@ static void bootloader_action(int which) | |||
46 | default: return; /* can't happen */ | 46 | default: return; /* can't happen */ |
47 | } | 47 | } |
48 | 48 | ||
49 | splash(0, msg); | 49 | splashf(0, msg); |
50 | 50 | ||
51 | int rc; | 51 | int rc; |
52 | switch(which) { | 52 | switch(which) { |
@@ -60,7 +60,7 @@ static void bootloader_action(int which) | |||
60 | snprintf(buf, sizeof(buf), "%s (%d)", installer_strerror(rc), rc); | 60 | snprintf(buf, sizeof(buf), "%s (%d)", installer_strerror(rc), rc); |
61 | const char* msg1 = rc == 0 ? "Success" : buf; | 61 | const char* msg1 = rc == 0 ? "Success" : buf; |
62 | const char* msg2 = "Press " BL_QUIT_NAME " to continue"; | 62 | const char* msg2 = "Press " BL_QUIT_NAME " to continue"; |
63 | splash2(0, msg1, msg2); | 63 | splashf(0, "%s\n%s", msg1, msg2); |
64 | 64 | ||
65 | while(get_button(TIMEOUT_BLOCK) != BL_QUIT); | 65 | while(get_button(TIMEOUT_BLOCK) != BL_QUIT); |
66 | } | 66 | } |