Changeset 33402 in vbox for trunk/src

Timestamp:

Oct 25, 2010 5:30:02 AM (14 years ago)

Author:

vboxsync

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

66991

Message:

Audio/HDA: don't use extra word for IN/OUT activation, use register values instead.

File:

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

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

@@ -1503 +1503 @@
     SSMR3PutMem (pSSMHandle, &pThis->hda.stMicBdle, sizeof (HDABDLEDESC));
     SSMR3PutMem (pSSMHandle, &pThis->hda.stInBdle, sizeof (HDABDLEDESC));
-    uint8_t voices = AUD_is_active_in(ISD0FMT_TO_AUDIO_SELECTOR(&pThis->hda))? RT_BIT(0):0;
-    //voices |= AUD_is_active_in(pThis->hda.Codec.voice_mc)? RT_BIT(1):0;
-    voices |= AUD_is_active_out(OSD0FMT_TO_AUDIO_SELECTOR(&pThis->hda))? RT_BIT(2):0;
-    SSMR3PutU8(pSSMHandle, voices);
     return VINF_SUCCESS;
 }
@@ -1534 +1530 @@
     SSMR3GetMem (pSSMHandle, &pThis->hda.stMicBdle, sizeof (HDABDLEDESC));
     SSMR3GetMem (pSSMHandle, &pThis->hda.stInBdle, sizeof (HDABDLEDESC));
-    uint8_t voices;
-    SSMR3GetU8(pSSMHandle, &voices);
-    AUD_set_active_in(ISD0FMT_TO_AUDIO_SELECTOR(&pThis->hda), voices & RT_BIT(0));
-    //AUD_set_active_in(pThis->hda.Codec.voice_mc, voices & RT_BIT(1));
-    AUD_set_active_out(OSD0FMT_TO_AUDIO_SELECTOR(&pThis->hda), voices & RT_BIT(2));
+    
+    AUD_set_active_in(ISD0FMT_TO_AUDIO_SELECTOR(&pThis->hda), SDCTL(&pThis->hda, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+    AUD_set_active_out(OSD0FMT_TO_AUDIO_SELECTOR(&pThis->hda), SDCTL(&pThis->hda, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+
     pThis->hda.u64CORBBase = CORBLBASE(&pThis->hda);
     pThis->hda.u64CORBBase |= ((uint64_t)CORBUBASE(&pThis->hda)) << 32;