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

Timestamp:

Aug 19, 2010 9:15:42 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: introduces saved states.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevCodec.cpp (modified) (1 diff)
• DevCodec.h (modified) (1 diff)
• DevIchIntelHDA.cpp (modified) (7 diffs)

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

@@ -1271 +1271 @@
     return VINF_SUCCESS;
 }
+
+int stac9220SaveState(CODECState *pCodecState, PSSMHANDLE pSSMHandle)
+{
+    SSMR3PutMem (pSSMHandle, pCodecState->pNodes, sizeof(CODECNODE) * STAC9220_NODE_COUNT);
+    return VINF_SUCCESS;
+}
+int stac9220LoadState(CODECState *pCodecState, PSSMHANDLE pSSMHandle)
+{
+    SSMR3GetMem (pSSMHandle, pCodecState->pNodes, sizeof(CODECNODE) * STAC9220_NODE_COUNT);
+    codecToAudVolume(&pCodecState->pNodes[2].dac.B_params, AUD_MIXER_VOLUME);
+    codecToAudVolume(&pCodecState->pNodes[0x17].adcvol.B_params, AUD_MIXER_PCM);
+    return VINF_SUCCESS;
+}

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

@@ -233 +233 @@
 int stac9220Construct(CODECState *pCodecState);
 int stac9220Destruct(CODECState *pCodecState);
+int stac9220SaveState(CODECState *pCodecState, PSSMHANDLE pSSMHandle);
+int stac9220LoadState(CODECState *pCodecState, PSSMHANDLE pSSMHandle);
 
 #endif

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

@@ -41 +41 @@
 #endif
 
-#define INTELHD_SSM_VERSION 1
+#define HDA_SSM_VERSION 1
 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);
@@ -133 +133 @@
 
 #define ICH6_HDA_REG_CORBLBASE  13 /* 0x40 */
+#define CORBLBASE(pState) (HDA_REG((pState), CORBLBASE))
 #define ICH6_HDA_REG_CORBUBASE  14 /* 0x44 */
+#define CORBUBASE(pState) (HDA_REG((pState), CORBUBASE))
 #define ICH6_HDA_REG_CORBWP  15 /* 48 */
 #define ICH6_HDA_REG_CORBRP  16 /* 4A */
@@ -162 +164 @@
 
 #define ICH6_HDA_REG_RIRLBASE  20 /* 0x50 */
+#define RIRLBASE(pState) (HDA_REG((pState), RIRLBASE))
+
 #define ICH6_HDA_REG_RIRUBASE  21 /* 0x54 */
+#define RIRUBASE(pState) (HDA_REG((pState), RIRUBASE))
 
 #define ICH6_HDA_REG_RIRBWP  22 /* 0x58 */
@@ -367 +372 @@
     uint64_t    u64RIRBBase;
     uint64_t    u64DPBase;
-    uint8_t     u8CORBRP;
     /* pointer on CORB buf */
     uint32_t    *pu32CorbBuf;
@@ -909 +913 @@
 {
     if (u32Value & HDA_REG_FIELD_FLAG_MASK(CORBRP, RST))
-    {
-        pState->u8CORBRP = 0;
         CORBRP(pState) = 0;
-    }
     else
         return hdaRegWriteU8(pState, offset, index, u32Value);
@@ -1490 +1491 @@
 }
 
+/**
+ * Saves a state of the HDA device.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns     The device instance.
+ * @param   pSSMHandle  The handle to save the state to.
+ */
+static DECLCALLBACK(int) hdaSaveExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
+{
+    PCIINTELHDLinkState *pThis = PDMINS_2_DATA(pDevIns, PCIINTELHDLinkState *);
+    /* Save Codec nodes states */
+    stac9220SaveState(&pThis->hda.Codec, pSSMHandle);
+    /* Save MMIO registers */
+    SSMR3PutMem (pSSMHandle, pThis->hda.au32Regs, sizeof (pThis->hda.au32Regs));
+    /* Save HDA dma counters */
+    SSMR3PutMem (pSSMHandle, &pThis->hda.stOutBdle, sizeof (HDABDLEDESC));
+    SSMR3PutMem (pSSMHandle, &pThis->hda.stMicBdle, sizeof (HDABDLEDESC));
+    SSMR3PutMem (pSSMHandle, &pThis->hda.stInBdle, sizeof (HDABDLEDESC));
+    uint8_t voices = AUD_is_active_in(pThis->hda.Codec.voice_pi)? RT_BIT(0):0;
+    voices |= AUD_is_active_in(pThis->hda.Codec.voice_mc)? RT_BIT(1):0;
+    voices |= AUD_is_active_out(pThis->hda.Codec.voice_po)? RT_BIT(2):0;
+    SSMR3PutU8(pSSMHandle, voices);
+    return VINF_SUCCESS;
+}
+
+/**
+ * Loads a saved HDA device state.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns     The device instance.
+ * @param   pSSMHandle  The handle to the saved state.
+ * @param   uVersion    The data unit version number.
+ * @param   uPass       The data pass.
+ */
+static DECLCALLBACK(int) hdaLoadExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle,
+                                          uint32_t uVersion, uint32_t uPass)
+{
+    PCIINTELHDLinkState *pThis = PDMINS_2_DATA(pDevIns, PCIINTELHDLinkState *);
+    /* Load Codec nodes states */
+    stac9220LoadState(&pThis->hda.Codec, pSSMHandle);
+    /* Load MMIO registers */
+    SSMR3GetMem (pSSMHandle, pThis->hda.au32Regs, sizeof (pThis->hda.au32Regs));
+    /* Load HDA dma counters */
+    SSMR3GetMem (pSSMHandle, &pThis->hda.stOutBdle, sizeof (HDABDLEDESC));
+    SSMR3GetMem (pSSMHandle, &pThis->hda.stMicBdle, sizeof (HDABDLEDESC));
+    SSMR3GetMem (pSSMHandle, &pThis->hda.stInBdle, sizeof (HDABDLEDESC));
+    uint8_t voices;
+    SSMR3GetU8(pSSMHandle, &voices);
+    AUD_set_active_in(pThis->hda.Codec.voice_pi, voices & RT_BIT(0));
+    AUD_set_active_in(pThis->hda.Codec.voice_mc, voices & RT_BIT(1));
+    AUD_set_active_out(pThis->hda.Codec.voice_po, voices & RT_BIT(2));
+    pThis->hda.u64CORBBase = CORBLBASE(&pThis->hda);
+    pThis->hda.u64CORBBase |= ((uint64_t)CORBUBASE(&pThis->hda)) << 32;
+    pThis->hda.u64RIRBBase = RIRLBASE(&pThis->hda);
+    pThis->hda.u64RIRBBase |= ((uint64_t)RIRUBASE(&pThis->hda)) << 32;
+    pThis->hda.u64DPBase = DPLBASE(&pThis->hda);
+    pThis->hda.u64DPBase |= ((uint64_t)DPUBASE(&pThis->hda)) << 32;
+    return VINF_SUCCESS;
+}
 
 /**
@@ -1646 +1706 @@
     rc = PDMDevHlpPCIIORegionRegister (pDevIns, 0, 0x4000, PCI_ADDRESS_SPACE_MEM,
                                        hdaMap);
+    if (RT_FAILURE (rc))
+        return rc;
+
+    rc = PDMDevHlpSSMRegister (pDevIns, HDA_SSM_VERSION, sizeof(*pThis), hdaSaveExec, hdaLoadExec);
     if (RT_FAILURE (rc))
         return rc;