len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some residual 'defined but not used' warnings by GCC 4.6.0 for touchscreen targets.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29910 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-05-22 13:53:31 +00:00
parent 4dad30d038
commit 96b21753bc
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/gui/skin_engine/skin_touchsupport.c
View file

@ -56,7 +56,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset,
short x,y; short x,y;
short vx, vy; short vx, vy;
int type = action_get_touchscreen_press(&x, &y); int type = action_get_touchscreen_press(&x, &y);
static int last_action = ACTION_NONE;
struct touchregion *r, *temp = NULL; struct touchregion *r, *temp = NULL;
bool repeated = (type == BUTTON_REPEAT); bool repeated = (type == BUTTON_REPEAT);
bool released = (type == BUTTON_REL); bool released = (type == BUTTON_REL);
@ -109,7 +108,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset,
if (r->armed && ((repeated && needs_repeat) || if (r->armed && ((repeated && needs_repeat) ||
(released && !needs_repeat))) (released && !needs_repeat)))
{ {
last_action = r->action;
returncode = r->action; returncode = r->action;
temp = r; temp = r;
} }
@ -271,6 +269,5 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset,
return returncode; return returncode;
} }
last_action = ACTION_TOUCHSCREEN;
return ACTION_TOUCHSCREEN; return ACTION_TOUCHSCREEN;
} }

3
apps/plugins/brickmania.c
View file

@ -2235,10 +2235,9 @@ static int brickmania_game_loop(void)
if( move_button & BUTTON_TOUCHSCREEN) if( move_button & BUTTON_TOUCHSCREEN)
{ {
int data; int data;
short touch_x, touch_y; short touch_x;
rb->button_status_wdata(&data); rb->button_status_wdata(&data);
touch_x = FIXED3(data >> 16); touch_x = FIXED3(data >> 16);
touch_y = FIXED3(data & 0xffff);
if(flip_sides) if(flip_sides)
{ {

16
apps/plugins/solitaire.c
View file

@ -629,6 +629,14 @@ CONFIG_KEYPAD == MROBE500_PAD
#define NOT_A_COL -1 #define NOT_A_COL -1
#if defined(SOL_LEFT_PRE) || defined(SOL_RIGHT_PRE) || \
defined(SOL_DOWN_PRE) || defined(SOL_UP_PRE) || \
defined(SOL_CUR2STACK_PRE) || defined(SOL_MOVE_PRE) || \
defined(SOL_REM2CUR_PRE) || defined(SOL_REM2STACK_PRE) || \
defined(SOL_DRAW_PRE)
# define NEED_LASTBUTTON_VAR
#endif
typedef struct typedef struct
{ {
signed char suit; signed char suit;
@ -1418,7 +1426,10 @@ int solitaire( int skipmenu )
{ {
int i,j; int i,j;
int button, lastbutton = 0; int button;
#ifdef NEED_LASTBUTTON_VAR
int lastbutton = 0;
#endif
int c,h,prevcard; int c,h,prevcard;
int biggest_col_length; int biggest_col_length;
@ -1906,8 +1917,9 @@ int solitaire( int skipmenu )
break; break;
} }
if( button != BUTTON_NONE ) #ifdef NEED_LASTBUTTON_VAR
lastbutton = button; lastbutton = button;
#endif
/* fix incoherences concerning cur_col and cur_card */ /* fix incoherences concerning cur_col and cur_card */
c = find_card_col( cur_card ); c = find_card_col( cur_card );