Changeset 37185 in vbox for trunk/src/VBox

Timestamp:

May 23, 2011 3:06:44 PM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: fix of (xTracker/5704) for trunk.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevCodec.cpp (modified) (24 diffs)
• DevIchIntelHDA.cpp (modified) (2 diffs)

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

@@ -35 +35 @@
 {
     uint8_t id; /* 7 - bit format */
-    const char    *name;
     /* RPM 5.3.6 */
     uint32_t au32F00_param[CODECNODE_F0_PARAM_LENGTH];
@@ -274 +273 @@
         /* Root Node*/
         case 0:
-            pNode->root.node.name = "Root";
             pNode->node.au32F00_param[2] = CODEC_MAKE_F00_02(0x1, 0x0, 0x34, 0x1); /* rev id */
             break;
         case 1:
-            pNode->afg.node.name = "AFG";
             pNode->node.au32F00_param[8] = CODEC_MAKE_F00_08(1, 0xd, 0xd);
             pNode->node.au32F00_param[0xC] =   CODEC_MAKE_F00_0C(0x17)
@@ -296 +293 @@
             break;
         case 2:
-            pNode->dac.node.name = "DAC0";
-            goto dac_init;
         case 3:
-            pNode->dac.node.name = "DAC1";
-            goto dac_init;
         case 4:
-            pNode->dac.node.name = "DAC2";
-            goto dac_init;
         case 5:
-            pNode->dac.node.name = "DAC3";
-        dac_init:
             memset(pNode->dac.B_params, 0, AMPLIFIER_SIZE);
             pNode->dac.u32A_param = CODEC_MAKE_A(0, 1, CODEC_A_MULT_1X, CODEC_A_DIV_1X, CODEC_A_16_BIT, 1);//RT_BIT(14)|(0x1 << 4)|0x1; /* 441000Hz/16bit/2ch */
@@ -322 +311 @@
         break;
         case 6:
-            pNode->adc.node.name = "ADC0";
             pNode->node.au32F02_param[0] = 0x17;
             goto adc_init;
         case 7:
-            pNode->adc.node.name = "ADC1";
             pNode->node.au32F02_param[0] = 0x18;
         adc_init:
@@ -341 +328 @@
             break;
         case 8:
-            pNode->spdifout.node.name = "SPDIFOut";
             pNode->spdifout.u32A_param = CODEC_MAKE_A(0, 1, CODEC_A_MULT_1X, CODEC_A_DIV_1X, CODEC_A_16_BIT, 1);//(1<<14)|(0x1<<4) | 0x1;
             pNode->spdifout.node.au32F00_param[9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_AUDIO_OUTPUT, 0x4, 0)
@@ -353 +339 @@
         break;
         case 9:
-            pNode->node.name = "Reserved_0";
             pNode->spdifin.u32A_param = CODEC_MAKE_A(0, 1, CODEC_A_MULT_1X, CODEC_A_DIV_1X, CODEC_A_16_BIT, 1);//(0x1<<4) | 0x1;
             pNode->spdifin.node.au32F00_param[9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_AUDIO_INPUT, 0x4, 0)
@@ -368 +353 @@
         break;
         case 0xA:
-            pNode->node.name = "PortA";
             pNode->node.au32F00_param[0xC] =   CODEC_MAKE_F00_0C(0x17)
                                              | CODEC_F00_0C_CAP_INPUT
@@ -390 +374 @@
             goto port_init;
         case 0xB:
-            pNode->node.name = "PortB";
             pNode->node.au32F00_param[0xC] =   CODEC_MAKE_F00_0C(0x17)
                                              | CODEC_F00_0C_CAP_INPUT
@@ -409 +392 @@
             goto port_init;
         case 0xC:
-            pNode->node.name = "PortC";
             pNode->node.au32F02_param[0] = 0x3;
             pNode->node.au32F00_param[0xC] =   CODEC_MAKE_F00_0C(0x17)
@@ -427 +409 @@
             goto port_init;
         case 0xD:
-            pNode->node.name = "PortD";
             pNode->node.au32F00_param[0xC] =   CODEC_MAKE_F00_0C(0x17)
                                              | CODEC_F00_0C_CAP_INPUT
@@ -453 +434 @@
         break;
         case 0xE:
-            pNode->node.name = "PortE";
             pNode->node.au32F00_param[9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_PIN_COMPLEX, 0x0, 0)
                                            | CODEC_F00_09_CAP_UNSOL
@@ -472 +452 @@
             break;
         case 0xF:
-            pNode->node.name = "PortF";
             pNode->node.au32F00_param[9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_PIN_COMPLEX, 0x0, 0x0)
                                            | CODEC_F00_09_CAP_CONNECTION_LIST
@@ -498 +477 @@
         break;
         case 0x10:
-            pNode->node.name = "DigOut_0";
             pNode->node.au32F00_param[9] = CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_PIN_COMPLEX, 0x0, 0x0)
                                            | CODEC_F00_09_CAP_DIGITAL
@@ -515 +493 @@
         break;
         case 0x11:
-            pNode->node.name = "DigIn_0";
             pNode->node.au32F00_param[9] = (4 << 20)|(3<<16)|RT_BIT(10)|RT_BIT(9)|RT_BIT(7)|RT_BIT(0);
             pNode->node.au32F00_param[0xC] =   CODEC_F00_0C_CAP_EAPD
@@ -534 +511 @@
         break;
         case 0x12:
-            pNode->node.name = "ADCMux_0";
             pNode->adcmux.u32F01_param = 0;
             goto adcmux_init;
         case 0x13:
-            pNode->node.name = "ADCMux_1";
             pNode->adcmux.u32F01_param = 1;
             adcmux_init:
@@ -554 +529 @@
         break;
         case 0x14:
-            pNode->node.name = "PCBEEP";
             pNode->node.au32F00_param[9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_BEEP_GEN, 0, 0)
                                            | CODEC_F00_09_CAP_AMP_FMT_OVERRIDE
@@ -563 +537 @@
         break;
         case 0x15:
-            pNode->node.name = "CD";
             pNode->node.au32F00_param[0x9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_PIN_COMPLEX, 0, 0)
                                              | CODEC_F00_09_CAP_LSB;//(4 << 20)|RT_BIT(0);
@@ -576 +549 @@
         break;
         case 0x16:
-            pNode->node.name = "VolumeKnob";
             pNode->node.au32F00_param[0x9] = CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_VOLUME_KNOB, 0x0, 0x0);//(0x6 << 20);
             pNode->node.au32F00_param[0x13] = RT_BIT(7)| 0x7F;
@@ -585 +557 @@
         break;
         case 0x17:
-            pNode->node.name = "ADC0Vol";
             pNode->node.au32F02_param[0] = 0x12;
             goto adcvol_init;
         case 0x18:
-            pNode->node.name = "ADC1Vol";
             pNode->node.au32F02_param[0] = 0x13;
         adcvol_init:
@@ -605 +575 @@
             break;
         case 0x19:
-            pNode->node.name = "Reserved_1";
             pNode->node.au32F00_param[0x9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_VENDOR_DEFINED, 0x3, 0)
                                              | CODEC_F00_09_CAP_DIGITAL
@@ -611 +580 @@
             break;
         case 0x1A:
-            pNode->node.name = "Reserved_2";
             pNode->node.au32F00_param[0x9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_AUDIO_OUTPUT, 0x3, 0)
                                              | CODEC_F00_09_CAP_DIGITAL
@@ -617 +585 @@
             break;
         case 0x1B:
-            pNode->node.name = "Reserved_3";
             pNode->node.au32F00_param[0x9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_PIN_COMPLEX, 0, 0)
                                              | CODEC_F00_09_CAP_DIGITAL
@@ -1870 +1837 @@
 int codecLoadState(CODECState *pCodecState, PSSMHANDLE pSSMHandle)
 {
-    SSMR3GetMem (pSSMHandle, pCodecState->pNodes, sizeof(CODECNODE) * pCodecState->cTotalNodes);
+    int rc = SSMR3GetMem (pSSMHandle, pCodecState->pNodes, sizeof(CODECNODE) * pCodecState->cTotalNodes);
     if (codecIsDacNode(pCodecState, pCodecState->u8DacLineOut))
         codecToAudVolume(&pCodecState->pNodes[pCodecState->u8DacLineOut].dac.B_params, AUD_MIXER_VOLUME);
@@ -1876 +1843 @@
         codecToAudVolume(&pCodecState->pNodes[pCodecState->u8DacLineOut].spdifout.B_params, AUD_MIXER_VOLUME);
     codecToAudVolume(&pCodecState->pNodes[pCodecState->u8AdcVolsLineIn].adcvol.B_params, AUD_MIXER_LINE_IN);
-    return VINF_SUCCESS;
-}
+    return rc;
+}

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

@@ -53 +53 @@
 #endif
 
-#define HDA_SSM_VERSION 1
+#define HDA_SSM_VERSION 2
 PDMBOTHCBDECL(int) hdaMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
 PDMBOTHCBDECL(int) hdaMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
@@ -1996 +1996 @@
     PCIINTELHDLinkState *pThis = PDMINS_2_DATA(pDevIns, PCIINTELHDLinkState *);
     /* Load Codec nodes states */
-    AssertMsgReturn (uVersion == HDA_SSM_VERSION, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
+    if (uVersion < HDA_SSM_VERSION)
+        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     Assert (uPass == SSM_PASS_FINAL); NOREF(uPass);