Changeset 15120 in vbox

Timestamp:

Dec 8, 2008 4:53:53 PM (16 years ago)

Author:

vboxsync

Message:

Removed bank mask which assumed power of two VRAM size, replaced with max bank index.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (6 diffs)
• DevVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -898 +898 @@
             break;
         case VBE_DISPI_INDEX_BANK:
-            if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4) {
-              val &= (s->vbe_bank_mask >> 2);
-            } else {
-              val &= s->vbe_bank_mask;
-            }
-            val &= s->vbe_bank_mask;
+            if (val > s->vbe_bank_max)
+                val = s->vbe_bank_max;
             s->vbe_regs[s->vbe_index] = val;
             s->bank_offset = (val << 16);
@@ -2563 +2559 @@
     qemu_put_be32s(f, &s->vbe_start_addr);
     qemu_put_be32s(f, &s->vbe_line_offset);
-    qemu_put_be32s(f, &s->vbe_bank_mask);
 #else
     qemu_put_byte(f, 0);
@@ -2623 +2618 @@
     qemu_get_be32s(f, &s->vbe_start_addr);
     qemu_get_be32s(f, &s->vbe_line_offset);
-    qemu_get_be32s(f, &s->vbe_bank_mask);
+    s->vbe_bank_max = s->vram_size >> 16;
 #else
     if (is_vbe)
@@ -2729 +2724 @@
 #ifdef CONFIG_BOCHS_VBE
     s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
-    s->vbe_bank_mask = ((s->vram_size >> 16) - 1);
+    s->vbe_bank_max = s->vram_size >> 16;
 #if defined (TARGET_I386)
     register_ioport_read(0x1ce, 1, 2, vbe_ioport_read_index, s);
@@ -5186 +5181 @@
     pThis->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
     pThis->vbe_regs[VBE_DISPI_INDEX_VBOX_VIDEO] = 0;
-    pThis->vbe_bank_mask    = ((pThis->vram_size >> 16) - 1);
+    pThis->vbe_bank_max   = pThis->vram_size >> 16;
 #endif /* CONFIG_BOCHS_VBE */
 
@@ -5646 +5641 @@
 
     /* save */
-    rc = PDMDevHlpSSMRegister(pDevIns, pDevIns->pDevReg->szDeviceName, iInstance, 1 /* version */, sizeof(*pThis),
+    rc = PDMDevHlpSSMRegister(pDevIns, pDevIns->pDevReg->szDeviceName, iInstance, 2 /* version */, sizeof(*pThis),
                                           NULL, vgaR3SaveExec, NULL,
                                           NULL, vgaR3LoadExec, NULL);

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -103 +103 @@
     uint32_t vbe_start_addr;                    \
     uint32_t vbe_line_offset;                   \
-    uint32_t vbe_bank_mask;
+    uint32_t vbe_bank_max;
 
 #else