Changeset 81879 in vbox

Timestamp:

Nov 15, 2019 3:38:29 PM (5 years ago)

Author:

vboxsync

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

134674

Message:

DevAHCI: Use the new handle based timer interface for the CCC timer. bugref:9218

File:

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

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

@@ -511 +511 @@
 #endif
 
-    /** Countdown timer for command completion coalescing - R3 ptr */
-    PTMTIMERR3                      pHbaCccTimerR3;
-    /** Countdown timer for command completion coalescing - R0 ptr */
-    PTMTIMERR0                      pHbaCccTimerR0;
-    /** Countdown timer for command completion coalescing - RC ptr */
-    PTMTIMERRC                      pHbaCccTimerRC;
-
-#if HC_ARCH_BITS == 64
-    uint32_t                        Alignment4;
-#endif
+    /** Countdown timer for command completion coalescing. */
+    TMTIMERHANDLE                   hHbaCccTimer;
 
     /** Which port number is used to mark an CCC interrupt */
@@ -903 +895 @@
             {
                 /* Reset command completion coalescing state. */
-                TMTimerSetMillies(pAhci->CTX_SUFF(pHbaCccTimer), pAhci->uCccTimeout);
+                PDMDevHlpTimerSetMillies(pAhci->CTX_SUFF(pDevIns), pAhci->hHbaCccTimer, pAhci->uCccTimeout);
                 pAhci->uCccCurrentNr = 0;
 
@@ -936 +928 @@
 #ifdef IN_RING3
 
-/*
- * Assert irq when an CCC timeout occurs
+/**
+ * @callback_method_impl{FNTMTIMERDEV, Assert irq when an CCC timeout occurs.}
  */
 static DECLCALLBACK(void) ahciCccTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
@@ -985 +977 @@
     }
 
-    pAhciPort->regSSTS = (0x01 << 8)  | /* Interface is active. */
-                         (0x03 << 0);   /* Device detected and communication established. */
+    pAhciPort->regSSTS = (0x01 << 8)    /* Interface is active. */
+                       | (0x03 << 0);   /* Device detected and communication established. */
 
     /*
@@ -1792 +1784 @@
 
     if (u32Value & AHCI_HBA_CCC_CTL_EN)
-        TMTimerSetMillies(pAhci->CTX_SUFF(pHbaCccTimer), pAhci->uCccTimeout); /* Arm the timer */
+        PDMDevHlpTimerSetMillies(pAhci->CTX_SUFF(pDevIns), pAhci->hHbaCccTimer, pAhci->uCccTimeout); /* Arm the timer */
     else
-        TMTimerStop(pAhci->CTX_SUFF(pHbaCccTimer));
+        PDMDevHlpTimerStop(pAhci->CTX_SUFF(pDevIns), pAhci->hHbaCccTimer);
 
     return VINF_SUCCESS;
@@ -2032 +2024 @@
     if (pThis->regHbaCccCtl & AHCI_HBA_CCC_CTL_EN)
     {
-        rc = TMTimerStop(pThis->CTX_SUFF(pHbaCccTimer));
+        rc = PDMDevHlpTimerStop(pThis->CTX_SUFF(pDevIns), pThis->hHbaCccTimer);
         if (RT_FAILURE(rc))
             AssertMsgFailed(("%s: Failed to stop timer!\n", __FUNCTION__));
@@ -5229 +5221 @@
 
     pAhci->pDevInsRC += offDelta;
-    pAhci->pHbaCccTimerRC = TMTimerRCPtr(pAhci->pHbaCccTimerR3);
 
     /* Relocate every port. */
@@ -5773 +5764 @@
     if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->lock))
     {
-        TMR3TimerDestroy(pThis->CTX_SUFF(pHbaCccTimer));
-        pThis->CTX_SUFF(pHbaCccTimer) = NULL;
+        PDMDevHlpTimerDestroy(pDevIns, pThis->hHbaCccTimer);
+        pThis->hHbaCccTimer = NIL_TMTIMERHANDLE;
 
         Log(("%s: Destruct every port\n", __FUNCTION__));
@@ -5994 +5985 @@
 
     /* Create the timer for command completion coalescing feature. */
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, ahciCccTimer, pThis,
-                                TMTIMER_FLAGS_NO_CRIT_SECT, "AHCI CCC Timer", &pThis->pHbaCccTimerR3);
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("pfnTMTimerCreate -> %Rrc\n", rc));
-        return rc;
-    }
-    pThis->pHbaCccTimerR0 = TMTimerR0Ptr(pThis->pHbaCccTimerR3);
-    pThis->pHbaCccTimerRC = TMTimerRCPtr(pThis->pHbaCccTimerR3);
+    rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL, ahciCccTimer, pThis,
+                              TMTIMER_FLAGS_NO_CRIT_SECT, "AHCI CCC Timer", &pThis->hHbaCccTimer);
+    AssertRCReturn(rc, rc);
 
     /* Status LUN. */