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

Timestamp:

Jun 6, 2014 11:32:36 AM (10 years ago)

Author:

vboxsync

Message:

Storage/AHCI: Get rid of ASMAtomic*Size and replace with the *U32 variants to get rid of some compiler warnings

File:

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

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

@@ -276 +276 @@
     AHCITXSTATE_32BIT_HACK = 0x7fffffff
 } AHCITXSTATE, *PAHCITXSTATE;
+AssertCompileSize(AHCITXSTATE, sizeof(uint32_t));
 
 /** Task encountered a buffer overflow. */
@@ -5659 +5660 @@
         if (VALID_PTR(pAhciReq))
         {
-            bool fXchg = false;
-            ASMAtomicCmpXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_CANCELED, AHCITXSTATE_ACTIVE, fXchg);
+            bool fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pAhciReq->enmTxState, AHCITXSTATE_CANCELED, AHCITXSTATE_ACTIVE);
 
             if (fXchg)
@@ -5909 +5909 @@
                  pAhciPort, pAhciReq, rcReq, fFreeReq));
 
-    ASMAtomicReadSize(&pAhciReq->enmTxState, &enmTxState);
+    enmTxState = (AHCITXSTATE)ASMAtomicReadU32((volatile uint32_t *)&pAhciReq->enmTxState);
     VBOXDD_AHCI_REQ_COMPLETED(pAhciReq, rcReq, enmTxState, pAhciReq->uOffset, pAhciReq->cbTransfer);
     VBOXDD_AHCI_REQ_COMPLETED_TIMESTAMP(pAhciReq, tsNow);
@@ -5943 +5943 @@
     }
 
-    ASMAtomicCmpXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_FREE, AHCITXSTATE_ACTIVE, fXchg);
+    fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pAhciReq->enmTxState, AHCITXSTATE_FREE, AHCITXSTATE_ACTIVE);
 
     if (   fXchg
@@ -6066 +6066 @@
 
         fCanceled = true;
-        ASMAtomicXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_FREE);
+        ASMAtomicXchgU32((volatile uint32_t *)&pAhciReq->enmTxState, AHCITXSTATE_FREE);
 
         if (pAhciReq->enmTxDir == AHCITXDIR_TRIM)
@@ -6609 +6609 @@
                 pAhciReq = pAhciPort->aCachedTasks[idx];
 
-            bool fXchg;
-            ASMAtomicCmpXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_ACTIVE, AHCITXSTATE_FREE, fXchg);
+            bool fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pAhciReq->enmTxState, AHCITXSTATE_ACTIVE, AHCITXSTATE_FREE);
             AssertMsg(fXchg, ("Task is already active\n"));
 
@@ -6633 +6632 @@
                  * the guest messed up everything and this behavior is undefined.
                  */
-                ASMAtomicCmpXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_FREE, AHCITXSTATE_ACTIVE, fXchg);
+                fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pAhciReq->enmTxState, AHCITXSTATE_FREE, AHCITXSTATE_ACTIVE);
                 Assert(fXchg);
                 u32Tasks &= ~RT_BIT_32(idx); /* Clear task bit. */
@@ -6661 +6660 @@
                     AssertMsgFailed(("%s: Update the control register\n", __FUNCTION__));
 
-                ASMAtomicCmpXchgSize(&pAhciReq->enmTxState, AHCITXSTATE_FREE, AHCITXSTATE_ACTIVE, fXchg);
+                fXchg = ASMAtomicCmpXchgU32((volatile uint32_t *)&pAhciReq->enmTxState, AHCITXSTATE_FREE, AHCITXSTATE_ACTIVE);
                 AssertMsg(fXchg, ("Task is not active\n"));
                 break;