summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-05-19 13:43:41 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2012-05-19 16:10:52 +0200
commit3f59cf97089d2efef51fd7f231712bef2c154b21 (patch)
treea950c5cddfae8b42ab93b867b5a84a236474b8f2 /firmware/target/arm
parent85d5c19347c1665b765708cdb67f1d996c7f7fa4 (diff)
downloadrockbox-3f59cf97089d2efef51fd7f231712bef2c154b21.tar.gz
rockbox-3f59cf97089d2efef51fd7f231712bef2c154b21.zip
imx233: fix compilation for target with HAVE_BUTTON_DATA defined
Change-Id: I9d92320b1e545b7ac3983b7f9904f281028cc22d
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/imx233/system-imx233.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index eb9a3f8ee0..5ef52c7957 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -63,9 +63,16 @@ void system_exception_wait(void)
_backlight_on();
_backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING);
/* wait until button release (if a button is pressed) */
+#ifdef HAVE_BUTTON_DATA
+ int data;
+ while(button_read_device(&data));
+ /* then wait until next button press */
+ while(!button_read_device(&data));
+#else
while(button_read_device());
/* then wait until next button press */
while(!button_read_device());
+#endif
}
int system_memory_guard(int newmode)