Changeset 35959 in vbox

Timestamp:

Feb 14, 2011 2:30:03 PM (14 years ago)

Author:

vboxsync

Message:

PCI: further R0/driver work

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (6 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (2 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/rawpci.h

@@ -48 +48 @@
 {
     /* in */
-    RTHCPHYS             StartAddress;
+    RTGCPHYS             StartAddress;
     uint64_t             iRegionSize;
     uint32_t             fFlags;
@@ -130 +130 @@
 } PCIRAWREQPCICFGREAD;
 
+
+/**
+ * Handle for the raw PCI device.
+ */
+typedef RTR0PTR PCIRAWDEVHANDLE;
+
 /**
  * Request buffer use for communication with the driver.
@@ -144 +150 @@
     int32_t         iRequest;
     /** Host device request targetted to. */
-    uint32_t        TargetDevice;
+    PCIRAWDEVHANDLE TargetDevice;
     /** Call parameters. */
     union
@@ -160 +166 @@
 } PCIRAWSENDREQ;
 typedef PCIRAWSENDREQ *PPCIRAWSENDREQ;
-
 
 /**
@@ -222 +227 @@
      */
     DECLR0CALLBACKMEMBER(void, pfnRelease,(PRAWPCIDEVPORT pPort));
+
+    /**
+     * Init device.
+     *
+     * @param   pPort     Pointer to this structure.
+     * @param   fFlags    Initialization flags.
+     */
+    DECLR0CALLBACKMEMBER(int,  pfnInit,(PRAWPCIDEVPORT pPort, 
+                                        uint32_t       fFlags));
     
+    
+
     /** Structure version number. (RAWPCIDEVPORT_VERSION) */
     uint32_t u32VersionEnd;
@@ -267 +283 @@
 } RAWPCIFACTORY;
 
-
 #define RAWPCIFACTORY_UUID_STR "c0268f49-e1e4-402b-b7e0-eb8d09659a9b"
 

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -85 +85 @@
 }
 
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnRelease
+ */
+DECLHIDDEN(int) vboxPciDevInit(PRAWPCIDEVPORT pThis, uint32_t fFlags)
+{
+    return VINF_SUCCESS;
+}
+
 
 /**
@@ -113 +121 @@
     pNew->DevPort.pfnRetain             = vboxPciDevRetain;
     pNew->DevPort.pfnRelease            = vboxPciDevRelease;
+    pNew->DevPort.pfnInit               = vboxPciDevInit;
     pNew->DevPort.u32VersionEnd         = RAWPCIDEVPORT_VERSION;
     
     rc = RTSpinlockCreate(&pNew->hSpinlock);
-    if (RT_SUCCESS(rc))
-    {
-        *ppDevPort = &pNew->DevPort;
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = pNew->DevPort.pfnInit(&pNew->DevPort, fFlags);
+        if (RT_SUCCESS(rc))
+        {
+            *ppDevPort = &pNew->DevPort;
+        }
+        else
+        {
+            RTSpinlockDestroy(pNew->hSpinlock);
+            RTMemFree(pNew);
+        }
         return rc;
     }

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -1179 +1179 @@
             if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PPCIRAWSENDREQ)pReqHdr)->pSession, pSession) || idCpu != NIL_VMCPUID)
                 return VERR_INVALID_PARAMETER;
-            return PciRawR0ProcessReq(pSession, (PPCIRAWSENDREQ)pReqHdr);
+            return PciRawR0ProcessReq(pSession, pVM, (PPCIRAWSENDREQ)pReqHdr);
 #endif
         /*
@@ -1553 +1553 @@
     RTAssertMsg2V(pszFormat, va);
 }
-