Changeset 81988 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 19, 2019 11:22:13 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134787

Message:

DevDMA: Use devhlp for critsect. Signed warn fix. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevDMA.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/PC/DevDMA.cpp

@@ -623 +623 @@
     DMAState    *pThis = PDMDEVINS_2_DATA(pDevIns, PDMASTATE);
     DMAControl  *dc;
-    int         ctlidx, chidx, mask;
+    int          chidx, mask;
     STAM_PROFILE_START(&pThis->StatRun, a);
-    PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
 
     /* Run all controllers and channels. */
-    for (ctlidx = 0; ctlidx < RT_ELEMENTS(pThis->DMAC); ++ctlidx)
+    for (unsigned ctlidx = 0; ctlidx < RT_ELEMENTS(pThis->DMAC); ++ctlidx)
     {
         dc = &pThis->DMAC[ctlidx];
@@ -644 +644 @@
     }
 
-    PDMCritSectLeave(pDevIns->pCritSectRoR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
     STAM_PROFILE_STOP(&pThis->StatRun, a);
     return 0;
@@ -660 +660 @@
     LogFlow(("dmaR3Register: pThis=%p uChannel=%u pfnTransferHandler=%p pvUser=%p\n", pThis, uChannel, pfnTransferHandler, pvUser));
 
-    PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
     ch->pfnXferHandler = pfnTransferHandler;
     ch->pvUser = pvUser;
-    PDMCritSectLeave(pDevIns->pCritSectRoR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
 }
 
@@ -714 +714 @@
     LogFlow(("dmaR3ReadMemory: pThis=%p uChannel=%u pvBuffer=%p off=%u cbBlock=%u\n", pThis, uChannel, pvBuffer, off, cbBlock));
 
-    PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
 
     /* Build the address for this transfer. */
@@ -732 +732 @@
         PDMDevHlpPhysRead(pThis->pDevIns, addr + off, pvBuffer, cbBlock);
 
-    PDMCritSectLeave(pDevIns->pCritSectRoR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
     return cbBlock;
 }
@@ -755 +755 @@
     }
 
-    PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
 
     /* Build the address for this transfer. */
@@ -777 +777 @@
         PDMDevHlpPhysWrite(pThis->pDevIns, addr + off, pvBuffer, cbBlock);
 
-    PDMCritSectLeave(pDevIns->pCritSectRoR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
     return cbBlock;
 }
@@ -792 +792 @@
     LogFlow(("dmaR3SetDREQ: pThis=%p uChannel=%u uLevel=%u\n", pThis, uChannel, uLevel));
 
-    PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
     chidx  = uChannel & 3;
     if (uLevel)
@@ -798 +798 @@
     else
         dc->u8Status &= ~(1 << (chidx + 4));
-    PDMCritSectLeave(pDevIns->pCritSectRoR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
 }
 
@@ -810 +810 @@
     LogFlow(("dmaR3GetChannelMode: pThis=%p uChannel=%u\n", pThis, uChannel));
 
-    PDMCritSectEnter(pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
     uint8_t u8Mode = pThis->DMAC[DMACH2C(uChannel)].ChState[uChannel & 3].u8Mode;
-    PDMCritSectLeave(pDevIns->pCritSectRoR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
     return u8Mode;
 }