diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-25 19:14:02 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-25 19:14:02 +0000 |
commit | 5615881955046b1642d6ee18dda0f199c78cfc04 (patch) | |
tree | b194b9ae172e7da4ea1b5777a2058925e41db9c8 | |
parent | 7014faee69119b832451a136c25e63722100b85e (diff) | |
download | rockbox-5615881955046b1642d6ee18dda0f199c78cfc04.tar.gz rockbox-5615881955046b1642d6ee18dda0f199c78cfc04.zip |
Remove a bunch of build conditions inside .c files
Fix logic in pacbox makefiles for asm optimizations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27887 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/chessbox/chessbox.c | 4 | ||||
-rw-r--r-- | apps/plugins/fractals/fractal.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/checkbox.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/overlay.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/playergfx.c | 3 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_touchscreen.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/xlcd_scroll.c | 3 | ||||
-rw-r--r-- | apps/plugins/pacbox/SOURCES | 6 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox_lcd.c | 4 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi-gui.c | 4 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 4 |
11 files changed, 3 insertions, 39 deletions
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 4e298a8214..9638168290 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -23,8 +23,6 @@ | |||
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | #ifdef HAVE_LCD_BITMAP | ||
27 | |||
28 | #if (MEMORYSIZE > 8) /* Lowmem doesn't have playback in chessbox */ | 26 | #if (MEMORYSIZE > 8) /* Lowmem doesn't have playback in chessbox */ |
29 | #define HAVE_PLAYBACK_CONTROL | 27 | #define HAVE_PLAYBACK_CONTROL |
30 | #endif | 28 | #endif |
@@ -941,5 +939,3 @@ enum plugin_status plugin_start(const void* parameter) { | |||
941 | 939 | ||
942 | return PLUGIN_OK; | 940 | return PLUGIN_OK; |
943 | } | 941 | } |
944 | |||
945 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c index 179bc3e562..21d33387b5 100644 --- a/apps/plugins/fractals/fractal.c +++ b/apps/plugins/fractals/fractal.c | |||
@@ -23,8 +23,6 @@ | |||
23 | ****************************************************************************/ | 23 | ****************************************************************************/ |
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | #ifdef HAVE_LCD_BITMAP | ||
27 | |||
28 | #include "fractal.h" | 26 | #include "fractal.h" |
29 | #include "fractal_rect.h" | 27 | #include "fractal_rect.h" |
30 | #include "fractal_sets.h" | 28 | #include "fractal_sets.h" |
@@ -254,5 +252,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
254 | } | 252 | } |
255 | return PLUGIN_OK; | 253 | return PLUGIN_OK; |
256 | } | 254 | } |
257 | |||
258 | #endif | ||
diff --git a/apps/plugins/lib/checkbox.c b/apps/plugins/lib/checkbox.c index 221137b328..80ede83e8a 100644 --- a/apps/plugins/lib/checkbox.c +++ b/apps/plugins/lib/checkbox.c | |||
@@ -22,8 +22,6 @@ | |||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "checkbox.h" | 23 | #include "checkbox.h" |
24 | 24 | ||
25 | #ifdef HAVE_LCD_BITMAP | ||
26 | |||
27 | /* | 25 | /* |
28 | * Print a checkbox | 26 | * Print a checkbox |
29 | */ | 27 | */ |
@@ -42,5 +40,3 @@ void checkbox(int x, int y, int width, int height, bool checked) | |||
42 | rb->lcd_drawline(x + 2, y + height - 2 - 1, x + width - 2 - 1, y + 2); | 40 | rb->lcd_drawline(x + 2, y + height - 2 - 1, x + width - 2 - 1, y + 2); |
43 | } | 41 | } |
44 | } | 42 | } |
45 | |||
46 | #endif | ||
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c index 97a6e1c718..8a04cf8aa7 100644 --- a/apps/plugins/lib/overlay.c +++ b/apps/plugins/lib/overlay.c | |||
@@ -21,7 +21,6 @@ | |||
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
24 | #ifndef SIMULATOR | ||
25 | #include "plugin.h" | 24 | #include "plugin.h" |
26 | #include "overlay.h" | 25 | #include "overlay.h" |
27 | 26 | ||
@@ -109,4 +108,3 @@ enum plugin_status run_overlay(const void* parameter, | |||
109 | *(header.api) = rb; | 108 | *(header.api) = rb; |
110 | return header.entry_point(parameter); | 109 | return header.entry_point(parameter); |
111 | } | 110 | } |
112 | #endif | ||
diff --git a/apps/plugins/lib/playergfx.c b/apps/plugins/lib/playergfx.c index d07043c572..b2ba71351f 100644 --- a/apps/plugins/lib/playergfx.c +++ b/apps/plugins/lib/playergfx.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | #ifdef HAVE_LCD_CHARCELLS /* Player only :) */ | ||
27 | #include "playergfx.h" | 26 | #include "playergfx.h" |
28 | 27 | ||
29 | /*** globals ***/ | 28 | /*** globals ***/ |
@@ -525,5 +524,3 @@ void pgfx_bitmap(const unsigned char *src, int x, int y, int width, int height) | |||
525 | { | 524 | { |
526 | pgfx_bitmap_part(src, 0, 0, width, x, y, width, height); | 525 | pgfx_bitmap_part(src, 0, 0, width, x, y, width, height); |
527 | } | 526 | } |
528 | |||
529 | #endif /* HAVE_LCD_CHARCELLS */ | ||
diff --git a/apps/plugins/lib/pluginlib_touchscreen.c b/apps/plugins/lib/pluginlib_touchscreen.c index 3168b46ac8..1e1bf8d3c2 100644 --- a/apps/plugins/lib/pluginlib_touchscreen.c +++ b/apps/plugins/lib/pluginlib_touchscreen.c | |||
@@ -22,8 +22,6 @@ | |||
22 | 22 | ||
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | #ifdef HAVE_TOUCHSCREEN | ||
26 | |||
27 | #include "pluginlib_touchscreen.h" | 25 | #include "pluginlib_touchscreen.h" |
28 | 26 | ||
29 | /******************************************************************************* | 27 | /******************************************************************************* |
@@ -245,5 +243,3 @@ struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_bu | |||
245 | map->_prev_btn_state = button; | 243 | map->_prev_btn_state = button; |
246 | return ret; | 244 | return ret; |
247 | } | 245 | } |
248 | |||
249 | #endif /* HAVE_TOUCHSCREEN */ | ||
diff --git a/apps/plugins/lib/xlcd_scroll.c b/apps/plugins/lib/xlcd_scroll.c index 0d06545c84..a26e65110c 100644 --- a/apps/plugins/lib/xlcd_scroll.c +++ b/apps/plugins/lib/xlcd_scroll.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include "plugin.h" | 25 | #include "plugin.h" |
26 | 26 | ||
27 | #ifdef HAVE_LCD_BITMAP | ||
28 | #include "xlcd.h" | 27 | #include "xlcd.h" |
29 | 28 | ||
30 | #if (LCD_DEPTH == 2) && (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) | 29 | #if (LCD_DEPTH == 2) && (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) |
@@ -754,5 +753,3 @@ void xlcd_scroll_down(int count) | |||
754 | 753 | ||
755 | #endif /* LCD_PIXELFORMAT, LCD_DEPTH */ | 754 | #endif /* LCD_PIXELFORMAT, LCD_DEPTH */ |
756 | #endif /* defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE */ | 755 | #endif /* defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE */ |
757 | |||
758 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/pacbox/SOURCES b/apps/plugins/pacbox/SOURCES index 65a5cf1cb9..c06288699f 100644 --- a/apps/plugins/pacbox/SOURCES +++ b/apps/plugins/pacbox/SOURCES | |||
@@ -3,11 +3,11 @@ pacbox.c | |||
3 | hardware.c | 3 | hardware.c |
4 | z80.c | 4 | z80.c |
5 | wsg3.c | 5 | wsg3.c |
6 | |||
6 | #if defined(CPU_PP502x) && (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224) | 7 | #if defined(CPU_PP502x) && (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224) |
7 | pacbox_arm.S | 8 | pacbox_arm.S |
9 | #elif defined(CPU_COLDFIRE) | ||
10 | pacbox_cf.S | ||
8 | #else | 11 | #else |
9 | pacbox_lcd.c | 12 | pacbox_lcd.c |
10 | #endif | 13 | #endif |
11 | #if defined(CPU_COLDFIRE) | ||
12 | pacbox_cf.S | ||
13 | #endif | ||
diff --git a/apps/plugins/pacbox/pacbox_lcd.c b/apps/plugins/pacbox/pacbox_lcd.c index c4df2fa6cd..04bfe5f797 100644 --- a/apps/plugins/pacbox/pacbox_lcd.c +++ b/apps/plugins/pacbox/pacbox_lcd.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include "arcade.h" | 28 | #include "arcade.h" |
29 | #include "hardware.h" | 29 | #include "hardware.h" |
30 | 30 | ||
31 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) || !defined(IRIVER_H300_SERIES) | ||
32 | |||
33 | void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf) | 31 | void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf) |
34 | { | 32 | { |
35 | fb_data* dst; | 33 | fb_data* dst; |
@@ -143,5 +141,3 @@ void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf) | |||
143 | #endif /* Size >= 144x112 */ | 141 | #endif /* Size >= 144x112 */ |
144 | #endif /* Not Colour */ | 142 | #endif /* Not Colour */ |
145 | } | 143 | } |
146 | |||
147 | #endif | ||
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index dcdfe5fd35..5188986e84 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c | |||
@@ -39,8 +39,6 @@ further options: | |||
39 | 39 | ||
40 | #include "plugin.h" | 40 | #include "plugin.h" |
41 | 41 | ||
42 | #ifdef HAVE_LCD_BITMAP | ||
43 | |||
44 | #include "reversi-game.h" | 42 | #include "reversi-game.h" |
45 | #include "reversi-strategy.h" | 43 | #include "reversi-strategy.h" |
46 | #include "reversi-gui.h" | 44 | #include "reversi-gui.h" |
@@ -802,5 +800,3 @@ enum plugin_status plugin_start(const void *parameter) { | |||
802 | 800 | ||
803 | return PLUGIN_OK; | 801 | return PLUGIN_OK; |
804 | } | 802 | } |
805 | |||
806 | #endif | ||
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 4f87c5f4c8..81c00803f8 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -61,8 +61,6 @@ Example ".ss" file, and one with a saved state: | |||
61 | #include "plugin.h" | 61 | #include "plugin.h" |
62 | #include "lib/configfile.h" | 62 | #include "lib/configfile.h" |
63 | 63 | ||
64 | #ifdef HAVE_LCD_BITMAP | ||
65 | |||
66 | #include <lib/playback_control.h> | 64 | #include <lib/playback_control.h> |
67 | #include "sudoku.h" | 65 | #include "sudoku.h" |
68 | #include "generator.h" | 66 | #include "generator.h" |
@@ -1307,5 +1305,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1307 | #endif | 1305 | #endif |
1308 | return rc; | 1306 | return rc; |
1309 | } | 1307 | } |
1310 | |||
1311 | #endif | ||