Virtualization
/
openbios
mirror of https://gitlab.com/qemu-project/openbios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sparc32 merge 20 part 1 

git-svn-id: svn://coreboot.org/openbios/openbios-devel@38 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Stefan Reinauer 2006-06-05 10:51:31 +00:00
parent deab0f7938
commit 1523f6fbf7
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/console.c
View File

@ -251,7 +251,7 @@ void video_init(void)
* keyboard driver
*/
static char normal[] = {
static const char normal[] = {
0x0, 0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-',
'=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o',
'p', '[', ']', 0xa, 0x0, 'a', 's', 'd', 'f', 'g', 'h', 'j',
@ -261,7 +261,7 @@ static char normal[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '0', 0x7f
};
static char shifted[] = {
static const char shifted[] = {
0x0, 0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_',
'+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O',
'P', '{', '}', 0xa, 0x0, 'A', 'S', 'D', 'F', 'G', 'H', 'J',

2
modules/console.c
View File

@ -165,7 +165,7 @@ scroll1( void )
int
console_draw_str( const char *str )
{
static char *ignore[] = { "[1;37m", "[2;40m", NULL };
static const char *ignore[] = { "[1;37m", "[2;40m", NULL };
int ch, y, x, i;
if( !cons.inited && console_init() )

7
modules/video.c
View File

@ -172,6 +172,13 @@ set_color( int ind, ulong color )
#ifdef CONFIG_MOL
if( video.fb.depth == 8 )
OSI_SetColor( ind, color );
#elif CONFIG_SPARC32
if( video.fb.depth == 8 ) {
dac[0] = ind << 24;
dac[1] = ((color >> 16) & 0xff) << 24; // Red
dac[1] = ((color >> 8) & 0xff) << 24; // Green
dac[1] = (color & 0xff) << 24; // Blue
}
#endif
}