diff options
Diffstat (limited to 'firmware/target/arm/as3525/sansa-fuze/button-fuze.c')
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/button-fuze.c | 10 |
1 files changed, 5 insertions, 5 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; | |||
37 | #ifndef BOOTLOADER | 37 | #ifndef BOOTLOADER |
38 | static bool hold_button_old = false; | 38 | static bool hold_button_old = false; |
39 | #endif | 39 | #endif |
40 | static short _dbop_din = BUTTON_NONE; | 40 | static unsigned short _dbop_din = BUTTON_NONE; |
41 | 41 | ||
42 | /* in the lcd driver */ | 42 | /* in the lcd driver */ |
43 | extern bool lcd_button_support(void); | 43 | extern bool lcd_button_support(void); |
@@ -49,7 +49,7 @@ void button_init_device(void) | |||
49 | } | 49 | } |
50 | 50 | ||
51 | #if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL) | 51 | #if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL) |
52 | static void scrollwheel(short dbop_din) | 52 | static void scrollwheel(unsigned short dbop_din) |
53 | { | 53 | { |
54 | /* current wheel values, parsed from dbop and the resulting button */ | 54 | /* current wheel values, parsed from dbop and the resulting button */ |
55 | unsigned wheel_value = 0; | 55 | unsigned wheel_value = 0; |
@@ -143,7 +143,7 @@ static void button_delay(void) | |||
143 | while(i--); | 143 | while(i--); |
144 | } | 144 | } |
145 | 145 | ||
146 | short button_read_dbop(void) | 146 | unsigned short button_read_dbop(void) |
147 | { | 147 | { |
148 | /* skip home and power reading if lcd_button_support was blocked, | 148 | /* skip home and power reading if lcd_button_support was blocked, |
149 | * since the dbop bit 15 is invalid then, and use the old value instead */ | 149 | * since the dbop bit 15 is invalid then, and use the old value instead */ |
@@ -187,7 +187,7 @@ short button_read_dbop(void) | |||
187 | } | 187 | } |
188 | 188 | ||
189 | /* for the debug menu */ | 189 | /* for the debug menu */ |
190 | short button_dbop_data(void) | 190 | unsigned short button_dbop_data(void) |
191 | { | 191 | { |
192 | return _dbop_din; | 192 | return _dbop_din; |
193 | } | 193 | } |
@@ -238,7 +238,7 @@ static int button_gpio(void) | |||
238 | int button_read_device(void) | 238 | int button_read_device(void) |
239 | { | 239 | { |
240 | int btn = BUTTON_NONE; | 240 | int btn = BUTTON_NONE; |
241 | short dbop = button_read_dbop(); | 241 | unsigned short dbop = button_read_dbop(); |
242 | static unsigned power_counter = 0; | 242 | static unsigned power_counter = 0; |
243 | /* hold button */ | 243 | /* hold button */ |
244 | if(dbop & (1<<12)) | 244 | if(dbop & (1<<12)) |