diff options
5 files changed, 13 insertions, 13 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c index a8a973b..8e2d90c 100644 --- a/firmware/target/arm/as3525/debug-as3525.c +++ b/firmware/target/arm/as3525/debug-as3525.c @@ -43,7 +43,7 @@ * if I put the below into a sansa-fuze/debug-target.h, it doesn't work*/ #if defined(SANSA_FUZE) || defined(SANSA_E200V2) #define DEBUG_DBOP -short button_dbop_data(void); +unsigned short button_dbop_data(void); #endif static unsigned read_cp15 (void) diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c index 932ce2b..624466b 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c @@ -31,7 +31,7 @@ static bool hold_button = false; #ifndef BOOTLOADER static bool hold_button_old = false; #endif -static short _dbop_din = 0; +static unsigned short _dbop_din = 0; #define WHEEL_REPEAT_INTERVAL (HZ/5) /* in the lcd driver */ @@ -48,7 +48,7 @@ bool button_hold(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; @@ -132,7 +132,7 @@ static void scrollwheel(short dbop_din) } #endif /* !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL) */ -short button_read_dbop(void) +unsigned short button_read_dbop(void) { /*write a red pixel */ if (!lcd_button_support()) @@ -161,7 +161,7 @@ short button_read_dbop(void) return _dbop_din; } -short button_dbop_data(void) +unsigned short button_dbop_data(void) { return _dbop_din; } @@ -173,7 +173,7 @@ int button_read_device(void) { int btn = BUTTON_NONE; /* read buttons from dbop */ - short dbop = button_read_dbop(); + unsigned short dbop = button_read_dbop(); /* hold button */ if(dbop & (1<<12)) diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-target.h b/firmware/target/arm/as3525/sansa-e200v2/button-target.h index e09743d..b1feb58 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/button-target.h +++ b/firmware/target/arm/as3525/sansa-e200v2/button-target.h @@ -30,7 +30,7 @@ bool button_hold(void); void button_init_device(void); int button_read_device(void); -short button_read_dbop(void); +unsigned short button_read_dbop(void); /* Sandisk Sansa E200 button codes */ diff --git a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c index f14e6f4..efa1c59 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 5b5b1e0..8527604 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 */ |