Changeset 59257 in vbox for trunk/src/VBox/Devices/Audio
- Timestamp:
- Jan 5, 2016 4:02:24 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 104890
- Location:
- trunk/src/VBox/Devices/Audio
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevIchHda.cpp
r59212 r59257 1466 1466 AssertPtrReturn(pStrmSt, VERR_INVALID_POINTER); 1467 1467 1468 #ifdef VBOX_STRICT1469 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 #endif1472 1473 1468 pStrmSt->u8Strm = u8Strm; 1474 1469 pStrmSt->u64BaseDMA = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, u8Strm), … … 3255 3250 hdaStreamTransferUpdate(pThis, pStrmSt, cbProcessed); 3256 3251 3257 cbToProcess -= RT_MIN(cbToProcess, 3252 cbToProcess -= RT_MIN(cbToProcess, cbProcessed); 3258 3253 cbProcessedTotal += cbProcessed; 3259 3254 … … 3636 3631 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 3637 3632 3638 LogFlowFunc(("uVersion=%RU32, uPass= %RU32\n", uVersion, uPass));3633 LogFlowFunc(("uVersion=%RU32, uPass=0x%x\n", uVersion, uPass)); 3639 3634 3640 3635 /* … … 3643 3638 int rc = hdaCodecLoadState(pThis->pCodec, pSSM, uVersion); 3644 3639 if (RT_FAILURE(rc)) 3640 { 3641 LogRel(("HDA: Failed loading codec state (version %RU32, pass 0x%x), rc=%Rrc\n", uVersion, uPass, rc)); 3645 3642 return rc; 3643 } 3646 3644 3647 3645 /* … … 3682 3680 3683 3681 default: 3682 LogRel(("HDA: Unsupported / too new saved state version (%RU32)\n", uVersion)); 3684 3683 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; 3685 3684 } … … 3829 3828 3830 3829 default: 3830 AssertReleaseFailed(); /* Never reached. */ 3831 3831 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; 3832 3832 } … … 3839 3839 * Update stuff after the state changes. 3840 3840 */ 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)); 3842 3842 #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)); 3844 3844 #else 3845 3845 bool fEnableMicIn = fEnableIn; /* Mic In == Line In */ 3846 3846 #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)); 3848 3848 3849 3849 PHDADRIVER pDrv; … … 3868 3868 pThis->u64DPBase = RT_MAKE_U64(HDA_REG(pThis, DPLBASE), HDA_REG(pThis, DPUBASE)); 3869 3869 } 3870 else 3871 LogRel(("HDA: Failed loading device state (version %RU32, pass 0x%x), rc=%Rrc\n", uVersion, uPass, rc)); 3870 3872 3871 3873 LogFlowFuncLeaveRC(rc); -
trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
r58900 r59257 2664 2664 /* Since version 4 a flexible node count is supported. */ 2665 2665 case HDA_SSM_VERSION_4: 2666 case HDA_SSM_VERSION_5: 2666 2667 case HDA_SSM_VERSION: 2667 2668 {
Note:
See TracChangeset
for help on using the changeset viewer.