devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Code cleaning - remove some unnecessary defined(SIMULATOR) checks

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13369 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-05-10 13:16:08 +00:00
parent 1fc2d91a83
commit f02cba8096
30 changed files with 59 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/plugins/alpine_cdc.c
View file

@ -32,7 +32,7 @@
#include "plugin.h"
/* Only build for (correct) target */
#if !defined(SIMULATOR) && CONFIG_CPU==SH7034 && !defined(HAVE_MMC)
#if CONFIG_CPU==SH7034 && !defined(HAVE_MMC)
PLUGIN_HEADER
@ -1201,4 +1201,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR;
}
#endif /* #ifndef SIMULATOR, etc. */
#endif /* CONFIG_CPU==SH7034 && !defined(HAVE_MMC) */

2
apps/plugins/doom/i_video.c
View file

@ -583,7 +583,7 @@ void I_InitGraphics(void)
gray_show(true);
#endif
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#ifdef CPU_COLDFIRE
coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE);
d_screens[0] = fastscreen;
#else

2
apps/plugins/doom/m_fixed.h
View file

@ -44,7 +44,7 @@ typedef int fixed_t;
inline static int FixedMul( int a, int b )
{
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#if defined(CPU_COLDFIRE)
// Code contributed by Thom Johansen
register int result;
asm (

2
apps/plugins/doom/r_draw.c
View file

@ -526,7 +526,7 @@ byte *ds_source IBSS_ATTR;
void R_DrawSpan (void)
{
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#ifdef CPU_COLDFIRE
// only slightly faster
asm volatile (
"tst %[count] \n"

4
apps/plugins/rockbox_flash.c
View file

@ -21,7 +21,7 @@
****************************************************************************/
#include "plugin.h"
#if !defined(SIMULATOR) && (CONFIG_CPU == SH7034) /* Only for SH targets */
#if (CONFIG_CPU == SH7034) /* Only for SH targets */
PLUGIN_HEADER
@ -1038,4 +1038,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
}
#endif /* !SIMULATOR or a SH-target */
#endif /* SH-target */

18
apps/plugins/rockboy/lcd.c
View file

@ -43,7 +43,7 @@ struct scan scan IBSS_ATTR;
#define WV (scan.wv)
byte patpix[4096][8][8]
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#if defined(CPU_COLDFIRE)
__attribute__ ((aligned(16))) /* to profit from burst mode */
#endif
;
@ -62,7 +62,7 @@ fb_data *vdest;
void updatepatpix(void)
{
int i, j;
#if ((CONFIG_CPU != SH7034) && !defined(CPU_COLDFIRE)) || defined(SIMULATOR)
#if ((CONFIG_CPU != SH7034) && !defined(CPU_COLDFIRE))
int k, a, c;
#endif
byte *vram = lcd.vbank[0];
@ -76,7 +76,7 @@ void updatepatpix(void)
patdirty[i] = 0;
for (j = 0; j < 8; j++)
{
#if CONFIG_CPU == SH7034 && !defined(SIMULATOR)
#if CONFIG_CPU == SH7034
asm volatile (
"mov.w @%2,r1 \n"
"swap.b r1,r2 \n"
@ -145,7 +145,7 @@ void updatepatpix(void)
: /* clobbers */
"r0", "r1", "r2"
);
#elif defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#elif defined(CPU_COLDFIRE)
asm volatile (
"move.b (%2),%%d2 \n"
"move.b (1,%2),%%d1 \n"
@ -222,7 +222,7 @@ void updatepatpix(void)
patpix[i+1024][j][7-k];
#endif
}
#if CONFIG_CPU == SH7034 && !defined(SIMULATOR)
#if CONFIG_CPU == SH7034
asm volatile (
"mov.l @%0,r0 \n"
"mov.l @(4,%0),r1 \n"
@ -300,7 +300,7 @@ void updatepatpix(void)
: /* clobbers */
"r0", "r1"
);
#elif defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#elif defined(CPU_COLDFIRE)
asm volatile (
"movem.l (%0),%%d0-%%d3 \n"
"move.l %%d0,%%d4 \n"
@ -486,7 +486,7 @@ void bg_scan(void)
if (cnt <= 0) return;
while (cnt >= 8)
{
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#if defined(CPU_COLDFIRE)
asm volatile (
"move.l (%1)+,(%0)+ \n"
"move.l (%1)+,(%0)+ \n"
@ -521,7 +521,7 @@ void wnd_scan(void)
while (cnt >= 8)
{
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#if defined(CPU_COLDFIRE)
asm volatile (
"move.l (%1)+,(%0)+ \n"
"move.l (%1)+,(%0)+ \n"
@ -629,7 +629,7 @@ void bg_scan_color(void)
while (cnt >= 8)
{
src = patpix[*(tile++)][V];
#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
#if defined(CPU_COLDFIRE)
asm volatile (
"move.l (%2)+,%%d1 \n"