Index: /trunk/src/VBox/Devices/Audio/DevHDA.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevHDA.cpp	(revision 67900)
+++ /trunk/src/VBox/Devices/Audio/DevHDA.cpp	(revision 67901)
@@ -490,5 +490,5 @@
     for (uint8_t i = 0; i < HDA_MAX_STREAMS; ++i)
     {
-        PHDASTREAM pStream = hdaStreamGetFromSD(pThis, i);
+        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, i);
         if (!pStream)
             continue;
@@ -915,11 +915,11 @@
 {
     const uint64_t u64WalClkCur       = ASMAtomicReadU64(&pThis->u64WalClk);
-    const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkFront)->State.Period);
+    const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkFront)->State.Period);
 #ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
 # error "Implement me!"
 #endif
-    const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkLineIn)->State.Period);
+    const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkLineIn)->State.Period);
 #ifdef VBOX_WITH_HDA_MIC_IN
-    const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkMicIn)->State.Period);
+    const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkMicIn)->State.Period);
 #endif
 
@@ -1016,5 +1016,5 @@
 {
 #ifdef IN_RING3
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, CBL, iReg));
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, CBL, iReg));
     if (!pStream)
     {
@@ -1080,5 +1080,5 @@
     /* Assign new values. */
     pTag->uTag    = uTag;
-    pTag->pStream = hdaStreamGetFromSD(pThis, uSD);
+    pTag->pStream = hdaGetStreamFromSD(pThis, uSD);
 
     PHDASTREAM pStream = pTag->pStream;
@@ -1189,5 +1189,5 @@
 {
 #ifdef IN_RING3
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, STS, iReg));
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, STS, iReg));
     if (!pStream)
     {
@@ -1251,5 +1251,5 @@
     uint8_t uSD = HDA_SD_NUM_FROM_REG(pThis, LVI, iReg);
 
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
     if (!pStream)
     {
@@ -1293,5 +1293,5 @@
     }
 
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FIFOW, iReg));
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FIFOW, iReg));
     if (!pStream)
     {
@@ -1347,5 +1347,5 @@
     }
 
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
     if (!pStream)
     {
@@ -1631,5 +1631,5 @@
 {
 #ifdef IN_RING3
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FMT, iReg));
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FMT, iReg));
     if (!pStream)
     {
@@ -1673,5 +1673,5 @@
     AssertRC(rc2);
 
-    PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
+    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
     if (!pStream)
         return VINF_SUCCESS;
@@ -2201,5 +2201,5 @@
         Assert(uSD < HDA_MAX_STREAMS);
 
-        PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
+        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
         if (pStream)
         {
@@ -2703,9 +2703,9 @@
 static void hdaDoTransfers(PHDASTATE pThis)
 {
-    PHDASTREAM pStreamLineIn  = hdaSinkGetStream(pThis, &pThis->SinkLineIn);
+    PHDASTREAM pStreamLineIn  = hdaGetStreamFromSink(pThis, &pThis->SinkLineIn);
 #ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-    PHDASTREAM pStreamMicIn   = hdaSinkGetStream(pThis, &pThis->SinkMicIn);
-#endif
-    PHDASTREAM pStreamFront   = hdaSinkGetStream(pThis, &pThis->SinkFront);
+    PHDASTREAM pStreamMicIn   = hdaGetStreamFromSink(pThis, &pThis->SinkMicIn);
+#endif
+    PHDASTREAM pStreamFront   = hdaGetStreamFromSink(pThis, &pThis->SinkFront);
 #ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
     /** @todo See note below. */
@@ -3228,5 +3228,5 @@
     for (uint8_t i = 0; i < HDA_MAX_STREAMS; i++)
     {
-        PHDASTREAM pStream = hdaStreamGetFromSD(pThis, i);
+        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, i);
         if (pStream)
         {
@@ -3448,5 +3448,5 @@
                     break;
 
-                PHDASTREAM pStrm = hdaStreamGetFromSD(pThis, uStreamID);
+                PHDASTREAM pStrm = hdaGetStreamFromSD(pThis, uStreamID);
                 HDASTREAM  StreamDummy;
 
@@ -3642,5 +3642,5 @@
         AssertRC(rc);
 
-        PHDASTREAM pStrm = hdaStreamGetFromSD(pThis, uStreamID);
+        PHDASTREAM pStrm = hdaGetStreamFromSD(pThis, uStreamID);
         HDASTREAM  StreamDummy;
 
Index: /trunk/src/VBox/Devices/Audio/DevHDACommon.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevHDACommon.cpp	(revision 67900)
+++ /trunk/src/VBox/Devices/Audio/DevHDACommon.cpp	(revision 67901)
@@ -170,16 +170,16 @@
 bool hdaWalClkSet(PHDASTATE pThis, uint64_t u64WalClk, bool fForce)
 {
-    const bool     fFrontPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaSinkGetStream(pThis, &pThis->SinkFront)->State.Period,
+    const bool     fFrontPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaGetStreamFromSink(pThis, &pThis->SinkFront)->State.Period,
                                                                            u64WalClk);
-    const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkFront)->State.Period);
+    const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkFront)->State.Period);
 #ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
 # error "Implement me!"
 #endif
 
-    const bool     fLineInPassed      = hdaStreamPeriodHasPassedAbsWalClk (&hdaSinkGetStream(pThis, &pThis->SinkLineIn)->State.Period, u64WalClk);
-    const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkLineIn)->State.Period);
+    const bool     fLineInPassed      = hdaStreamPeriodHasPassedAbsWalClk (&hdaGetStreamFromSink(pThis, &pThis->SinkLineIn)->State.Period, u64WalClk);
+    const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkLineIn)->State.Period);
 #ifdef VBOX_WITH_HDA_MIC_IN
-    const bool     fMicInPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaSinkGetStream(pThis, &pThis->SinkMicIn)->State.Period,  u64WalClk);
-    const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkMicIn)->State.Period);
+    const bool     fMicInPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaGetStreamFromSink(pThis, &pThis->SinkMicIn)->State.Period,  u64WalClk);
+    const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkMicIn)->State.Period);
 #endif
 
@@ -259,5 +259,5 @@
  * @return  Pointer to HDA stream, or NULL if none found.
  */
-PHDASTREAM hdaStreamGetFromSD(PHDASTATE pThis, uint8_t uSD)
+PHDASTREAM hdaGetStreamFromSD(PHDASTATE pThis, uint8_t uSD)
 {
     AssertPtrReturn(pThis, NULL);
@@ -278,5 +278,5 @@
  * @return  Pointer to HDA stream, or NULL if none found.
  */
-PHDASTREAM hdaSinkGetStream(PHDASTATE pThis, PHDAMIXERSINK pSink)
+PHDASTREAM hdaGetStreamFromSink(PHDASTATE pThis, PHDAMIXERSINK pSink)
 {
     AssertPtrReturn(pThis, NULL);
@@ -284,5 +284,5 @@
 
     /** @todo Do something with the channel mapping here? */
-    return hdaStreamGetFromSD(pThis, pSink->uSD);
+    return hdaGetStreamFromSD(pThis, pSink->uSD);
 }
 
Index: /trunk/src/VBox/Devices/Audio/DevHDACommon.h
===================================================================
--- /trunk/src/VBox/Devices/Audio/DevHDACommon.h	(revision 67900)
+++ /trunk/src/VBox/Devices/Audio/DevHDACommon.h	(revision 67901)
@@ -550,6 +550,6 @@
  */
 PDMAUDIODIR   hdaGetDirFromSD(uint8_t uSD);
-PHDASTREAM    hdaStreamGetFromSD(PHDASTATE pThis, uint8_t uSD);
-PHDASTREAM    hdaSinkGetStream(PHDASTATE pThis, PHDAMIXERSINK pSink);
+PHDASTREAM    hdaGetStreamFromSD(PHDASTATE pThis, uint8_t uSD);
+PHDASTREAM    hdaGetStreamFromSink(PHDASTATE pThis, PHDAMIXERSINK pSink);
 /** @} */