Changeset 44854 in vbox

Timestamp:

Feb 27, 2013 8:37:49 PM (12 years ago)

Author:

vboxsync

Message:

VQUEUE: WRONG (mixed) callback calling convensions again, this time the other way around.

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio.cpp (modified) (1 diff)
• Virtio.h (modified) (2 diffs)

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -926 +926 @@
 }
 
-PVQUEUE vpciAddQueue(VPCISTATE* pState, unsigned uSize,
-                     void (*pfnCallback)(void *pvState, PVQUEUE pQueue),
-                     const char *pcszName)
+PVQUEUE vpciAddQueue(VPCISTATE* pState, unsigned uSize, PFNVPCIQUEUECALLBACK pfnCallback, const char *pcszName)
 {
     PVQUEUE pQueue = NULL;

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -109 +109 @@
 typedef VRING *PVRING;
 
+/**
+ * Queue callback (consumer?).
+ *
+ * @param   pvState         Pointer to the VirtIO PCI core state, VPCISTATE.
+ * @param   pQueue          Pointer to the queue structure.
+ */
+typedef DECLCALLBACK(void) FNVPCIQUEUECALLBACK(void *pvState, struct VQueue *pQueue);
+/** Pointer to a VQUEUE callback function. */
+typedef FNVPCIQUEUECALLBACK *PFNVPCIQUEUECALLBACK;
+
 typedef struct VQueue
 {
@@ -115 +125 @@
     uint16_t uNextUsedIndex;
     uint32_t uPageNumber;
-#ifdef IN_RING3
-    void   (*pfnCallback)(void *pvState, struct VQueue *pQueue);
-#else
-    RTR3UINTPTR pfnCallback;
-#endif
-    R3PTRTYPE(const char *) pcszName;
+    R3PTRTYPE(PFNVPCIQUEUECALLBACK) pfnCallback;
+    R3PTRTYPE(const char *)         pcszName;
 } VQUEUE;
 typedef VQUEUE *PVQUEUE;