diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-03-30 10:13:39 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-03-30 10:13:39 +0000 |
commit | e51490166568744e7838804d890e27cb15cee400 (patch) | |
tree | 714d4a79ccbc5f365b03dee423886d2c6233b153 | |
parent | e62152ddf9a7b4f8f7a719f8a3bfc5f1bae83fe3 (diff) | |
download | rockbox-e51490166568744e7838804d890e27cb15cee400.tar.gz rockbox-e51490166568744e7838804d890e27cb15cee400.zip |
MCF5249 isn't the only Coldfire CPU
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9355 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/rockboy/lcd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c index 4fb4dd2dc0..55ae3eafba 100644 --- a/apps/plugins/rockboy/lcd.c +++ b/apps/plugins/rockboy/lcd.c | |||
@@ -48,7 +48,7 @@ struct scan scan IBSS_ATTR; | |||
48 | #define WV (scan.wv) | 48 | #define WV (scan.wv) |
49 | 49 | ||
50 | byte patpix[4096][8][8] | 50 | byte patpix[4096][8][8] |
51 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 51 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
52 | __attribute__ ((aligned(16))) /* to profit from burst mode */ | 52 | __attribute__ ((aligned(16))) /* to profit from burst mode */ |
53 | #endif | 53 | #endif |
54 | ; | 54 | ; |
@@ -109,7 +109,7 @@ fb_data *vdest; | |||
109 | void updatepatpix(void) | 109 | void updatepatpix(void) |
110 | { | 110 | { |
111 | int i, j; | 111 | int i, j; |
112 | #if ((CONFIG_CPU != SH7034) && (CONFIG_CPU != MCF5249)) || defined(SIMULATOR) | 112 | #if ((CONFIG_CPU != SH7034) && !defined(CPU_COLDFIRE)) || defined(SIMULATOR) |
113 | int k, a, c; | 113 | int k, a, c; |
114 | #endif | 114 | #endif |
115 | byte *vram = lcd.vbank[0]; | 115 | byte *vram = lcd.vbank[0]; |
@@ -192,7 +192,7 @@ void updatepatpix(void) | |||
192 | : /* clobbers */ | 192 | : /* clobbers */ |
193 | "r0", "r1", "r2" | 193 | "r0", "r1", "r2" |
194 | ); | 194 | ); |
195 | #elif CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 195 | #elif defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
196 | asm volatile ( | 196 | asm volatile ( |
197 | "move.b (%2),%%d2 \n" | 197 | "move.b (%2),%%d2 \n" |
198 | "move.b (1,%2),%%d1 \n" | 198 | "move.b (1,%2),%%d1 \n" |
@@ -347,7 +347,7 @@ void updatepatpix(void) | |||
347 | : /* clobbers */ | 347 | : /* clobbers */ |
348 | "r0", "r1" | 348 | "r0", "r1" |
349 | ); | 349 | ); |
350 | #elif CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 350 | #elif defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
351 | asm volatile ( | 351 | asm volatile ( |
352 | "movem.l (%0),%%d0-%%d3 \n" | 352 | "movem.l (%0),%%d0-%%d3 \n" |
353 | "move.l %%d0,%%d4 \n" | 353 | "move.l %%d0,%%d4 \n" |
@@ -532,7 +532,7 @@ void bg_scan(void) | |||
532 | if (cnt <= 0) return; | 532 | if (cnt <= 0) return; |
533 | while (cnt >= 8) | 533 | while (cnt >= 8) |
534 | { | 534 | { |
535 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 535 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
536 | asm volatile ( | 536 | asm volatile ( |
537 | "move.l (%1)+,(%0)+ \n" | 537 | "move.l (%1)+,(%0)+ \n" |
538 | "move.l (%1)+,(%0)+ \n" | 538 | "move.l (%1)+,(%0)+ \n" |
@@ -567,7 +567,7 @@ void wnd_scan(void) | |||
567 | 567 | ||
568 | while (cnt >= 8) | 568 | while (cnt >= 8) |
569 | { | 569 | { |
570 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 570 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
571 | asm volatile ( | 571 | asm volatile ( |
572 | "move.l (%1)+,(%0)+ \n" | 572 | "move.l (%1)+,(%0)+ \n" |
573 | "move.l (%1)+,(%0)+ \n" | 573 | "move.l (%1)+,(%0)+ \n" |
@@ -675,7 +675,7 @@ void bg_scan_color(void) | |||
675 | while (cnt >= 8) | 675 | while (cnt >= 8) |
676 | { | 676 | { |
677 | src = patpix[*(tile++)][V]; | 677 | src = patpix[*(tile++)][V]; |
678 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 678 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) |
679 | asm volatile ( | 679 | asm volatile ( |
680 | "move.l (%2)+,%%d1 \n" | 680 | "move.l (%2)+,%%d1 \n" |
681 | 681 | ||