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

Timestamp:

Jun 11, 2009 4:54:19 PM (16 years ago)

Author:

vboxsync

Message:

video hw accel: guest driver -> host framebuffer commands processing impl

Location:

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

Files:

• VBoxVideo.cpp (modified) (4 diffs)
• VBoxVideo.h (modified) (1 diff)
• vboxioctl.h (modified) (2 diffs)

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

@@ -1895 +1895 @@
             HGSMIQUERYCALLBACKS *pInfo = (HGSMIQUERYCALLBACKS *)RequestPacket->OutputBuffer;
 
-            pInfo->hContext = pDevExt->pPrimary;
-            pInfo->pfnCompletionHandler = hgsmiHostCmdHandlerComplete;
+            pInfo->hContext = pDevExt;
+            pInfo->pfnCompletionHandler = hgsmiHostCmdComplete;
+            pInfo->pfnRequestCommandsHandler = hgsmiHostCmdRequest;
 
             RequestPacket->StatusBlock->Information = sizeof(HGSMIQUERYCALLBACKS);
@@ -1902 +1903 @@
             break;
         }
-        case IOCTL_VIDEO_HGSMI_HANDLER_REGISTER:
-        {
-            dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_HGSMI_HANDLER_REGISTER\n"));
-
-            if (RequestPacket->InputBufferLength< sizeof(HGSMIHANDLERREGISTER))
+        case IOCTL_VIDEO_HGSMI_HANDLER_ENABLE:
+        {
+            dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_HGSMI_HANDLER_ENABLE\n"));
+
+            if (RequestPacket->InputBufferLength< sizeof(HGSMIHANDLERENABLE))
             {
                 dprintf(("VBoxVideo::VBoxVideoStartIO: Output buffer too small: %d needed: %d!!!\n",
-                         RequestPacket->InputBufferLength, sizeof(HGSMIHANDLERREGISTER)));
+                         RequestPacket->InputBufferLength, sizeof(HGSMIHANDLERENABLE)));
                 RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER;
                 return FALSE;
@@ -1920 +1921 @@
             }
 
-            HGSMIHANDLERREGISTER *pInfo = (HGSMIHANDLERREGISTER *)RequestPacket->InputBuffer;
-
-            int rc = vboxHGSMIChannelDisplayRegister (pDevExt->pPrimary,
-                    pDevExt->iDevice, /* negative would mean this is a miniport handler */
-                    pInfo->u8Channel,
-                    pInfo->pfnHandler,
-                    pInfo->pvHandler);
+            HGSMIHANDLERENABLE *pInfo = (HGSMIHANDLERENABLE *)RequestPacket->InputBuffer;
+
+            int rc = vboxVBVAChannelDisplayEnable(pDevExt->pPrimary,
+                    pDevExt->iDevice,
+                    pInfo->u8Channel);
             if(RT_FAILURE(rc))
             {
@@ -1934 +1933 @@
             break;
         }
-        case IOCTL_VIDEO_HGSMI_HANDLER_DEREGISTER:
+        case IOCTL_VIDEO_HGSMI_HANDLER_DISABLE:
         {
             /* TODO: implement */

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

@@ -258 +258 @@
                                 uint32_t cbLength);
 
-DECLCALLBACK(void) hgsmiHostCmdHandlerComplete (HVBOXVIDEOHGSMI hHGSMI, void * pvMem);
-
-int vboxHGSMIChannelDisplayRegister (PDEVICE_EXTENSION PrimaryExtension,
+DECLCALLBACK(void) hgsmiHostCmdComplete (HVBOXVIDEOHGSMI hHGSMI, struct _VBVAHOSTCMD * pCmd);
+DECLCALLBACK(int) hgsmiHostCmdRequest (HVBOXVIDEOHGSMI hHGSMI, uint8_t u8Channel, struct _VBVAHOSTCMD ** ppCmd);
+
+
+int vboxVBVAChannelDisplayEnable(PDEVICE_EXTENSION PrimaryExtension,
         int iDisplay, /* negative would mean this is a miniport handler */
-        uint8_t u8Channel,
-        PFNHGSMICHANNELHANDLER pfnChannelHandler,
-        void *pvChannelHandler);
+        uint8_t u8Channel);
 #endif /* VBOX_WITH_HGSMI */
 } /* extern "C" */

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

@@ -53 +53 @@
     CTL_CODE(FILE_DEVICE_VIDEO, 0x431, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
-#define IOCTL_VIDEO_HGSMI_HANDLER_REGISTER \
+#define IOCTL_VIDEO_HGSMI_HANDLER_ENABLE \
     CTL_CODE(FILE_DEVICE_VIDEO, 0x432, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
-#define IOCTL_VIDEO_HGSMI_HANDLER_DEREGISTER \
+#define IOCTL_VIDEO_HGSMI_HANDLER_DISABLE \
     CTL_CODE(FILE_DEVICE_VIDEO, 0x433, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
@@ -129 +129 @@
     HVBOXVIDEOHGSMI hContext;
     PFNVBOXVIDEOHGSMICOMPLETION pfnCompletionHandler;
+    PFNVBOXVIDEOHGSMICOMMANDS   pfnRequestCommandsHandler;
 } HGSMIQUERYCALLBACKS;
 
 /**
- * Data returned by IOCTL_VIDEO_HGSMI_HANDLER_REGISTER.
+ * Data returned by IOCTL_VIDEO_HGSMI_HANDLER_ENABLE.
  *
  */
-typedef struct _HGSMIHANDLERREGISTER
+typedef struct _HGSMIHANDLERENABLE
 {
-    PFNHGSMICHANNELHANDLER pfnHandler;
-    void * pvHandler;
     uint8_t u8Channel;
-} HGSMIHANDLERREGISTER;
+} HGSMIHANDLERENABLE;
 
 /**
- * Data passed by IOCTL_VIDEO_HGSMI_HANDLER_DEREGISTER.
+ * Data passed by IOCTL_VIDEO_HGSMI_HANDLER_DISABLE.
  *
  */
-typedef struct _HGSMIHANDLERDEREGISTER
+typedef struct _HGSMIHANDLERDISABLE
 {
-    PFNHGSMICHANNELHANDLER pfnHandler;
     uint8_t u8Channel;
-} HGSMIHANDLERDEREGISTER;
+} HGSMIHANDLERDISABLE;
 
 #endif /* VBOX_WITH_HGSMI */