Changeset 31741 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Aug 18, 2010 2:59:21 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: corrects capasity of CORB and RIRB.

File:

• trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (5 diffs)

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

@@ -160 +160 @@
 #define CORBSIZE_SZ_CAP(pState) (HDA_REG(pState, ICH6_HDA_REG_CORBSIZE) & ICH6_HDA_CORBSIZE_SZ_CAP)
 /* till ich 10 sizes of CORB and RIRB are harcoded to 256 in real hw */
-#define CORBSIZE(pState) (255)
 
 #define ICH6_HDA_REG_RIRLBASE  20 /* 0x50 */
@@ -196 +195 @@
 #define RIRBSIZE_SZ(pState)     (HDA_REG(pState, ICH6_HDA_REG_RIRBSIZE) & ICH6_HDA_RIRBSIZE_SZ)
 #define RIRBSIZE_SZ_CAP(pState) (HDA_REG(pState, ICH6_HDA_REG_RIRBSIZE) & ICH6_HDA_RIRBSIZE_SZ_CAP)
-#define RIRBSIZE(pState)        (255)
 
 
@@ -369 +367 @@
     /* size in bytes of CORB buf */
     uint32_t    cbCorbBuf;
-    /* size in double words of CORB buf */
-    uint8_t     cdwCorbBuf;
     /* pointer on RIRB buf */
     uint64_t    *pu64RirbBuf;
     /* size in bytes of RIRB buf */
     uint32_t    cbRirbBuf;
-    /* size in quad words of RIRB buf */
-    uint8_t     cdqRirbBuf;
     /* indicates if HDA in reset. */
     bool        fInReset;
@@ -1426 +1420 @@
     //** @todo r=michaln: There should be LogRel statements when the guest initializes
     // or resets the HDA chip, and possibly also when opening the PCM streams.
-    pThis->hda.cdwCorbBuf = CORBSIZE(&pThis->hda);
-    pThis->hda.cbCorbBuf = CORBSIZE(&pThis->hda) * sizeof(uint32_t);
+    pThis->hda.cbCorbBuf = 256 * sizeof(uint32_t);
 
     if (pThis->hda.pu32CorbBuf)
@@ -1434 +1427 @@
         pThis->hda.pu32CorbBuf = (uint32_t *)RTMemAllocZ(pThis->hda.cbCorbBuf);
 
-    pThis->hda.cdqRirbBuf = RIRBSIZE(&pThis->hda);
-    pThis->hda.cbRirbBuf = RIRBSIZE(&pThis->hda) * sizeof(uint64_t);
+    pThis->hda.cbRirbBuf = 256 * sizeof(uint64_t);
     if (pThis->hda.pu64RirbBuf)
         memset(pThis->hda.pu64RirbBuf, 0, pThis->hda.cbRirbBuf);