Changeset 22549 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Aug 28, 2009 11:24:07 AM (15 years ago)

Author:

vboxsync

Message:

HGSMI/VBVA removed obsolete VBE port IO code (spinlock).

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (5 diffs)
• VBoxVideo.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1151 +1151 @@
 #ifdef VBOX_WITH_HGSMI
    VBoxSetupVideoPortFunctions((PDEVICE_EXTENSION)HwDeviceExtension, &((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.VideoPortProcs, ConfigInfo);
-   ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.VideoPortProcs.pfnCreateSpinLock(HwDeviceExtension, &((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.pGHRWLock);
 #endif
 
@@ -1810 +1809 @@
             {
                 /* The display driver must have prepared the monitor information. */
-#ifndef VBOX_WITH_HGSMI
                 VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO);
                 VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_DISPLAY_MEMORY_BASE + pDevExt->iDevice);
-#else
-                VBoxVideoVBEWriteUlong(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, VBE_DISPI_INDEX_VBOX_VIDEO, VBOX_VIDEO_INTERPRET_DISPLAY_MEMORY_BASE + pDevExt->iDevice);
-#endif
             }
             else
@@ -2104 +2099 @@
     }
 
-#ifndef VBOX_WITH_HGSMI
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE);
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_DISABLED);
-#else
-    VBoxVideoVBEWriteUshort(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED);
-#endif
 
     if (pDevExt->u.primary.pvReqFlush != NULL)
@@ -2211 +2202 @@
 
     /* set the mode characteristics */
-#ifndef VBOX_WITH_HGSMI
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES);
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, (USHORT)ModeInfo->VisScreenWidth);
@@ -2222 +2212 @@
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
     /** @todo read from the port to see if the mode switch was successful */
-#else
-    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_XRES, (USHORT)ModeInfo->VisScreenWidth);
-    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_YRES, (USHORT)ModeInfo->VisScreenHeight);
-    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_BPP, (USHORT)ModeInfo->BitsPerPlane);
-    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
-#endif
 
     /* Tell the host that we now support graphics in the additions.

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -143 +143 @@
            HGSMIHEAP hgsmiAdapterHeap;
 
-           PSPIN_LOCK pGHRWLock; /* lock for making guest->host read/writes atomic */
-
            /* The IO Port Number for host commands. */
            RTIOPORT IOPortHost;
@@ -277 +275 @@
 #ifdef VBOX_WITH_HGSMI
 
-DECLINLINE(void) VBoxVideoVBEWriteUlongLocked(USHORT dataType, ULONG data)
-{
-    VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, dataType);
-    VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, data);
-}
-
-DECLINLINE(void) VBoxVideoVBEWriteUshortLocked(USHORT dataType, USHORT data)
-{
-    VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, dataType);
-    VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, data);
-}
-
-DECLINLINE(ULONG) VBoxVideoVBEReadUlongLocked (USHORT dataType)
-{
-    VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, dataType);
-    return VideoPortReadPortUlong((PULONG)VBE_DISPI_IOPORT_DATA);
-}
-
-DECLINLINE(void) VBoxVideoVBEWriteUlong(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType, ULONG data)
-{
-    UCHAR oldIrql;
-    PrimaryExtension->u.primary.VideoPortProcs.pfnAcquireSpinLock(PrimaryExtension,
-                PrimaryExtension->u.primary.pGHRWLock,
-            &oldIrql);
-    VBoxVideoVBEWriteUlongLocked(dataType, data);
-    PrimaryExtension->u.primary.VideoPortProcs.pfnReleaseSpinLock(PrimaryExtension,
-                PrimaryExtension->u.primary.pGHRWLock,
-            oldIrql);
-}
-
-DECLINLINE(void) VBoxVideoVBEWriteUshort(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType, USHORT data)
-{
-    UCHAR oldIrql;
-    PrimaryExtension->u.primary.VideoPortProcs.pfnAcquireSpinLock(PrimaryExtension,
-                PrimaryExtension->u.primary.pGHRWLock,
-            &oldIrql);
-    VBoxVideoVBEWriteUshortLocked(dataType, data);
-    PrimaryExtension->u.primary.VideoPortProcs.pfnReleaseSpinLock(PrimaryExtension,
-                PrimaryExtension->u.primary.pGHRWLock,
-            oldIrql);
-}
-
-DECLINLINE(ULONG) VBoxVideoVBEReadUlong(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType)
-{
-    ULONG data;
-    UCHAR oldIrql;
-    PrimaryExtension->u.primary.VideoPortProcs.pfnAcquireSpinLock(PrimaryExtension,
-                PrimaryExtension->u.primary.pGHRWLock,
-            &oldIrql);
-    data = VBoxVideoVBEReadUlongLocked(dataType);
-    PrimaryExtension->u.primary.VideoPortProcs.pfnReleaseSpinLock(PrimaryExtension,
-                PrimaryExtension->u.primary.pGHRWLock,
-            oldIrql);
-    return data;
-}
-
 /*
  * Host and Guest port IO helpers.