devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

x1000: bootloader: refactor splash/splash2

Browse source 
Allow the use of printf formatting and multiple lines of text
using newlines in the string.

Change-Id: I65919bf29c16c34c38cf3995e02d2ddbbaa4bdf3
This commit is contained in:
Aidan MacDonald 2022-03-19 13:54:25 +00:00
parent 41a8b874d2
commit fbe9e4ac10
6 changed files with 82 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bootloader/x1000/install.c
View file

@ -34,7 +34,7 @@ enum {
static void bootloader_action(int which)
{
if(check_disk(true) != DISK_PRESENT) {
splash2(5*HZ, "Install aborted", "Cannot access SD card");
splashf(5*HZ, "Install aborted\nCannot access SD card");
return;
}
@ -46,7 +46,7 @@ static void bootloader_action(int which)
default: return; /* can't happen */
}
splash(0, msg);
splashf(0, msg);
int rc;
switch(which) {
@ -60,7 +60,7 @@ static void bootloader_action(int which)
snprintf(buf, sizeof(buf), "%s (%d)", installer_strerror(rc), rc);
const char* msg1 = rc == 0 ? "Success" : buf;
const char* msg2 = "Press " BL_QUIT_NAME " to continue";
splash2(0, msg1, msg2);
splashf(0, "%s\n%s", msg1, msg2);
while(get_button(TIMEOUT_BLOCK) != BL_QUIT);
}