Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Misc VGA fixes (Laurent Vivier)

Browse Source 
git-svn-id: svn://coreboot.org/openbios/openbios-devel@282 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2008-12-05 18:32:39 +00:00
parent e338f06ba1
commit 40feb4bb04
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/build.xml
View File

@@ -14,6 +14,7 @@
<object source="obio.c" condition="DRIVER_OBIO"/> <object source="obio.c" condition="DRIVER_OBIO"/>
<object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_load_regs.c" condition="DRIVER_VGA"/>
<object source="vga_set_mode.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/>
<object source="vga_vbe.c" condition="DRIVER_VGA"/>
</library> </library>
<dictionary name="openbios" target="forth"> <dictionary name="openbios" target="forth">

2
drivers/pci.c
View File

@@ -305,11 +305,9 @@ static const pci_dev_t vga_devices[] = {
static int vga_config_cb (const pci_config_t *config) static int vga_config_cb (const pci_config_t *config)
{ {
#if 0
if (config->regions[0] != 0x00000000) if (config->regions[0] != 0x00000000)
vga_vbe_init(config->path, config->regions[0], config->sizes[0], vga_vbe_init(config->path, config->regions[0], config->sizes[0],
config->regions[1], config->sizes[1]); config->regions[1], config->sizes[1]);
#endif
return 0; return 0;
} }

13
modules/video.c
View File

@@ -148,7 +148,7 @@ fill_rect( int col_ind, int x, int y, int w, int h )
while( ww-- ) while( ww-- )
*p++ = col; *p++ = col;
} else { } else {
char *p = (char*)pp + x; char *p = (ushort*)pp + x;
while( ww-- ) while( ww-- )
*p++ = col; *p++ = col;
} }
@@ -181,6 +181,10 @@ set_color( int ind, ulong color )
dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = ((color >> 8) & 0xff) << 24; // Green
dac[1] = (color & 0xff) << 24; // Blue dac[1] = (color & 0xff) << 24; // Blue
} }
#else
vga_set_color(ind, ((color >> 16) & 0xff),
((color >> 8) & 0xff),
(color & 0xff));
#endif #endif
} }
@@ -278,14 +282,7 @@ video_write(void)
PUSH(len); PUSH(len);
} }
static void
video_open(void)
{
RET(-1);
}
NODE_METHODS( video ) = { NODE_METHODS( video ) = {
{"open", video_open },
{"dimensions", video_dimensions }, {"dimensions", video_dimensions },
{"set-colors", video_set_colors }, {"set-colors", video_set_colors },
{"fill-rectangle", video_fill_rect }, {"fill-rectangle", video_fill_rect },