VirtualBox

Changeset 67901 in vbox


Ignore:
Timestamp:
Jul 11, 2017 11:14:35 AM (8 years ago)
Author:
vboxsync
Message:

Audio/DevHDA.cpp: Renaming (no actual code changes).

Location:
trunk/src/VBox/Devices/Audio
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/DevHDA.cpp

    r67899 r67901  
    490490    for (uint8_t i = 0; i < HDA_MAX_STREAMS; ++i)
    491491    {
    492         PHDASTREAM pStream = hdaStreamGetFromSD(pThis, i);
     492        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, i);
    493493        if (!pStream)
    494494            continue;
    … …  
    915915{
    916916    const uint64_t u64WalClkCur       = ASMAtomicReadU64(&pThis->u64WalClk);
    917     const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkFront)->State.Period);
     917    const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkFront)->State.Period);
    918918#ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
    919919# error "Implement me!"
    920920#endif
    921     const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkLineIn)->State.Period);
     921    const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkLineIn)->State.Period);
    922922#ifdef VBOX_WITH_HDA_MIC_IN
    923     const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkMicIn)->State.Period);
     923    const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkMicIn)->State.Period);
    924924#endif
    925925
    … …  
    10161016{
    10171017#ifdef IN_RING3
    1018     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, CBL, iReg));
     1018    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, CBL, iReg));
    10191019    if (!pStream)
    10201020    {
    … …  
    10801080    /* Assign new values. */
    10811081    pTag->uTag    = uTag;
    1082     pTag->pStream = hdaStreamGetFromSD(pThis, uSD);
     1082    pTag->pStream = hdaGetStreamFromSD(pThis, uSD);
    10831083
    10841084    PHDASTREAM pStream = pTag->pStream;
    … …  
    11891189{
    11901190#ifdef IN_RING3
    1191     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, STS, iReg));
     1191    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, STS, iReg));
    11921192    if (!pStream)
    11931193    {
    … …  
    12511251    uint8_t uSD = HDA_SD_NUM_FROM_REG(pThis, LVI, iReg);
    12521252
    1253     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
     1253    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
    12541254    if (!pStream)
    12551255    {
    … …  
    12931293    }
    12941294
    1295     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FIFOW, iReg));
     1295    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FIFOW, iReg));
    12961296    if (!pStream)
    12971297    {
    … …  
    13471347    }
    13481348
    1349     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
     1349    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
    13501350    if (!pStream)
    13511351    {
    … …  
    16311631{
    16321632#ifdef IN_RING3
    1633     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FMT, iReg));
     1633    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, HDA_SD_NUM_FROM_REG(pThis, FMT, iReg));
    16341634    if (!pStream)
    16351635    {
    … …  
    16731673    AssertRC(rc2);
    16741674
    1675     PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
     1675    PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
    16761676    if (!pStream)
    16771677        return VINF_SUCCESS;
    … …  
    22012201        Assert(uSD < HDA_MAX_STREAMS);
    22022202
    2203         PHDASTREAM pStream = hdaStreamGetFromSD(pThis, uSD);
     2203        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uSD);
    22042204        if (pStream)
    22052205        {
    … …  
    27032703static void hdaDoTransfers(PHDASTATE pThis)
    27042704{
    2705     PHDASTREAM pStreamLineIn  = hdaSinkGetStream(pThis, &pThis->SinkLineIn);
     2705    PHDASTREAM pStreamLineIn  = hdaGetStreamFromSink(pThis, &pThis->SinkLineIn);
    27062706#ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
    2707     PHDASTREAM pStreamMicIn   = hdaSinkGetStream(pThis, &pThis->SinkMicIn);
    2708 #endif
    2709     PHDASTREAM pStreamFront   = hdaSinkGetStream(pThis, &pThis->SinkFront);
     2707    PHDASTREAM pStreamMicIn   = hdaGetStreamFromSink(pThis, &pThis->SinkMicIn);
     2708#endif
     2709    PHDASTREAM pStreamFront   = hdaGetStreamFromSink(pThis, &pThis->SinkFront);
    27102710#ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
    27112711    /** @todo See note below. */
    … …  
    32283228    for (uint8_t i = 0; i < HDA_MAX_STREAMS; i++)
    32293229    {
    3230         PHDASTREAM pStream = hdaStreamGetFromSD(pThis, i);
     3230        PHDASTREAM pStream = hdaGetStreamFromSD(pThis, i);
    32313231        if (pStream)
    32323232        {
    … …  
    34483448                    break;
    34493449
    3450                 PHDASTREAM pStrm = hdaStreamGetFromSD(pThis, uStreamID);
     3450                PHDASTREAM pStrm = hdaGetStreamFromSD(pThis, uStreamID);
    34513451                HDASTREAM  StreamDummy;
    34523452
    … …  
    36423642        AssertRC(rc);
    36433643
    3644         PHDASTREAM pStrm = hdaStreamGetFromSD(pThis, uStreamID);
     3644        PHDASTREAM pStrm = hdaGetStreamFromSD(pThis, uStreamID);
    36453645        HDASTREAM  StreamDummy;
    36463646

  • trunk/src/VBox/Devices/Audio/DevHDACommon.cpp

    r67900 r67901  
    170170bool hdaWalClkSet(PHDASTATE pThis, uint64_t u64WalClk, bool fForce)
    171171{
    172     const bool     fFrontPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaSinkGetStream(pThis, &pThis->SinkFront)->State.Period,
     172    const bool     fFrontPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaGetStreamFromSink(pThis, &pThis->SinkFront)->State.Period,
    173173                                                                           u64WalClk);
    174     const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkFront)->State.Period);
     174    const uint64_t u64FrontAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkFront)->State.Period);
    175175#ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
    176176# error "Implement me!"
    177177#endif
    178178
    179     const bool     fLineInPassed      = hdaStreamPeriodHasPassedAbsWalClk (&hdaSinkGetStream(pThis, &pThis->SinkLineIn)->State.Period, u64WalClk);
    180     const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkLineIn)->State.Period);
     179    const bool     fLineInPassed      = hdaStreamPeriodHasPassedAbsWalClk (&hdaGetStreamFromSink(pThis, &pThis->SinkLineIn)->State.Period, u64WalClk);
     180    const uint64_t u64LineInAbsWalClk = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkLineIn)->State.Period);
    181181#ifdef VBOX_WITH_HDA_MIC_IN
    182     const bool     fMicInPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaSinkGetStream(pThis, &pThis->SinkMicIn)->State.Period,  u64WalClk);
    183     const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaSinkGetStream(pThis, &pThis->SinkMicIn)->State.Period);
     182    const bool     fMicInPassed       = hdaStreamPeriodHasPassedAbsWalClk (&hdaGetStreamFromSink(pThis, &pThis->SinkMicIn)->State.Period,  u64WalClk);
     183    const uint64_t u64MicInAbsWalClk  = hdaStreamPeriodGetAbsElapsedWalClk(&hdaGetStreamFromSink(pThis, &pThis->SinkMicIn)->State.Period);
    184184#endif
    185185
    … …  
    259259 * @return  Pointer to HDA stream, or NULL if none found.
    260260 */
    261 PHDASTREAM hdaStreamGetFromSD(PHDASTATE pThis, uint8_t uSD)
     261PHDASTREAM hdaGetStreamFromSD(PHDASTATE pThis, uint8_t uSD)
    262262{
    263263    AssertPtrReturn(pThis, NULL);
    … …  
    278278 * @return  Pointer to HDA stream, or NULL if none found.
    279279 */
    280 PHDASTREAM hdaSinkGetStream(PHDASTATE pThis, PHDAMIXERSINK pSink)
     280PHDASTREAM hdaGetStreamFromSink(PHDASTATE pThis, PHDAMIXERSINK pSink)
    281281{
    282282    AssertPtrReturn(pThis, NULL);
    … …  
    284284
    285285    /** @todo Do something with the channel mapping here? */
    286     return hdaStreamGetFromSD(pThis, pSink->uSD);
     286    return hdaGetStreamFromSD(pThis, pSink->uSD);
    287287}
    288288

  • trunk/src/VBox/Devices/Audio/DevHDACommon.h

    r67899 r67901  
    550550 */
    551551PDMAUDIODIR   hdaGetDirFromSD(uint8_t uSD);
    552 PHDASTREAM    hdaStreamGetFromSD(PHDASTATE pThis, uint8_t uSD);
    553 PHDASTREAM    hdaSinkGetStream(PHDASTATE pThis, PHDAMIXERSINK pSink);
     552PHDASTREAM    hdaGetStreamFromSD(PHDASTATE pThis, uint8_t uSD);
     553PHDASTREAM    hdaGetStreamFromSink(PHDASTATE pThis, PHDAMIXERSINK pSink);
    554554/** @} */
    555555
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette