diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-02-18 17:43:38 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-02-18 17:43:38 +0000 |
commit | 5e3b4fe3f8a47b57f9c799025f757607102d3284 (patch) | |
tree | bc917e283a73fc56257417ccb5ff4b45e731fd6d /firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | |
parent | 30255d53daf8184a33631893b0bf214f8973c329 (diff) | |
download | rockbox-5e3b4fe3f8a47b57f9c799025f757607102d3284.tar.gz rockbox-5e3b4fe3f8a47b57f9c799025f757607102d3284.zip |
Return old button value if lcd_button_supprt was blocked.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20041 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c')
-rw-r--r-- | firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index 60a32b510b..379869f2b4 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | |||
@@ -435,7 +435,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
435 | } /* lcd_update_rect */ | 435 | } /* lcd_update_rect */ |
436 | 436 | ||
437 | /* writes one read pixel outside the visible area, needed for correct dbop reads */ | 437 | /* writes one read pixel outside the visible area, needed for correct dbop reads */ |
438 | void lcd_button_support(void) | 438 | bool lcd_button_support(void) |
439 | { | 439 | { |
440 | int x=LCD_HEIGHT+1; | 440 | int x=LCD_HEIGHT+1; |
441 | int y=LCD_WIDTH+1; | 441 | int y=LCD_WIDTH+1; |
@@ -444,7 +444,7 @@ void lcd_button_support(void) | |||
444 | unsigned short data = (0xf<<12); | 444 | unsigned short data = (0xf<<12); |
445 | 445 | ||
446 | if (lcd_busy) | 446 | if (lcd_busy) |
447 | return; | 447 | return false; |
448 | 448 | ||
449 | lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); | 449 | lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); |
450 | /* Set start position and window */ | 450 | /* Set start position and window */ |
@@ -457,4 +457,5 @@ void lcd_button_support(void) | |||
457 | lcd_write_cmd(R_WRITE_DATA_2_GRAM); | 457 | lcd_write_cmd(R_WRITE_DATA_2_GRAM); |
458 | 458 | ||
459 | lcd_write_data(&data, width); | 459 | lcd_write_data(&data, width); |
460 | return true; | ||
460 | } | 461 | } |