Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Accept 16 as fpu cookie, CT060 seems to use it.

Browse Source 
* map haiku console colors to atari's palette.
* move the stack up for testing.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23769 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2008-01-27 18:11:42 +00:00
parent 0b31f902da
commit 68b5c8de5d
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/boot/platform/atari_m68k/atari_memory_map.h
View File

@ -21,7 +21,8 @@
#define ATARI_SHADOW_BASE 0xff000000 #define ATARI_SHADOW_BASE 0xff000000
/* how we will use it */ /* how we will use it */
#define ATARI_ZBEOS_STACK_BASE 0x00040000 //#define ATARI_ZBEOS_STACK_BASE 0x00040000
#define ATARI_ZBEOS_STACK_BASE 0x00060000
#define ATARI_ZBEOS_BASE 0x00080000 /* from .prg shell.S will copy itself there */ #define ATARI_ZBEOS_BASE 0x00080000 /* from .prg shell.S will copy itself there */
#endif /* ATARI_MEMORY_MAP_H */ #endif /* ATARI_MEMORY_MAP_H */

14
src/system/boot/platform/atari_m68k/console.cpp
View File

@ -235,9 +235,15 @@ translate_color(int32 color)
e: ff ff 55 // yellow e: ff ff 55 // yellow
f: ff ff ff // white f: ff ff ff // white
*/ */
if (color >= 0 && color < 16) // cf. http://www.fortunecity.com/skyscraper/apple/308/html/chap4.htm
return color; static const char cmap[] = {
15, 4, 2, 6, 1, 5, 3, 7,
8, 12, 10, 14, 9, 13, 11, 0 };
if (color < 0 && color >= 16)
return 0; return 0;
return cmap[color];
//return color;
} }
@ -245,8 +251,8 @@ void
console_set_color(int32 foreground, int32 background) console_set_color(int32 foreground, int32 background)
{ {
char buff[] = "\033b \033c "; char buff[] = "\033b \033c ";
buff[2] = (char)translate_color(foreground); buff[2] += (char)translate_color(foreground);
buff[5] = (char)translate_color(background); buff[5] += (char)translate_color(background);
sInput.WriteAt(NULL, 0LL, buff, 6); sInput.WriteAt(NULL, 0LL, buff, 6);
} }

3
src/system/boot/platform/atari_m68k/cpu.cpp
View File

@ -65,7 +65,8 @@ check_cpu_features()
fpu_emul = (uint16)(c->ivalue); fpu_emul = (uint16)(c->ivalue);
#warning M68K: check for fpu in detail #warning M68K: check for fpu in detail
if (fpu_type < 2 || fpu_type > 9) { // CT060 seems to use 16...
if (fpu_type < 2 || fpu_type > 16) {
panic("bad fpu"); panic("bad fpu");
return EINVAL; return EINVAL;
} }