VirtualBox

Changeset 59257 in vbox for trunk/src/VBox/Devices/Audio


Ignore:
Timestamp:
Jan 5, 2016 4:02:24 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
104890
Message:

HDA: Fixes/logging for SSM handling.

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

Legend:

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

    r59212 r59257  
    14661466    AssertPtrReturn(pStrmSt, VERR_INVALID_POINTER);
    14671467
    1468 #ifdef VBOX_STRICT
    1469     AssertReleaseMsg(!RT_BOOL(HDA_STREAM_REG(pThis, CTL, u8Strm) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN)),
    1470                      ("Cannot initialize stream %RU8 while in running state\n", u8Strm));
    1471 #endif
    1472 
    14731468    pStrmSt->u8Strm     = u8Strm;
    14741469    pStrmSt->u64BaseDMA = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, u8Strm),
     
    32553250        hdaStreamTransferUpdate(pThis, pStrmSt, cbProcessed);
    32563251
    3257         cbToProcess      -= RT_MIN(cbToProcess,  cbProcessed);
     3252        cbToProcess      -= RT_MIN(cbToProcess, cbProcessed);
    32583253        cbProcessedTotal += cbProcessed;
    32593254
     
    36363631    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    36373632
    3638     LogFlowFunc(("uVersion=%RU32, uPass=%RU32\n", uVersion, uPass));
     3633    LogFlowFunc(("uVersion=%RU32, uPass=0x%x\n", uVersion, uPass));
    36393634
    36403635    /*
     
    36433638    int rc = hdaCodecLoadState(pThis->pCodec, pSSM, uVersion);
    36443639    if (RT_FAILURE(rc))
     3640    {
     3641        LogRel(("HDA: Failed loading codec state (version %RU32, pass 0x%x), rc=%Rrc\n", uVersion, uPass, rc));
    36453642        return rc;
     3643    }
    36463644
    36473645    /*
     
    36823680
    36833681        default:
     3682            LogRel(("HDA: Unsupported / too new saved state version (%RU32)\n", uVersion));
    36843683            return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
    36853684    }
     
    38293828
    38303829        default:
     3830            AssertReleaseFailed(); /* Never reached. */
    38313831            return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
    38323832    }
     
    38393839         * Update stuff after the state changes.
    38403840         */
    3841         bool fEnableIn    = RT_BOOL(HDA_SDCTL(pThis, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     3841        bool fEnableIn    = RT_BOOL(HDA_SDCTL(pThis, 0 /** @todo Use a define. */) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
    38423842#ifdef VBOX_WITH_HDA_MIC_IN
    3843         bool fEnableMicIn = RT_BOOL(HDA_SDCTL(pThis, 2) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     3843        bool fEnableMicIn = RT_BOOL(HDA_SDCTL(pThis, 2 /** @todo Use a define. */) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
    38443844#else
    38453845        bool fEnableMicIn = fEnableIn; /* Mic In == Line In */
    38463846#endif
    3847         bool fEnableOut   = RT_BOOL(HDA_SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     3847        bool fEnableOut   = RT_BOOL(HDA_SDCTL(pThis, 4 /** @todo Use a define. */) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
    38483848
    38493849        PHDADRIVER pDrv;
     
    38683868        pThis->u64DPBase   = RT_MAKE_U64(HDA_REG(pThis, DPLBASE), HDA_REG(pThis, DPUBASE));
    38693869    }
     3870    else
     3871        LogRel(("HDA: Failed loading device state (version %RU32, pass 0x%x), rc=%Rrc\n", uVersion, uPass, rc));
    38703872
    38713873    LogFlowFuncLeaveRC(rc);
  • trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp

    r58900 r59257  
    26642664        /* Since version 4 a flexible node count is supported. */
    26652665        case HDA_SSM_VERSION_4:
     2666        case HDA_SSM_VERSION_5:
    26662667        case HDA_SSM_VERSION:
    26672668        {
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