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

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 @@
  
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP
-
 #if (MEMORYSIZE > 8) /* Lowmem doesn't have playback in chessbox */
 #define HAVE_PLAYBACK_CONTROL
 #endif
@@ -941,5 +939,3 @@ enum plugin_status plugin_start(const void* parameter) {
 
     return PLUGIN_OK;
 }
-
-#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 @@
  ****************************************************************************/
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP
-
 #include "fractal.h"
 #include "fractal_rect.h"
 #include "fractal_sets.h"
@@ -254,5 +252,3 @@ enum plugin_status plugin_start(const void* parameter)
     }
     return PLUGIN_OK;
 }
-
-#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 @@
 #include "plugin.h"
 #include "checkbox.h"
 
-#ifdef HAVE_LCD_BITMAP
-
 /*
  * Print a checkbox
  */
@@ -42,5 +40,3 @@ void checkbox(int x, int y, int width, int height, bool checked)
         rb->lcd_drawline(x + 2, y + height - 2 - 1, x + width - 2 - 1, y + 2);
     }
 }
-
-#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 @@
  *
  ****************************************************************************/
 
-#ifndef SIMULATOR
 #include "plugin.h"
 #include "overlay.h"
 
@@ -109,4 +108,3 @@ enum plugin_status run_overlay(const void* parameter,
     *(header.api) = rb;
     return header.entry_point(parameter);
 }
-#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 @@
 
 #include "plugin.h"
 
-#ifdef HAVE_LCD_CHARCELLS /* Player only :) */
 #include "playergfx.h"
 
 /*** globals ***/
@@ -525,5 +524,3 @@ void pgfx_bitmap(const unsigned char *src, int x, int y, int width, int height)
 {
     pgfx_bitmap_part(src, 0, 0, width, x, y, width, height);
 }
-
-#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 @@
 
 #include "plugin.h"
 
-#ifdef HAVE_TOUCHSCREEN
-
 #include "pluginlib_touchscreen.h"
 
 /*******************************************************************************
@@ -245,5 +243,3 @@ struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_bu
     map->_prev_btn_state = button;
     return ret;
 }
-
-#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 @@
 
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP
 #include "xlcd.h"
 
 #if (LCD_DEPTH == 2) && (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED)
@@ -754,5 +753,3 @@ void xlcd_scroll_down(int count)
 
 #endif /* LCD_PIXELFORMAT, LCD_DEPTH */
 #endif /* defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE */
-
-#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
 hardware.c
 z80.c
 wsg3.c
+
 #if defined(CPU_PP502x) && (LCD_WIDTH >= 288) && (LCD_HEIGHT >= 224)
 pacbox_arm.S
+#elif defined(CPU_COLDFIRE)
+pacbox_cf.S
 #else
 pacbox_lcd.c
 #endif
-#if defined(CPU_COLDFIRE)
-pacbox_cf.S
-#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 @@
 #include "arcade.h"
 #include "hardware.h"
 
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED) || !defined(IRIVER_H300_SERIES)
-
 void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf)
 {
     fb_data* dst;
@@ -143,5 +141,3 @@ void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf)
 #endif /* Size >= 144x112 */
 #endif /* Not Colour */
 }
-
-#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:
 
 #include "plugin.h"
 
-#ifdef HAVE_LCD_BITMAP
-
 #include "reversi-game.h"
 #include "reversi-strategy.h"
 #include "reversi-gui.h"
@@ -802,5 +800,3 @@ enum plugin_status plugin_start(const void *parameter) {
 
     return PLUGIN_OK;
 }
-
-#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:
 #include "plugin.h"
 #include "lib/configfile.h"
 
-#ifdef HAVE_LCD_BITMAP
-
 #include <lib/playback_control.h>
 #include "sudoku.h"
 #include "generator.h"
@@ -1307,5 +1305,3 @@ enum plugin_status plugin_start(const void* parameter)
 #endif
     return rc;
 }
-
-#endif