summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-03-20 12:51:10 +0000
committerAidan MacDonald <amachronic@protonmail.com>2022-03-24 18:59:50 -0400
commite956f7dc8369b3d1928a1274ca6866b42116cc1f (patch)
tree2e409718f6420a3f0597fd81893c4e319ccae81f
parent238cd13469935ec908b6d179839b7b7b435cb2be (diff)
downloadrockbox-e956f7dc83.tar.gz
rockbox-e956f7dc83.zip
firmware: minor screendump related cleanups
- Remove unused redefinitions of screen_dump() from bootloaders - Use empty do-while when screendump is compiled out Change-Id: I3ccdb0390ddaa28d8f561ff744d0db6aaef17f5d
-rw-r--r--bootloader/iaudio_coldfire.c6
-rw-r--r--bootloader/iriver_h1x0.c4
-rw-r--r--bootloader/iriver_h300.c4
-rw-r--r--bootloader/mpio_hd200_hd300.c6
-rw-r--r--firmware/export/screendump.h4
5 files changed, 2 insertions, 22 deletions
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index c79ab4b0c5..d9e659847a 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -212,9 +212,3 @@ void main(void)
start_firmware();
}
-
-/* These functions are present in the firmware library, but we reimplement
- them here because the originals do a lot more than we want */
-void screen_dump(void)
-{
-}
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index 7efaaa3308..6c509a9922 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -588,10 +588,6 @@ void main(void)
/* These functions are present in the firmware library, but we reimplement
them here because the originals do a lot more than we want */
-void screen_dump(void)
-{
-}
-
int usb_screen(void)
{
return 0;
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 3a254f4487..655abfa505 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -648,10 +648,6 @@ void main(void)
/* These functions are present in the firmware library, but we reimplement
them here because the originals do a lot more than we want */
-void screen_dump(void)
-{
-}
-
int usb_screen(void)
{
return 0;
diff --git a/bootloader/mpio_hd200_hd300.c b/bootloader/mpio_hd200_hd300.c
index 6538c06a31..7067a9d790 100644
--- a/bootloader/mpio_hd200_hd300.c
+++ b/bootloader/mpio_hd200_hd300.c
@@ -539,9 +539,3 @@ void main(void)
}
}
-
-/* These functions are present in the firmware library, but we reimplement
- them here because the originals do a lot more than we want */
-void screen_dump(void)
-{
-}
diff --git a/firmware/export/screendump.h b/firmware/export/screendump.h
index cd7793b9d3..953184c3ac 100644
--- a/firmware/export/screendump.h
+++ b/firmware/export/screendump.h
@@ -54,8 +54,8 @@
#ifdef BOOTLOADER
-#define screen_dump()
-#define remote_screen_dump()
+#define screen_dump() do { } while(0)
+#define remote_screen_dump() do { } while(0)
#else /* !BOOTLOADER */