mirror of
https://github.com/qemu/qemu.git
synced 2024-11-28 14:24:02 +08:00
VBE: 8 bit DACs + support for VBE BIOS IDs (Volker Ruppert)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2163 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
05f83f0f95
commit
37dd208d38
11
hw/vga.c
11
hw/vga.c
@ -422,7 +422,9 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
|
||||
case VBE_DISPI_INDEX_ID:
|
||||
if (val == VBE_DISPI_ID0 ||
|
||||
val == VBE_DISPI_ID1 ||
|
||||
val == VBE_DISPI_ID2) {
|
||||
val == VBE_DISPI_ID2 ||
|
||||
val == VBE_DISPI_ID3 ||
|
||||
val == VBE_DISPI_ID4) {
|
||||
s->vbe_regs[s->vbe_index] = val;
|
||||
}
|
||||
break;
|
||||
@ -505,6 +507,7 @@ static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
|
||||
/* XXX: the bios should do that */
|
||||
s->bank_offset = 0;
|
||||
}
|
||||
s->dac_8bit = (val & VBE_DISPI_8BIT_DAC) > 0;
|
||||
s->vbe_regs[s->vbe_index] = val;
|
||||
break;
|
||||
case VBE_DISPI_INDEX_VIRT_WIDTH:
|
||||
@ -921,9 +924,15 @@ static int update_palette256(VGAState *s)
|
||||
palette = s->last_palette;
|
||||
v = 0;
|
||||
for(i = 0; i < 256; i++) {
|
||||
if (s->dac_8bit) {
|
||||
col = s->rgb_to_pixel(s->palette[v],
|
||||
s->palette[v + 1],
|
||||
s->palette[v + 2]);
|
||||
} else {
|
||||
col = s->rgb_to_pixel(c6_to_8(s->palette[v]),
|
||||
c6_to_8(s->palette[v + 1]),
|
||||
c6_to_8(s->palette[v + 2]));
|
||||
}
|
||||
if (col != palette[i]) {
|
||||
full_update = 1;
|
||||
palette[i] = col;
|
||||
|
@ -49,6 +49,8 @@
|
||||
#define VBE_DISPI_ID0 0xB0C0
|
||||
#define VBE_DISPI_ID1 0xB0C1
|
||||
#define VBE_DISPI_ID2 0xB0C2
|
||||
#define VBE_DISPI_ID3 0xB0C3
|
||||
#define VBE_DISPI_ID4 0xB0C4
|
||||
|
||||
#define VBE_DISPI_DISABLED 0x00
|
||||
#define VBE_DISPI_ENABLED 0x01
|
||||
@ -103,6 +105,7 @@
|
||||
uint8_t dac_read_index; \
|
||||
uint8_t dac_write_index; \
|
||||
uint8_t dac_cache[3]; /* used when writing */ \
|
||||
int dac_8bit; \
|
||||
uint8_t palette[768]; \
|
||||
int32_t bank_offset; \
|
||||
int (*get_bpp)(struct VGAState *s); \
|
||||
|
Loading…
Reference in New Issue
Block a user