mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
destination write mask support, fixed banked memory access, read-only access for bus type in SR 0x17 (Volker Ruppert)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1364 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
40545f84cf
commit
e3a4e4b643
2 changed files with 26 additions and 19 deletions
|
@ -800,7 +800,7 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
|
|||
s->cirrus_blt_srcpitch,
|
||||
s->cirrus_blt_dstaddr,
|
||||
s->cirrus_blt_srcaddr,
|
||||
s->sr[0x2f]);
|
||||
s->gr[0x2f]);
|
||||
#endif
|
||||
|
||||
switch (s->cirrus_blt_mode & CIRRUS_BLTMODE_PIXELWIDTHMASK) {
|
||||
|
@ -1042,10 +1042,10 @@ static void cirrus_update_bank_ptr(CirrusVGAState * s, unsigned bank_index)
|
|||
else
|
||||
offset <<= 12;
|
||||
|
||||
if (s->vram_size <= offset)
|
||||
if (s->real_vram_size <= offset)
|
||||
limit = 0;
|
||||
else
|
||||
limit = s->vram_size - offset;
|
||||
limit = s->real_vram_size - offset;
|
||||
|
||||
if (((s->gr[0x0b] & 0x01) == 0) && (bank_index != 0)) {
|
||||
if (limit > 0x8000) {
|
||||
|
@ -1213,7 +1213,7 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value)
|
|||
#endif
|
||||
break;
|
||||
case 0x17: // Configuration Readback and Extended Control
|
||||
s->sr[reg_index] = reg_value;
|
||||
s->sr[reg_index] = (s->sr[reg_index] & 0x38) | (reg_value & 0xc7);
|
||||
cirrus_update_memory_access(s);
|
||||
break;
|
||||
default:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue