VirtualBox

Changeset 44640 in vbox for trunk


Ignore:
Timestamp:
Feb 11, 2013 7:26:35 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
83728
Message:

DevIchIntelHDA.cpp: st is no prefix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp

    r44639 r44640  
    449449    RTGCPHYS                addrMMReg;
    450450    uint32_t                au32Regs[HDA_NREGS];
    451     HDABDLEDESC             stInBdle;
    452     HDABDLEDESC             stOutBdle;
    453     HDABDLEDESC             stMicBdle;
     451    HDABDLEDESC             StInBdle;
     452    HDABDLEDESC             StOutBdle;
     453    HDABDLEDESC             StMicBdle;
    454454    /** Interrupt on completion */
    455455    bool                    fCviIoc;
     
    11811181            case ICH6_HDA_REG_SD0CTL:
    11821182                u8Strm = 0;
    1183                 pBdle = &pState->stInBdle;
     1183                pBdle = &pState->StInBdle;
    11841184                break;
    11851185            case ICH6_HDA_REG_SD4CTL:
    11861186                u8Strm = 4;
    1187                 pBdle = &pState->stOutBdle;
     1187                pBdle = &pState->StOutBdle;
    11881188                break;
    11891189            default:
     
    17151715static uint32_t hdaReadAudio(INTELHDLinkState *pState, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit)
    17161716{
    1717     PHDABDLEDESC pBdle = &pState->stInBdle;
     1717    PHDABDLEDESC pBdle = &pState->StInBdle;
    17181718    uint32_t cbTransferred = 0;
    17191719    uint32_t cb2Copy = 0;
     
    17581758static uint32_t hdaWriteAudio(INTELHDLinkState *pState, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit)
    17591759{
    1760     PHDABDLEDESC pBdle = &pState->stOutBdle;
     1760    PHDABDLEDESC pBdle = &pState->StOutBdle;
    17611761    uint32_t cbTransferred = 0;
    17621762    uint32_t cb2Copy = 0; /* local byte counter (on local buffer) */
     
    18521852        {
    18531853            u8Strm = 4;
    1854             pBdle = &pState->stOutBdle;
     1854            pBdle = &pState->StOutBdle;
    18551855            break;
    18561856        }
     
    18581858        {
    18591859            u8Strm = 0;
    1860             pBdle = &pState->stInBdle;
     1860            pBdle = &pState->StInBdle;
    18611861            break;
    18621862        }
     
    20232023
    20242024    /* Save HDA dma counters */
    2025     SSMR3PutStructEx(pSSM, &pThis->stOutBdle, sizeof(pThis->stOutBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);
    2026     SSMR3PutStructEx(pSSM, &pThis->stMicBdle, sizeof(pThis->stMicBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);
    2027     SSMR3PutStructEx(pSSM, &pThis->stInBdle,  sizeof(pThis->stInBdle),  0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);
     2025    SSMR3PutStructEx(pSSM, &pThis->StOutBdle, sizeof(pThis->StOutBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);
     2026    SSMR3PutStructEx(pSSM, &pThis->StMicBdle, sizeof(pThis->StMicBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);
     2027    SSMR3PutStructEx(pSSM, &pThis->StInBdle,  sizeof(pThis->StInBdle),  0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);
    20282028    return VINF_SUCCESS;
    20292029}
     
    21002100    uint32_t   fFlags   = uVersion <= HDA_SSM_VERSION_2 ? SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED : 0;
    21012101    PCSSMFIELD paFields = uVersion <= HDA_SSM_VERSION_2 ? g_aHdaBDLEDescFieldsOld              : g_aHdaBDLEDescFields;
    2102     SSMR3GetStructEx(pSSM, &pThis->stOutBdle, sizeof(pThis->stOutBdle), fFlags, paFields, NULL);
    2103     SSMR3GetStructEx(pSSM, &pThis->stMicBdle, sizeof(pThis->stMicBdle), fFlags, paFields, NULL);
    2104     rc = SSMR3GetStructEx(pSSM, &pThis->stInBdle, sizeof(pThis->stInBdle), fFlags, paFields, NULL);
     2102    SSMR3GetStructEx(pSSM, &pThis->StOutBdle, sizeof(pThis->StOutBdle), fFlags, paFields, NULL);
     2103    SSMR3GetStructEx(pSSM, &pThis->StMicBdle, sizeof(pThis->StMicBdle), fFlags, paFields, NULL);
     2104    rc = SSMR3GetStructEx(pSSM, &pThis->StInBdle, sizeof(pThis->StInBdle), fFlags, paFields, NULL);
    21052105    AssertRCReturn(rc, rc);
    21062106
     
    23662366        PHDABDLEDESC pBdle = NULL;
    23672367        if (u8Strm == 0)
    2368             pBdle = &pThis->stInBdle;
     2368            pBdle = &pThis->StInBdle;
    23692369        else if(u8Strm == 4)
    2370             pBdle = &pThis->stOutBdle;
     2370            pBdle = &pThis->StOutBdle;
    23712371        else
    23722372        {
Note: See TracChangeset for help on using the changeset viewer.

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