diff options
Diffstat (limited to 'apps/plugins/sdl')
-rw-r--r-- | apps/plugins/sdl/sdl.make | 2 | ||||
-rw-r--r-- | apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c | 6 | ||||
-rw-r--r-- | apps/plugins/sdl/src/video/rockbox/keymaps_extra.h | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/apps/plugins/sdl/sdl.make b/apps/plugins/sdl/sdl.make index fedbaa5399..df7ec74ebf 100644 --- a/apps/plugins/sdl/sdl.make +++ b/apps/plugins/sdl/sdl.make | |||
@@ -23,7 +23,7 @@ OTHER_INC += -I$(SDL_SRCDIR)/include | |||
23 | # include comes first because of possible system SDL headers taking | 23 | # include comes first because of possible system SDL headers taking |
24 | # precedence | 24 | # precedence |
25 | SDLFLAGS = -I$(SDL_SRCDIR)/include $(filter-out -O%,$(PLUGINFLAGS)) \ | 25 | SDLFLAGS = -I$(SDL_SRCDIR)/include $(filter-out -O%,$(PLUGINFLAGS)) \ |
26 | -O3 -Wno-unused-parameter -Xpreprocessor -Wno-undef -Wcast-align | 26 | -O3 -Wno-unused-parameter -Xpreprocessor -Wno-undef -Wcast-align -w |
27 | 27 | ||
28 | ifndef APP_TYPE | 28 | ifndef APP_TYPE |
29 | ### no target has a big enough plugin buffer | 29 | ### no target has a big enough plugin buffer |
diff --git a/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c b/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c index 2f16f3cd8b..58de15754d 100644 --- a/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c +++ b/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c | |||
@@ -669,12 +669,12 @@ static void ROCKBOX_UnlockHWSurface(_THIS, SDL_Surface *surface) | |||
669 | #if LCD_PIXELFORMAT == RGB565SWAPPED | 669 | #if LCD_PIXELFORMAT == RGB565SWAPPED |
670 | static void flip_pixels(int x, int y, int w, int h) | 670 | static void flip_pixels(int x, int y, int w, int h) |
671 | { | 671 | { |
672 | for(int y = rects[i].y; y < rects[i].y + rects[i].h; ++y) | 672 | for(int y_0 = y; y_0 < y + h; ++y_0) |
673 | { | 673 | { |
674 | for(int x = rects[i].x; x < rects[i].x + rects[i].w; ++x) | 674 | for(int x_0 = x; x_0 < x + w; ++x_0) |
675 | { | 675 | { |
676 | /* swap pixels directly in the framebuffer */ | 676 | /* swap pixels directly in the framebuffer */ |
677 | rb->lcd_framebuffer[y * LCD_WIDTH + x] = swap16(rb->lcd_framebuffer[y * LCD_WIDTH + x]); | 677 | rb->lcd_framebuffer[y_0 * LCD_WIDTH + x_0] = swap16(rb->lcd_framebuffer[y_0 * LCD_WIDTH + x_0]); |
678 | } | 678 | } |
679 | } | 679 | } |
680 | } | 680 | } |
diff --git a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h index a205262c33..2da5c0e69d 100644 --- a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h +++ b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h | |||
@@ -25,8 +25,7 @@ | |||
25 | #ifndef _SDL_KEYMAPS_EXTRA_H | 25 | #ifndef _SDL_KEYMAPS_EXTRA_H |
26 | #define _SDL_KEYMAPS_EXTRA_H | 26 | #define _SDL_KEYMAPS_EXTRA_H |
27 | 27 | ||
28 | #if (CONFIG_KEYPAD == GIGABEAT_PAD) || \ | 28 | #if (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
29 | (CONFIG_KEYPAD == GIGABEAT_S_PAD) | ||
30 | #define BTN_EXTRA1 BUTTON_SELECT | 29 | #define BTN_EXTRA1 BUTTON_SELECT |
31 | #define BTN_EXTRA2 BUTTON_BACK | 30 | #define BTN_EXTRA2 BUTTON_BACK |
32 | #define BTN_EXTRA3 BUTTON_VOL_DOWN | 31 | #define BTN_EXTRA3 BUTTON_VOL_DOWN |