Changeset 41058 in vbox for trunk/include

Timestamp:

Apr 25, 2012 9:42:29 PM (13 years ago)

Author:

vboxsync

Message:

crHgsmi cleanup & adjustments

Location:

trunk/include/VBox

Files:

• VBoxUhgsmi.h (modified) (6 diffs)
• VBoxVideo.h (modified) (1 diff)

trunk/include/VBox/VBoxUhgsmi.h

@@ -33 +33 @@
 
 typedef struct VBOXUHGSMI_BUFFER *PVBOXUHGSMI_BUFFER;
-typedef void* HVBOXUHGSMI_SYNCHOBJECT;
 
-typedef enum
+typedef struct VBOXUHGSMI_BUFFER_TYPE_FLAGS
 {
-    VBOXUHGSMI_SYNCHOBJECT_TYPE_NONE = 0,
-    VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT,
-    VBOXUHGSMI_SYNCHOBJECT_TYPE_SEMAPHORE
-} VBOXUHGSMI_SYNCHOBJECT_TYPE;
+    union
+    {
+        struct
+        {
+            uint32_t fCommand    : 1;
+            uint32_t Reserved    : 31;
+        };
+        uint32_t Value;
+    };
+} VBOXUHGSMI_BUFFER_TYPE_FLAGS;
 
 typedef struct VBOXUHGSMI_BUFFER_LOCK_FLAGS
@@ -67 +72 @@
             uint32_t bHostReadOnly          : 1;
             uint32_t bHostWriteOnly         : 1;
-            uint32_t bDoNotRetire           : 1; /**< the buffer will be uset in a subsequent command */
-            uint32_t bDoNotSignalCompletion : 1; /**< do not signal notification object on completion for this alloc */
+            uint32_t bDoNotRetire           : 1; /**< the buffer will be used in a subsequent command */
             uint32_t bEntireBuffer          : 1;
-            uint32_t Reserved               : 27;
+            uint32_t Reserved               : 28;
         };
         uint32_t Value;
@@ -78 +82 @@
 /* the caller can specify NULL as a hSynch and specify a valid enmSynchType to make UHGSMI create a proper object itself,
  *  */
-typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_CREATE(PVBOXUHGSMI pHgsmi, uint32_t cbBuf,
-        VBOXUHGSMI_SYNCHOBJECT_TYPE enmSynchType, HVBOXUHGSMI_SYNCHOBJECT hSynch,
-        PVBOXUHGSMI_BUFFER* ppBuf);
+typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_CREATE(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fType, PVBOXUHGSMI_BUFFER* ppBuf);
 typedef FNVBOXUHGSMI_BUFFER_CREATE *PFNVBOXUHGSMI_BUFFER_CREATE;
 
@@ -91 +93 @@
 } VBOXUHGSMI_BUFFER_SUBMIT, *PVBOXUHGSMI_BUFFER_SUBMIT;
 
-typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_SUBMIT_ASYNCH(PVBOXUHGSMI pHgsmi, PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers);
-typedef FNVBOXUHGSMI_BUFFER_SUBMIT_ASYNCH *PFNVBOXUHGSMI_BUFFER_SUBMIT_ASYNCH;
+typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_SUBMIT(PVBOXUHGSMI pHgsmi, PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers);
+typedef FNVBOXUHGSMI_BUFFER_SUBMIT *PFNVBOXUHGSMI_BUFFER_SUBMIT;
 
 typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_DESTROY(PVBOXUHGSMI_BUFFER pBuf);
@@ -106 +108 @@
 {
     PFNVBOXUHGSMI_BUFFER_CREATE pfnBufferCreate;
-    PFNVBOXUHGSMI_BUFFER_SUBMIT_ASYNCH pfnBufferSubmitAsynch;
+    PFNVBOXUHGSMI_BUFFER_SUBMIT pfnBufferSubmit;
     /** User custom data. */
     void *pvUserData;
@@ -119 +121 @@
     /* r/o data added for ease of access and simplicity
      * modifying it leads to unpredictable behavior */
-    HVBOXUHGSMI_SYNCHOBJECT hSynch;
-    VBOXUHGSMI_SYNCHOBJECT_TYPE enmSynchType;
+    VBOXUHGSMI_BUFFER_TYPE_FLAGS fType;
     uint32_t cbBuffer;
-    bool bSynchCreated;
     /** User custom data. */
     void *pvUserData;
 } VBOXUHGSMI_BUFFER;
 
+#define VBoxUhgsmiBufferCreate(_pUhgsmi, _cbBuf, _fType, _ppBuf) ((_pUhgsmi)->pfnBufferCreate(_pUhgsmi, _cbBuf, _fType, _ppBuf))
+#define VBoxUhgsmiBufferSubmit(_pUhgsmi, _aBuffers, _cBuffers) ((_pUhgsmi)->pfnBufferSubmit(_pUhgsmi, _aBuffers, _cBuffers))
+
+#define VBoxUhgsmiBufferLock(_pBuf, _offLock, _cbLock, _fFlags, _pvLock) ((_pBuf)->pfnLock(_pBuf, _offLock, _cbLock, _fFlags, _pvLock))
+#define VBoxUhgsmiBufferUnlock(_pBuf) ((_pBuf)->pfnUnlock(_pBuf))
+#define VBoxUhgsmiBufferDestroy(_pBuf) ((_pBuf)->pfnDestroy(_pBuf))
+
 #endif
 

trunk/include/VBox/VBoxVideo.h

@@ -1374 +1374 @@
     VBOXVIDEOOFFSET offBuffer;
     uint32_t cbBuffer;
-    uint32_t u32GuesData;
-    uint64_t u64GuesData;
+    uint32_t u32GuestData;
+    uint64_t u64GuestData;
 } VBOXVDMACMD_CHROMIUM_BUFFER, *PVBOXVDMACMD_CHROMIUM_BUFFER;