summaryrefslogtreecommitdiff
path: root/apps/debug_menu.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-08-15 08:27:39 +0000
committerNils Wallménius <nils@rockbox.org>2008-08-15 08:27:39 +0000
commit01729e7a1841d8aae7be37707dbc7146348c9a64 (patch)
tree5490fd9eccdcaef39bbbb91e8a44d1caad9b2ef7 /apps/debug_menu.c
parent9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff)
downloadrockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.zip
rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz
rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.bz2
rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.xz
FS#9281 Rename of splash functions.
* Remove gui_splash() * Rename gui_syncsplash() to splashf() and remove its voice capabilities. * Rename the internal splash() to splash_internal() and introduce an externally visible splash() that handles simple splashing without printf functionality e.g. splash(HZ, ID2P(LANG_FOO)); or splash(HZ, "foo"); if a LANG_* id is passed it will be voiced. * Adjust all places that called gui_syncsplash() to use the correct variant from above. * Export both new functions to plugins and adjust places calling rb->splash() to use the correct variant so that we now have naming consistency between the core and plugins. * Fix one latent bug that would cause my sim to crash with the above changes and correct P2STR and P2ID macros, thanks to pondlife. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18282 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r--apps/debug_menu.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index b2144e2..72379f4 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2136,7 +2136,7 @@ static bool dbg_save_roms(void)
restore_irq(old_irq_level);
if (err)
- gui_syncsplash(HZ*3, "Eeprom read failure (%d)",err);
+ splashf(HZ*3, "Eeprom read failure (%d)", err);
else
{
write(fd, buf, sizeof buf);
@@ -2233,7 +2233,7 @@ extern bool do_screendump_instead_of_usb;
static bool dbg_screendump(void)
{
do_screendump_instead_of_usb = !do_screendump_instead_of_usb;
- gui_syncsplash(HZ, "Screendump %s",
+ splashf(HZ, "Screendump %s",
do_screendump_instead_of_usb?"enabled":"disabled");
return false;
}
@@ -2277,21 +2277,21 @@ static bool dbg_write_eeprom(void)
err = eeprom_24cxx_write(0, buf, sizeof buf);
if (err)
- gui_syncsplash(HZ*3, "Eeprom write failure (%d)",err);
+ splashf(HZ*3, "Eeprom write failure (%d)", err);
else
- gui_syncsplash(HZ*3, "Eeprom written successfully");
+ splash(HZ*3, "Eeprom written successfully");
restore_irq(old_irq_level);
}
else
{
- gui_syncsplash(HZ*3, "File read error (%d)",rc);
+ splashf(HZ*3, "File read error (%d)",rc);
}
close(fd);
}
else
{
- gui_syncsplash(HZ*3, "Failed to open 'internal_eeprom.bin'");
+ splash(HZ*3, "Failed to open 'internal_eeprom.bin'");
}
return false;
@@ -2396,7 +2396,7 @@ static bool logf_usb_serial(void)
{
bool serial_enabled = !usb_core_driver_enabled(USB_DRIVER_SERIAL);
usb_core_enable_driver(USB_DRIVER_SERIAL,serial_enabled);
- gui_syncsplash(HZ, "USB logf %s",
+ splashf(HZ, "USB logf %s",
serial_enabled?"enabled":"disabled");
return false;
}
@@ -2405,7 +2405,7 @@ static bool logf_usb_serial(void)
#if defined(HAVE_USBSTACK) && defined(USB_STORAGE)
static bool usb_reconnect(void)
{
- gui_syncsplash(HZ, "Reconnect mass storage");
+ splash(HZ, "Reconnect mass storage");
usb_storage_reconnect();
return false;
}