mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some small fixes in the display adapters code.

Browse Source 
- Fixed missing bx_gui->flush() call after non-VGA update().
- Fixed a BX_DEBUG message in the Voodoo code.
- Re-define LOG_THIS for messages in the "Voodoo VGA" code.
This commit is contained in:
Volker Ruppert 2017-10-14 11:15:00 +00:00
parent 69f27439db
commit 184324c8e8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/iodev/display/vgacore.cc
View File

@ -2405,10 +2405,12 @@ void bx_vgacore_c::vga_timer_handler(void *this_ptr)
#if BX_SUPPORT_PCI
if (vgadev->s.vga_override && (vgadev->s.nvgadev != NULL)) {
vgadev->s.nvgadev->update();
return;
}
else
#endif
vgadev->update();
{
vgadev->update();
}
bx_gui->flush();
}

5
bochs/iodev/display/voodoo.cc
View File

@ -829,7 +829,7 @@ void bx_voodoo_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len
if (!v->pci.fifo.enabled && !fifo_empty(&v->pci.fifo)) {
bx_set_event(&fifo_wakeup);
}
BX_DEBUG(("PCI FIFO now %sabled (not implemented)", v->pci.fifo.enabled ? "en":"dis"));
BX_DEBUG(("PCI FIFO now %sabled", v->pci.fifo.enabled ? "en":"dis"));
}
if (((address+i) == 0x41) && (BX_VOODOO_THIS s.model == VOODOO_2)) {
value8 &= 0x0f;
@ -868,6 +868,9 @@ void bx_voodoo_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len
BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
}
#undef LOG_THIS
#define LOG_THIS theVoodooVga->
bx_voodoo_vga_c::bx_voodoo_vga_c() : bx_vgacore_c()
{
put("VVGA");