Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 65022)
+++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp	(revision 65023)
@@ -47,5 +47,5 @@
 *********************************************************************************************************************************/
 
-#if 0
+#ifdef DEBUG_andy
 /*
  * AC97_DEBUG_DUMP_PCM_DATA enables dumping the raw PCM data
@@ -470,5 +470,5 @@
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
-DECLINLINE(PAC97STREAM)   ichac97GetStreamFromID(PAC97STATE pThis, uint32_t uID);
+DECLINLINE(PAC97STREAM)   ichac97GetStreamFromIdx(PAC97STATE pThis, uint32_t uIdx);
 static int                ichac97StreamCreate(PAC97STATE pThis, PAC97STREAM pStream, uint8_t u8Strm);
 static void               ichac97StreamDestroy(PAC97STATE pThis, PAC97STREAM pStream);
@@ -1848,7 +1848,7 @@
  * @param   i                   AC'97 index to convert.
  */
-static PDMAUDIORECSOURCE ichac97IndextoRecSource(uint8_t i)
-{
-    switch (i)
+static PDMAUDIORECSOURCE ichac97IdxToRecSource(uint8_t uIdx)
+{
+    switch (uIdx)
     {
         case AC97_REC_MIC:     return PDMAUDIORECSOURCE_MIC;
@@ -1862,5 +1862,5 @@
     }
 
-    LogFlowFunc(("Unknown record source %d, using MIC\n", i));
+    LogFlowFunc(("Unknown record source %d, using MIC\n", uIdx));
     return PDMAUDIORECSOURCE_MIC;
 }
@@ -1872,7 +1872,7 @@
  * @param   rs                  PDM audio recording source to convert.
  */
-static uint8_t ichac97RecSourceToIndex(PDMAUDIORECSOURCE rs)
-{
-    switch (rs)
+static uint8_t ichac97RecSourceToIdx(PDMAUDIORECSOURCE enmRecSrc)
+{
+    switch (enmRecSrc)
     {
         case PDMAUDIORECSOURCE_MIC:     return AC97_REC_MIC;
@@ -1886,6 +1886,26 @@
     }
 
-    LogFlowFunc(("Unknown audio recording source %d using MIC\n", rs));
+    LogFlowFunc(("Unknown audio recording source %d using MIC\n", enmRecSrc));
     return AC97_REC_MIC;
+}
+
+/**
+ * Retrieves an AC'97 audio stream from an AC'97 stream index.
+ *
+ * @returns Pointer to AC'97 audio stream if found, or NULL if not found / invalid.
+ * @param pThis                 AC'97 state.
+ * @param uIdx                  AC'97 stream index to retrieve AC'97 audio stream for.
+ */
+DECLINLINE(PAC97STREAM) ichac97GetStreamFromIdx(PAC97STATE pThis, uint32_t uIdx)
+{
+    switch (uIdx)
+    {
+        case AC97SOUNDSOURCE_PI_INDEX: return &pThis->StreamLineIn;
+        case AC97SOUNDSOURCE_MC_INDEX: return &pThis->StreamMicIn;
+        case AC97SOUNDSOURCE_PO_INDEX: return &pThis->StreamOut;
+        default:                       break;
+    }
+
+    return NULL;
 }
 
@@ -1897,12 +1917,12 @@
  * @param   val                 AC'97 recording source index to set.
  */
-static void ichac97RecordSelect(PAC97STATE pThis, uint32_t val)
+static void ichac97MixerRecordSelect(PAC97STATE pThis, uint32_t val)
 {
     uint8_t rs = val & AC97_REC_MASK;
     uint8_t ls = (val >> 8) & AC97_REC_MASK;
-    PDMAUDIORECSOURCE ars = ichac97IndextoRecSource(rs);
-    PDMAUDIORECSOURCE als = ichac97IndextoRecSource(ls);
-    rs = ichac97RecSourceToIndex(ars);
-    ls = ichac97RecSourceToIndex(als);
+    PDMAUDIORECSOURCE ars = ichac97IdxToRecSource(rs);
+    PDMAUDIORECSOURCE als = ichac97IdxToRecSource(ls);
+    rs = ichac97RecSourceToIdx(ars);
+    ls = ichac97RecSourceToIdx(als);
     ichac97MixerSet(pThis, AC97_Record_Select, rs | (ls << 8));
 }
@@ -1965,5 +1985,5 @@
         ichac97MixerSet(pThis, AC97_Vendor_ID2              , 0x7600); /* 7608 */
     }
-    ichac97RecordSelect(pThis, 0);
+    ichac97MixerRecordSelect(pThis, 0);
 
     ichac97MixerSetVolume(pThis, AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME_MASTER, 0x8000);
@@ -2349,5 +2369,5 @@
     const uint32_t uPortIdx = Port - pThis->IOPortBase[1];
 
-    PAC97STREAM pStream = ichac97GetStreamFromID(pThis, AC97_PORT2IDX(uPortIdx));
+    PAC97STREAM pStream = ichac97GetStreamFromIdx(pThis, AC97_PORT2IDX(uPortIdx));
     PAC97BMREGS pRegs   = NULL;
 
@@ -2520,5 +2540,5 @@
     const uint32_t uPortIdx = Port - pThis->IOPortBase[1];
 
-    PAC97STREAM pStream = ichac97GetStreamFromID(pThis, AC97_PORT2IDX(uPortIdx));
+    PAC97STREAM pStream = ichac97GetStreamFromIdx(pThis, AC97_PORT2IDX(uPortIdx));
     PAC97BMREGS pRegs   = NULL;
 
@@ -2802,5 +2822,5 @@
                     break;
                 case AC97_Record_Select:
-                    ichac97RecordSelect(pThis, u32Val);
+                    ichac97MixerRecordSelect(pThis, u32Val);
                     break;
                 case AC97_Vendor_ID1:
@@ -2920,23 +2940,4 @@
 }
 
-/**
- * Retrieves an AC'97 audio stream from an AC'97 stream index.
- *
- * @returns Pointer to AC'97 audio stream if found, or NULL if not found / invalid.
- * @param                       AC'97 state.
- */
-DECLINLINE(PAC97STREAM) ichac97GetStreamFromID(PAC97STATE pThis, uint32_t uID)
-{
-    switch (uID)
-    {
-        case AC97SOUNDSOURCE_PI_INDEX: return &pThis->StreamLineIn;
-        case AC97SOUNDSOURCE_MC_INDEX: return &pThis->StreamMicIn;
-        case AC97SOUNDSOURCE_PO_INDEX: return &pThis->StreamOut;
-        default:                       break;
-    }
-
-    return NULL;
-}
-
 #ifdef IN_RING3
 /**
@@ -3061,5 +3062,5 @@
     SSMR3GetMem(pSSM, uaStrmsActive, sizeof(uaStrmsActive));
 
-    ichac97RecordSelect(pThis, ichac97MixerGet(pThis, AC97_Record_Select));
+    ichac97MixerRecordSelect(pThis, ichac97MixerGet(pThis, AC97_Record_Select));
 # define V_(a, b) ichac97MixerSetVolume(pThis, a, b, ichac97MixerGet(pThis, a))
     V_(AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME_MASTER);