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

Timestamp:

Jun 16, 2011 4:09:27 AM (14 years ago)

Author:

vboxsync

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

72300

Message:

Audio/HDA: SSMR3{Get,Put}Struct in HDA device implementation.

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -1868 +1868 @@
 {
     int rc;
-    if (uVersion == 1)
+    if (uVersion == HDA_SSM_VERSION_1)
     {
 #if RT_ARCH_X86

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

@@ -530 +530 @@
 int codecOpenVoice(CODECState *pCodecState, ENMSOUNDSOURCE enmSoundSource, audsettings_t *pAudioSettings);
 
-#define HDA_SSM_VERSION 2
+#define HDA_SSM_VERSION 3
+#define HDA_SSM_VERSION_1 1
+#define HDA_SSM_VERSION_2 2
 
 # ifdef VBOX_WITH_HDA_CODEC_EMU

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

@@ -418 +418 @@
     uint8_t     au8HdaBuffer[HDA_SDONFIFO_256B + 1];
 } HDABDLEDESC, *PHDABDLEDESC;
+
+static SSMFIELD const g_aHdaBDLEDescFields[] =
+{
+    SSMFIELD_ENTRY(     HDABDLEDESC, u64BdleCviAddr),
+    SSMFIELD_ENTRY(     HDABDLEDESC, u32BdleMaxCvi),
+    SSMFIELD_ENTRY(     HDABDLEDESC, u32BdleCvi),
+    SSMFIELD_ENTRY(     HDABDLEDESC, u32BdleCviLen),
+    SSMFIELD_ENTRY(     HDABDLEDESC, u32BdleCviPos),
+    SSMFIELD_ENTRY(     HDABDLEDESC, fBdleCviIoc),
+    SSMFIELD_ENTRY(     HDABDLEDESC, cbUnderFifoW),
+    SSMFIELD_ENTRY(     HDABDLEDESC, au8HdaBuffer),
+    SSMFIELD_ENTRY_TERM()
+};
 
 typedef struct HDASTREAMTRANSFERDESC
@@ -1975 +1988 @@
     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));
+    SSMR3PutStruct (pSSMHandle, &pThis->hda.stOutBdle, g_aHdaBDLEDescFields);
+    SSMR3PutStruct (pSSMHandle, &pThis->hda.stMicBdle, g_aHdaBDLEDescFields);
+    SSMR3PutStruct (pSSMHandle, &pThis->hda.stInBdle, g_aHdaBDLEDescFields);
     return VINF_SUCCESS;
 }
@@ -1995 +2008 @@
     PCIINTELHDLinkState *pThis = PDMINS_2_DATA(pDevIns, PCIINTELHDLinkState *);
     /* Load Codec nodes states */
-    if (uVersion > HDA_SSM_VERSION)
-        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     Assert (uPass == SSM_PASS_FINAL); NOREF(uPass);
 
@@ -2003 +2014 @@
     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));
+    if (   uVersion == HDA_SSM_VERSION_1
+        || uVersion == HDA_SSM_VERSION_2)
+    {
+        SSMR3GetMem (pSSMHandle, &pThis->hda.stOutBdle, sizeof (HDABDLEDESC));
+        SSMR3GetMem (pSSMHandle, &pThis->hda.stMicBdle, sizeof (HDABDLEDESC));
+        SSMR3GetMem (pSSMHandle, &pThis->hda.stInBdle, sizeof (HDABDLEDESC));
+    }
+    else
+    {
+        SSMR3GetStruct (pSSMHandle, &pThis->hda.stOutBdle, g_aHdaBDLEDescFields);
+        SSMR3GetStruct (pSSMHandle, &pThis->hda.stMicBdle, g_aHdaBDLEDescFields);
+        SSMR3GetStruct (pSSMHandle, &pThis->hda.stInBdle, g_aHdaBDLEDescFields);
+    }
+
 
     AUD_set_active_in(pThis->hda.Codec.SwVoiceIn, SDCTL(&pThis->hda, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));