Changeset 93562 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2022 7:17:21 AM (3 years ago)

Author:

vboxsync

Message:

Build fix, somehow forgot to merge compilation fixes.

File:

• trunk/src/VBox/Devices/Network/DevDP8390.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Network/DevDP8390.cpp

@@ -1127 +1127 @@
     if (pThis->core.rcr.AM && ETHER_IS_MULTICAST(hdr->DstMac.au8))
     {
-        int             i;
+        unsigned        i;
         const uint8_t   *p = buf;
         unsigned        crc_frag, crc_rev;
@@ -3336 +3336 @@
  * @callback_method_impl{FNIOMIOPORTIN}
  */
-PDMBOTHCBDECL(int) neIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+neIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3378 +3379 @@
  * @callback_method_impl{FNIOMIOPORTIN}
  */
-PDMBOTHCBDECL(int) wdIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+wdIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3415 +3417 @@
  * @callback_method_impl{FNIOMIOPORTIN}
  */
-PDMBOTHCBDECL(int) elIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+elIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3452 +3455 @@
  * @callback_method_impl{FNIOMIOPORTIN}
  */
-PDMBOTHCBDECL(int) dp8390CoreIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+dp8390CoreIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3492 +3496 @@
  * @callback_method_impl{FNIOMIOPORTOUT}
  */
-PDMBOTHCBDECL(int) neIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+neIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3534 +3539 @@
  * @callback_method_impl{FNIOMIOPORTOUT}
  */
-PDMBOTHCBDECL(int) wdIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+wdIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3569 +3575 @@
  * @callback_method_impl{FNIOMIOPORTOUT}
  */
-PDMBOTHCBDECL(int) elIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+elIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3604 +3611 @@
  * @callback_method_impl{FNIOMIOPORTOUT}
  */
-PDMBOTHCBDECL(int) dp8390CoreIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+dp8390CoreIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
     PDPNICSTATE     pThis = PDMINS_2_DATA(pDevIns, PDPNICSTATE);
@@ -3837 +3845 @@
 
         /* Clip transfer size so it falls within local RAM. */
-        if ((uDmaAddr - 0x2000 + cbToXfer) > sizeof(pThis->abLocalRAM))
+        if ((uDmaAddr - 0x2000 + cbToXfer) > (int)sizeof(pThis->abLocalRAM))
         {
             /* Calculate how much to skip anything at the end. */
@@ -3986 +3994 @@
                     pDevIns->fR0Enabled ? "RZ" : "");
 
-    /* In case of deadlocks, this should help identify the cause. */
-    PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_INTERNAL_ERROR);
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_INTERNAL_ERROR); /* Take it here so we know why we're hanging... */
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
 
     pHlp->pfnPrintf(pHlp, "\nDP3890 NIC Core\n");
@@ -4790 +4798 @@
     AssertLogRelReturnVoid(iLUN == 0);
 
-    PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
 
     /*
@@ -4816 +4825 @@
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
 
-    PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
 
     /*