Changeset 81803 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 12, 2019 2:34:35 PM (5 years ago)

Author:

vboxsync

Message:

DevBusLogic.cpp: Converting it to the new PDM device style... bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -479 +479 @@
     volatile bool                   fBiosReqPending;
 
-    /** The support driver session handle. */
-    R3R0PTRTYPE(PSUPDRVSESSION)     pSupDrvSession;
     /** Worker thread. */
     R3PTRTYPE(PPDMTHREAD)           pThreadWrk;
@@ -3450 +3448 @@
     PBUSLOGIC pThis = PDMDEVINS_2_DATA(pDevIns, PBUSLOGIC);
 
-    int rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+    int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->hEvtProcess);
     AssertRC(rc);
 
@@ -3783 +3781 @@
         {
             Assert(ASMAtomicReadBool(&pThis->fWrkThreadSleeping));
-            rc = SUPSemEventWaitNoResume(pThis->pSupDrvSession, pThis->hEvtProcess, RT_INDEFINITE_WAIT);
+            rc = PDMDevHlpSUPSemEventWaitNoResume(pDevIns, pThis->hEvtProcess, RT_INDEFINITE_WAIT);
             AssertLogRelMsgReturn(RT_SUCCESS(rc) || rc == VERR_INTERRUPTED, ("%Rrc\n", rc), rc);
             if (RT_UNLIKELY(pThread->enmState != PDMTHREADSTATE_RUNNING))
@@ -3828 +3826 @@
     RT_NOREF(pThread);
     PBUSLOGIC pThis = PDMDEVINS_2_DATA(pDevIns, PBUSLOGIC);
-    return SUPSemEventSignal(pThis->pSupDrvSession, pThis->hEvtProcess);
+    return PDMDevHlpSUPSemEventSignal(pDevIns, pThis->hEvtProcess);
 }
 
@@ -4201 +4199 @@
     if (pThis->hEvtProcess != NIL_SUPSEMEVENT)
     {
-        SUPSemEventClose(pThis->pSupDrvSession, pThis->hEvtProcess);
+        PDMDevHlpSUPSemEventClose(pDevIns, pThis->hEvtProcess);
         pThis->hEvtProcess = NIL_SUPSEMEVENT;
     }
@@ -4216 +4214 @@
     PBUSLOGIC       pThis = PDMDEVINS_2_DATA(pDevIns, PBUSLOGIC);
     PCPDMDEVHLPR3   pHlp = pDevIns->pHlpR3;
-    int             rc = VINF_SUCCESS;
-    char            szCfgStr[16];
 
     /*
@@ -4254 +4250 @@
 
     bool fBootable = true;
-    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Bootable", &fBootable, true);
+    int rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Bootable", &fBootable, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("BusLogic configuration error: failed to read Bootable as boolean"));
@@ -4260 +4256 @@
 
     /* Figure out the emulated device type. */
+    char szCfgStr[16];
     rc = pHlp->pfnCFGMQueryStringDef(pCfg, "AdapterType", szCfgStr, sizeof(szCfgStr), "BT-958D");
     if (RT_FAILURE(rc))
@@ -4354 +4351 @@
      * Create event semaphore and worker thread.
      */
-    rc = SUPSemEventCreate(pThis->pSupDrvSession, &pThis->hEvtProcess);
+    rc = PDMDevHlpSUPSemEventCreate(pDevIns, &pThis->hEvtProcess);
     if (RT_FAILURE(rc))
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,