Changeset 22470 in vbox

Timestamp:

Aug 26, 2009 1:21:31 PM (15 years ago)

Author:

vboxsync

Message:

HGSMI/VBVA VGA removed obsolete code.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (2 diffs)
• DevVGA.h (modified) (2 diffs)

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

@@ -3122 +3122 @@
     NOREF(pvUser);
 
-#ifdef VBOX_WITH_HGSMI
-#ifdef IN_RING3
-    if (s->vbe_index == VBE_DISPI_INDEX_VBVA_GUEST)
-    {
-        HGSMIGuestWrite (s->pHGSMI, u32);
-        PDMCritSectLeave(&s->lock);
-        return VINF_SUCCESS;
-    }
-    if (s->vbe_index == VBE_DISPI_INDEX_VBVA_HOST)
-    {
-#if defined(VBOX_WITH_VIDEOHWACCEL)
-        if(u32 == HGSMIOFFSET_VOID)
-        {
-            PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_LOW);
-            HGSMIClearHostGuestFlags(s->pHGSMI, HGSMIHOSTFLAGS_IRQ);
-        }
-        else
-#endif
-        {
-            HGSMIHostWrite (s->pHGSMI, u32);
-        }
-        PDMCritSectLeave(&s->lock);
-        return VINF_SUCCESS;
-    }
-#else
-    if (   s->vbe_index == VBE_DISPI_INDEX_VBVA_HOST
-        || s->vbe_index == VBE_DISPI_INDEX_VBVA_GUEST)
-    {
-        Log(("vgaIOPortWriteVBEData: %s - Switching to host...\n",
-             s->vbe_index == VBE_DISPI_INDEX_VBVA_HOST? "VBE_DISPI_INDEX_VBVA_HOST": "VBE_DISPI_INDEX_VBVA_GUEST"));
-        PDMCritSectLeave(&s->lock);
-        return VINF_IOM_HC_IOPORT_WRITE;
-    }
-#endif /* !IN_RING3 */
-#endif /* VBOX_WITH_HGSMI */
-
 #ifndef IN_RING3
     /*
@@ -3294 +3258 @@
     if (rc != VINF_SUCCESS)
         return rc;
-
-#ifdef VBOX_WITH_HGSMI
-#ifdef IN_RING3
-    if (s->vbe_index == VBE_DISPI_INDEX_VBVA_GUEST)
-    {
-        *pu32 = HGSMIGuestRead (s->pHGSMI);
-        PDMCritSectLeave(&s->lock);
-        return VINF_SUCCESS;
-    }
-    if (s->vbe_index == VBE_DISPI_INDEX_VBVA_HOST)
-    {
-        *pu32 = HGSMIHostRead (s->pHGSMI);
-        PDMCritSectLeave(&s->lock);
-        return VINF_SUCCESS;
-    }
-#else
-    if (   s->vbe_index == VBE_DISPI_INDEX_VBVA_HOST
-        || s->vbe_index == VBE_DISPI_INDEX_VBVA_GUEST)
-    {
-        Log(("vgaIOPortWriteVBEData: %s - Switching to host...\n",
-             s->vbe_index == VBE_DISPI_INDEX_VBVA_HOST? "VBE_DISPI_INDEX_VBVA_HOST": "VBE_DISPI_INDEX_VBVA_GUEST"));
-        PDMCritSectLeave(&s->lock);
-        return VINF_IOM_HC_IOPORT_READ;
-    }
-#endif /* !IN_RING3 */
-#endif /* VBOX_WITH_HGSMI */
 
 #ifdef VBE_BYTEWISE_IO

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

@@ -87 +87 @@
 #define VBE_DISPI_INDEX_Y_OFFSET        0x9
 #define VBE_DISPI_INDEX_VBOX_VIDEO      0xa
-#ifdef VBOX_WITH_HGSMI
-/* @todo this will break saved state and is inefficient. use 2 PCI io ports. */
-#define VBE_DISPI_INDEX_VBVA_HOST       0xb
-#define VBE_DISPI_INDEX_VBVA_GUEST      0xc
-#define VBE_DISPI_INDEX_NB              0xd
-#else
 #define VBE_DISPI_INDEX_NB              0xb
-#endif /* !VBOX_WITH_HGSMI */
 
 #define VBE_DISPI_ID0                   0xB0C0
@@ -106 +99 @@
 #define VBE_DISPI_ID_VBOX_VIDEO         0xBE00
 #ifdef VBOX_WITH_HGSMI
-/* The VBOX interface id. Indicates support for VBVA shared memory interface,
- * VBE_DISPI_INDEX_VBVA_GUEST_CMD and VBE_DISPI_INDEX_VBVA_HOST_CMD VBE indexes.
- */
+/* The VBOX interface id. Indicates support for VBVA shared memory interface. */
 #define VBE_DISPI_ID_HGSMI              0xBE01
 #endif /* VBOX_WITH_HGSMI */