Changeset 89707 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 15, 2021 2:24:03 PM (4 years ago)

Author:

vboxsync

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

145155

Message:

DevIchAc97: Added a input/output stream indicator to ichac97R3StreamTransfer to avoid needing to consider corrupt stream number/whatever and return errors. bugref:9890

File:

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

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

@@ -688 +688 @@
 static uint32_t           ichac97R3StreamGetFree(PAC97STREAMR3 pStreamCC);
 static int                ichac97R3StreamTransfer(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream,
-                                                  PAC97STREAMR3 pStreamCC, uint32_t cbToProcessMax, bool fWriteSilence);
+                                                  PAC97STREAMR3 pStreamCC, uint32_t cbToProcessMax,
+                                                  bool fWriteSilence, bool fInput);
 static DECLCALLBACK(void) ichac97R3StreamUpdateAsyncIoJob(PPDMDEVINS pDevIns, PAUDMIXSINK pSink, void *pvUser);
 
@@ -1398 +1399 @@
                   cbPeriod, PDMAudioPropsBytesToMilli(&pStreamCC->State.Cfg.Props, cbPeriod)));
 
-        rc2 = ichac97R3StreamTransfer(pDevIns, pThis, pStream, pStreamCC, RT_MIN(cbStreamFree, cbPeriod), false /*fWriteSilence*/);
+        rc2 = ichac97R3StreamTransfer(pDevIns, pThis, pStream, pStreamCC, RT_MIN(cbStreamFree, cbPeriod),
+                                      false /*fWriteSilence*/, false /*fInput*/);
         AssertRC(rc2);
 
@@ -1513 +1515 @@
         if (cbStreamUsed)
         {
-            rc2 = ichac97R3StreamTransfer(pDevIns, pThis, pStream, pStreamCC, RT_MIN(cbPeriod, cbStreamUsed), fWriteSilence);
+            rc2 = ichac97R3StreamTransfer(pDevIns, pThis, pStream, pStreamCC, RT_MIN(cbPeriod, cbStreamUsed),
+                                          fWriteSilence, true /*fInput*/);
             AssertRC(rc2);
 
@@ -2746 +2749 @@
  *                              stream (done while waiting for backend to get
  *                              going).
+ * @param   fInput              Set if input, clear if output.
  */
 static int ichac97R3StreamTransfer(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream,
-                                   PAC97STREAMR3 pStreamCC, uint32_t cbToProcessMax, bool fWriteSilence)
+                                   PAC97STREAMR3 pStreamCC, uint32_t cbToProcessMax, bool fWriteSilence, bool fInput)
 {
     if (!cbToProcessMax)
@@ -2825 +2829 @@
         uint32_t cbChunk = cbLeft;
 
-        switch (pStream->u8SD)
+        /*
+         * Output.
+         */
+        if (!fInput)
         {
-            case AC97SOUNDSOURCE_PO_INDEX: /* Output */
+            void  *pvDst = NULL;
+            size_t cbDst = NULL;
+            RTCircBufAcquireWriteBlock(pCircBuf, cbChunk, &pvDst, &cbDst);
+
+            if (cbDst)
             {
-                void  *pvDst = NULL;
-                size_t cbDst = NULL;
-                RTCircBufAcquireWriteBlock(pCircBuf, cbChunk, &pvDst, &cbDst);
-
-                if (cbDst)
+                int rc2 = PDMDevHlpPCIPhysRead(pDevIns, pRegs->bd.addr, pvDst, cbDst);
+                AssertRC(rc2);
+
+                if (RT_LIKELY(!pStreamCC->Dbg.Runtime.fEnabled))
+                { /* likely */ }
+                else
+                    AudioHlpFileWrite(pStreamCC->Dbg.Runtime.pFileDMA, pvDst, cbDst, 0 /* fFlags */);
+            }
+
+            RTCircBufReleaseWriteBlock(pCircBuf, cbDst);
+
+            cbChunk = (uint32_t)cbDst; /* Update the current chunk size to what really has been written. */
+        }
+        /*
+         * Input.
+         */
+        else
+        {
+            if (!fWriteSilence)
+            {
+                void  *pvSrc = NULL;
+                size_t cbSrc = NULL;
+                RTCircBufAcquireReadBlock(pCircBuf, cbChunk, &pvSrc, &cbSrc);
+
+                if (cbSrc)
                 {
-                    int rc2 = PDMDevHlpPCIPhysRead(pDevIns, pRegs->bd.addr, pvDst, cbDst);
+                    int rc2 = PDMDevHlpPCIPhysWrite(pDevIns, pRegs->bd.addr, pvSrc, cbSrc);
                     AssertRC(rc2);
 
@@ -2841 +2872 @@
                     { /* likely */ }
                     else
-                        AudioHlpFileWrite(pStreamCC->Dbg.Runtime.pFileDMA, pvDst, cbDst, 0 /* fFlags */);
+                        AudioHlpFileWrite(pStreamCC->Dbg.Runtime.pFileDMA, pvSrc, cbSrc, 0 /* fFlags */);
                 }
 
-                RTCircBufReleaseWriteBlock(pCircBuf, cbDst);
-
-                cbChunk = (uint32_t)cbDst; /* Update the current chunk size to what really has been written. */
-                break;
+                RTCircBufReleaseReadBlock(pCircBuf, cbSrc);
+
+                cbChunk = (uint32_t)cbSrc; /* Update the current chunk size to what really has been read. */
             }
-
-            case AC97SOUNDSOURCE_PI_INDEX: /* Input */
-            case AC97SOUNDSOURCE_MC_INDEX: /* Input */
-                if (!fWriteSilence)
-                {
-                    void  *pvSrc = NULL;
-                    size_t cbSrc = NULL;
-                    RTCircBufAcquireReadBlock(pCircBuf, cbChunk, &pvSrc, &cbSrc);
-
-                    if (cbSrc)
-                    {
-                        int rc2 = PDMDevHlpPCIPhysWrite(pDevIns, pRegs->bd.addr, pvSrc, cbSrc);
-                        AssertRC(rc2);
-
-                        if (RT_LIKELY(!pStreamCC->Dbg.Runtime.fEnabled))
-                        { /* likely */ }
-                        else
-                            AudioHlpFileWrite(pStreamCC->Dbg.Runtime.pFileDMA, pvSrc, cbSrc, 0 /* fFlags */);
-                    }
-
-                    RTCircBufReleaseReadBlock(pCircBuf, cbSrc);
-
-                    cbChunk = (uint32_t)cbSrc; /* Update the current chunk size to what really has been read. */
-                }
-                else
-                {
-                    /* Since the format is signed 16-bit or 32-bit integer samples, we can
-                       use g_abRTZero64K as source and avoid some unnecessary bzero() work. */
-                    cbChunk = RT_MIN(cbChunk, sizeof(g_abRTZero64K));
-                    cbChunk = PDMAudioPropsFloorBytesToFrame(&pStreamCC->State.Cfg.Props, cbChunk);
-
-                    int rc2 = PDMDevHlpPCIPhysWrite(pDevIns, pRegs->bd.addr, g_abRTZero64K, cbChunk);
-                    AssertRC(rc2);
-                }
-                break;
-
-            default:
-                AssertMsgFailed(("Stream #%RU8 not supported\n", pStream->u8SD));
-                rc = VERR_NOT_SUPPORTED;
-                break;
+            else
+            {
+                /* Since the format is signed 16-bit or 32-bit integer samples, we can
+                   use g_abRTZero64K as source and avoid some unnecessary bzero() work. */
+                cbChunk = RT_MIN(cbChunk, sizeof(g_abRTZero64K));
+                cbChunk = PDMAudioPropsFloorBytesToFrame(&pStreamCC->State.Cfg.Props, cbChunk);
+
+                int rc2 = PDMDevHlpPCIPhysWrite(pDevIns, pRegs->bd.addr, g_abRTZero64K, cbChunk);
+                AssertRC(rc2);
+            }
         }
-
-        if (RT_FAILURE(rc))
-            break;
 
         if (cbChunk)
@@ -2934 +2931 @@
         }
 
-        if (/* All data processed? */
-               rc == VINF_EOF
-            /* ... or an error occurred? */
-            || RT_FAILURE(rc))
-        {
+        /* All data processed? */
+        if (rc == VINF_EOF)
             break;
-        }
     }