Changeset 4151 in vbox

Timestamp:

Aug 14, 2007 1:51:05 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23637

Message:

Missing fallbacks for GC & R0 contexts

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (12 diffs)

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

@@ -596 +596 @@
 }
 
-static void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
+static int vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val)
 {
     VGAState *s = (VGAState*)opaque;
@@ -674 +674 @@
             break;
         case VBE_DISPI_INDEX_ENABLE:
+#ifndef IN_RING3
+            return VINF_IOM_HC_IOPORT_WRITE;
+#else
             if (val & VBE_DISPI_ENABLED) {
                 int h, shift_control;
@@ -691 +694 @@
                     AssertMsgFailed(("XRES=%d YRES=%d cb=%d vram_size=%d\n",
                                      s->vbe_regs[VBE_DISPI_INDEX_XRES], s->vbe_regs[VBE_DISPI_INDEX_YRES], cb, s->vram_size));
-                    return;
+                    return VINF_SUCCESS; /* Note: silent failure like before */
                 }
 #else  /* KEEP_SCAN_LINE_LENGTH defined */
@@ -700 +703 @@
                     AssertMsgFailed(("VIRT WIDTH=%d YRES=%d cb=%d vram_size=%d\n",
                                      s->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH], s->vbe_regs[VBE_DISPI_INDEX_YRES], cb, s->vram_size));
-                    return;
+                    return VINF_SUCCESS; /* Note: silent failure like before */
                 }
 #endif  /* KEEP_SCAN_LINE_LENGTH defined */
@@ -784 +787 @@
             }
             s->vbe_regs[s->vbe_index] = val;
-#ifdef VBOX
-#ifdef IN_RING3
             /*
              * LFB video mode is either disabled or changed. This notification
@@ -791 +792 @@
              */
             s->pDrv->pfnLFBModeChange(s->pDrv, (val & VBE_DISPI_ENABLED) != 0);
+            break;
 #endif /* IN_RING3 */
-#endif /* VBOX */
-            break;
         case VBE_DISPI_INDEX_VIRT_WIDTH:
             {
@@ -799 +799 @@
 
                 if (val < s->vbe_regs[VBE_DISPI_INDEX_XRES])
-                    return;
+                    return VINF_SUCCESS;
                 w = val;
                 if (s->vbe_regs[VBE_DISPI_INDEX_BPP] == 4)
@@ -808 +808 @@
                 /* XXX: support weird bochs semantics ? */
                 if (h < s->vbe_regs[VBE_DISPI_INDEX_YRES])
-                    return;
+                    return VINF_SUCCESS;
                 s->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = w;
                 s->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] = h;
@@ -830 +830 @@
         case VBE_DISPI_INDEX_VBOX_VIDEO:
 #ifdef VBOX
-#ifdef IN_RING3
+#ifndef IN_RING3
+            return VINF_IOM_HC_IOPORT_WRITE;
+#else
             /* Changes in the VGA device are minimal. The device is bypassed. The driver does all work. */
             if (val == VBOX_VIDEO_DISABLE_ADAPTER_MEMORY)
@@ -851 +853 @@
         }
     }
+    return VINF_SUCCESS;
 }
 #endif
@@ -2764 +2767 @@
             {
                 s->fWriteVBEData = false;
-                vbe_ioport_write_data(s, Port, u32 & 0xFF);
-                return VINF_SUCCESS;
+                return vbe_ioport_write_data(s, Port, u32 & 0xFF);
             }
             else
@@ -2797 +2799 @@
 //        }
 //#endif
-        vbe_ioport_write_data(s, Port, u32);
+        return vbe_ioport_write_data(s, Port, u32);
     }
     else