diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2009-04-20 20:11:01 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2009-04-20 20:11:01 +0000 |
| commit | e29358c154e5412737dbc9375c90b3046c49b90b (patch) | |
| tree | bcca0390d65bc9d3311fcebba5961be2b6fa4bcb /firmware/target/arm/as3525/sansa-fuze | |
| parent | f4ac75752e7b76b8aa24208a8d344b427351af6d (diff) | |
Fix FS#10128 - The View IO Ports debug menu showed weird dbop values (sometimes FFFF prepended), due to sign-extension. Switch to unsigned short to fix it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20757 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sansa-fuze')
| -rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/button-fuze.c | 10 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/button-target.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c index f14e6f49c1..efa1c593a3 100644 --- a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c +++ b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c @@ -37,7 +37,7 @@ static bool hold_button = false; #ifndef BOOTLOADER static bool hold_button_old = false; #endif -static short _dbop_din = BUTTON_NONE; +static unsigned short _dbop_din = BUTTON_NONE; /* in the lcd driver */ extern bool lcd_button_support(void); @@ -49,7 +49,7 @@ void button_init_device(void) } #if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL) -static void scrollwheel(short dbop_din) +static void scrollwheel(unsigned short dbop_din) { /* current wheel values, parsed from dbop and the resulting button */ unsigned wheel_value = 0; @@ -143,7 +143,7 @@ static void button_delay(void) while(i--); } -short button_read_dbop(void) +unsigned short button_read_dbop(void) { /* skip home and power reading if lcd_button_support was blocked, * since the dbop bit 15 is invalid then, and use the old value instead */ @@ -187,7 +187,7 @@ short button_read_dbop(void) } /* for the debug menu */ -short button_dbop_data(void) +unsigned short button_dbop_data(void) { return _dbop_din; } @@ -238,7 +238,7 @@ static int button_gpio(void) int button_read_device(void) { int btn = BUTTON_NONE; - short dbop = button_read_dbop(); + unsigned short dbop = button_read_dbop(); static unsigned power_counter = 0; /* hold button */ if(dbop & (1<<12)) diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h index 5b5b1e097f..8527604379 100644 --- a/firmware/target/arm/as3525/sansa-fuze/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h @@ -30,7 +30,7 @@ void button_init_device(void); bool button_hold(void); int button_read_device(void); -short button_read_dbop(void); +unsigned short button_read_dbop(void); /* Sandisk Sansa Fuze button codes */ /* Main unit's buttons */ |