Changeset 54981 in vbox for trunk/src

Timestamp:

Mar 27, 2015 7:02:12 AM (10 years ago)

Author:

vboxsync

Message:

PDM/DevIchAc97.cpp: Fixes.

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -1049 +1049 @@
     uint32_t    addr           = pReg->bd.addr;
     uint32_t    cbWrittenTotal = 0;
-    uint32_t    cbToRead       = 0;
+    uint32_t    cbToRead;
 
     uint32_t cbToWrite = RT_MIN((uint32_t)(pReg->picb << 1), cbMax);
@@ -1079 +1079 @@
             int rc2 = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
                                                  pThis->pvReadWriteBuf, cbToRead, &cbWritten);
+            AssertRCBreak(rc);
             if (RT_FAILURE(rc2))
                 continue;
@@ -1285 +1286 @@
     PAC97DRIVER pDrv;
 
-    LogFlowFuncEnter();
-
     uint32_t cbIn, cbOut, cSamplesLive;
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
@@ -1304 +1303 @@
                                  pDrv->uLUN, cSamplesLive, cSamplesPlayed));
 
-                rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                                      &cbIn, &cbOut, &cSamplesLive);
-                if (RT_SUCCESS(rc))
-                    LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+                if (cSamplesPlayed)
+                {
+                    rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
+                                                          &cbIn, &cbOut, &cSamplesLive);
+                    if (RT_SUCCESS(rc))
+                        LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+                }
             }
 
@@ -1337 +1339 @@
     TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
 
-    LogFlowFuncLeave();
-
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
 }
@@ -1366 +1366 @@
     }
 
-    int rc;
+    int rc = VINF_SUCCESS;
     uint32_t cbWrittenTotal = 0;
 
@@ -1402 +1402 @@
         {
             case PO_INDEX:
+            {
+                rc = ichac97WriteAudio(pThis, pReg, cbElapsed, &cbTransferred);
+                if (   RT_SUCCESS(rc)
+                    && cbTransferred)
                 {
-                    rc = ichac97WriteAudio(pThis, pReg, cbElapsed, &cbTransferred);
-                    if (RT_SUCCESS(rc)
-                        && cbTransferred)
-                    {
-                        cbWrittenTotal += cbTransferred;
-                        Assert(cbElapsed >= cbTransferred);
-                        cbElapsed      -= cbTransferred;
-                        Assert((cbTransferred & 1) == 0);    /* Else the following shift won't work */
-                        pReg->picb     -= (cbTransferred >> 1);
-                    }
-                    break;
+                    cbWrittenTotal += cbTransferred;
+                    Assert(cbElapsed >= cbTransferred);
+                    cbElapsed      -= cbTransferred;
+                    Assert((cbTransferred & 1) == 0);    /* Else the following shift won't work */
+                    pReg->picb     -= (cbTransferred >> 1);
                 }
+                break;
+            }
 
             case PI_INDEX:
             case MC_INDEX:
+            {
+                rc = ichac97ReadAudio(pThis, pReg, cbElapsed, &cbTransferred);
+                if (   RT_SUCCESS(rc)
+                    && cbTransferred)
                 {
-                    rc = ichac97ReadAudio(pThis, pReg, cbElapsed, &cbTransferred);
-                    if (RT_SUCCESS(rc)
-                        && cbTransferred)
-                    {
-                        Assert(cbElapsed >= cbTransferred);
-                        cbElapsed  -= cbTransferred;
-                        Assert((cbTransferred & 1) == 0);    /* Else the following shift won't work */
-                        pReg->picb -= (cbTransferred >> 1);
-                    }
-                    break;
+                    Assert(cbElapsed >= cbTransferred);
+                    cbElapsed  -= cbTransferred;
+                    Assert((cbTransferred & 1) == 0);    /* Else the following shift won't work */
+                    pReg->picb -= (cbTransferred >> 1);
                 }
+                break;
+            }
 
             default:
@@ -2522 +2522 @@
          * Register statistics.
          */
-        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatTimer,            STAMTYPE_PROFILE, "/Devices/AC97/Timer",             STAMUNIT_TICKS_PER_CALL, "Profiling hdaTimer.");
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatTimer,            STAMTYPE_PROFILE, "/Devices/AC97/Timer",             STAMUNIT_TICKS_PER_CALL, "Profiling ichac97Timer.");
         PDMDevHlpSTAMRegister(pDevIns, &pThis->StatBytesRead,        STAMTYPE_COUNTER, "/Devices/AC97/BytesRead"   ,      STAMUNIT_BYTES,          "Bytes read from AC97 emulation.");
         PDMDevHlpSTAMRegister(pDevIns, &pThis->StatBytesWritten,     STAMTYPE_COUNTER, "/Devices/AC97/BytesWritten",      STAMUNIT_BYTES,          "Bytes written to AC97 emulation.");