VirtualBox

Changeset 68021 in vbox


Ignore:
Timestamp:
Jul 18, 2017 12:57:19 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
117039
Message:

Audio: Logging nits.

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

Legend:

Unmodified
Added
Removed

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

    r67831 r68021  
    381381                                               pSink->pszName, pMixer->pszName), VERR_NOT_FOUND);
    382382
    383     LogFlowFunc(("[%s]: pSink=%s, cSinks=%RU8\n",
     383    LogFlowFunc(("[%s] pSink=%s, cSinks=%RU8\n",
    384384                 pMixer->pszName, pSink->pszName, pMixer->cSinks));
    385385
    … …  
    430430    memcpy(&pMixer->VolMaster, pVol, sizeof(PDMAUDIOVOLUME));
    431431
    432     LogFlowFunc(("[%s]: lVol=%RU32, rVol=%RU32 => fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
     432    LogFlowFunc(("[%s] lVol=%RU32, rVol=%RU32 => fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
    433433                 pMixer->pszName, pVol->uLeft, pVol->uRight,
    434434                 pMixer->VolMaster.fMuted, pMixer->VolMaster.uLeft, pMixer->VolMaster.uRight));
    … …  
    555555    }
    556556
    557     LogFlowFunc(("[%s]: cStreams=%RU8, rc=%Rrc\n", pSink->pszName, pSink->cStreams, rc));
     557    LogFlowFunc(("[%s] cStreams=%RU8, rc=%Rrc\n", pSink->pszName, pSink->cStreams, rc));
    558558
    559559    int rc2 = RTCritSectLeave(&pSink->CritSect);
    … …  
    597597        return rc;
    598598
    599     LogFlowFunc(("[%s]: fFlags=0x%x (enmDir=%ld, %RU8 bits, %RU8 channels, %RU32Hz)\n",
     599    LogFlowFunc(("[%s] fFlags=0x%x (enmDir=%ld, %RU8 bits, %RU8 channels, %RU32Hz)\n",
    600600                 pSink->pszName, fFlags, pCfg->enmDir, pCfg->Props.cBits, pCfg->Props.cChannels, pCfg->Props.uHz));
    601601
    … …  
    734734#ifdef LOG_ENABLED
    735735    char *pszStatus = dbgAudioMixerSinkStatusToStr(pSink->fStatus);
    736     LogFlowFunc(("[%s]: enmCmd=%d, fStatus=%s, rc=%Rrc\n", pSink->pszName, enmSinkCmd, pszStatus, rc));
     736    LogFlowFunc(("[%s] enmCmd=%d, fStatus=%s, rc=%Rrc\n", pSink->pszName, enmSinkCmd, pszStatus, rc));
    737737    RTStrFree(pszStatus);
    738738#endif
    … …  
    11901190                                              pStream->pszName, pSink->pszName), VERR_NOT_FOUND);
    11911191
    1192     LogFlowFunc(("[%s]: (Stream = %s), cStreams=%RU8\n",
     1192    LogFlowFunc(("[%s] (Stream = %s), cStreams=%RU8\n",
    11931193                 pSink->pszName, pStream->pStream->szName, pSink->cStreams));
    11941194
    … …  
    13471347
    13481348    if (pSink->PCMProps.uHz)
    1349         LogFlowFunc(("[%s]: Old format: %RU8 bit, %RU8 channels, %RU32Hz\n",
     1349        LogFlowFunc(("[%s] Old format: %RU8 bit, %RU8 channels, %RU32Hz\n",
    13501350                     pSink->pszName, pSink->PCMProps.cBits, pSink->PCMProps.cChannels, pSink->PCMProps.uHz));
    13511351
    13521352    memcpy(&pSink->PCMProps, pPCMProps, sizeof(PDMAUDIOPCMPROPS));
    13531353
    1354     LogFlowFunc(("[%s]: New format %RU8 bit, %RU8 channels, %RU32Hz\n",
     1354    LogFlowFunc(("[%s] New format %RU8 bit, %RU8 channels, %RU32Hz\n",
    13551355                 pSink->pszName, pSink->PCMProps.cBits, pSink->PCMProps.cChannels, pSink->PCMProps.uHz));
    13561356
    … …  
    13941394    memcpy(&pSink->Volume, pVol, sizeof(PDMAUDIOVOLUME));
    13951395
    1396     LogFlowFunc(("[%s]: fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
     1396    LogFlowFunc(("[%s] fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
    13971397                 pSink->pszName, pSink->Volume.fMuted, pSink->Volume.uLeft, pSink->Volume.uRight));
    13981398

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

    r67907 r68021  
    10221022    if (!pStream)
    10231023    {
    1024         LogFunc(("[SD%RU8]: Warning: Changing SDCBL on non-attached stream (0x%x)\n",
     1024        LogFunc(("[SD%RU8] Warning: Changing SDCBL on non-attached stream (0x%x)\n",
    10251025                 HDA_SD_NUM_FROM_REG(pThis, CTL, iReg), u32Value));
    10261026        return hdaRegWriteU32(pThis, iReg, u32Value);
    … …  
    10321032    AssertRC(rc2);
    10331033
    1034     LogFlowFunc(("[SD%RU8]: CBL=%RU32\n", pStream->u8SD, u32Value));
     1034    LogFlowFunc(("[SD%RU8] CBL=%RU32\n", pStream->u8SD, u32Value));
    10351035
    10361036    return VINF_SUCCESS; /* Always return success to the MMIO handler. */
    … …  
    10591059    uint8_t uSD = HDA_SD_NUM_FROM_REG(pThis, CTL, iReg);
    10601060
    1061     LogFunc(("[SD%RU8]: fRun=%RTbool, fInRun=%RTbool, fReset=%RTbool, fInReset=%RTbool, %R[sdctl]\n",
     1061    LogFunc(("[SD%RU8] fRun=%RTbool, fInRun=%RTbool, fReset=%RTbool, fInReset=%RTbool, %R[sdctl]\n",
    10621062             uSD, fRun, fInRun, fReset, fInReset, u32Value));
    10631063
    … …  
    10721072    if (uTag > HDA_MAX_TAGS)
    10731073    {
    1074         LogFunc(("[SD%RU8]: Warning: Invalid stream tag %RU8 specified!\n", uSD, uTag));
     1074        LogFunc(("[SD%RU8] Warning: Invalid stream tag %RU8 specified!\n", uSD, uTag));
    10751075        return hdaRegWriteU24(pThis, iReg, u32Value);
    10761076    }
    … …  
    10791079    AssertPtr(pTag);
    10801080
    1081     LogFunc(("[SD%RU8]: Using stream tag=%RU8\n", uSD, uTag));
     1081    LogFunc(("[SD%RU8] Using stream tag=%RU8\n", uSD, uTag));
    10821082
    10831083    /* Assign new values. */
    … …  
    10991099        HDA_STREAM_REG(pThis, CTL, uSD) &= ~HDA_SDCTL_SRST;
    11001100
    1101         LogFunc(("[SD%RU8]: Reset exit\n", uSD));
     1101        LogFunc(("[SD%RU8] Reset exit\n", uSD));
    11021102    }
    11031103    else if (fReset)
    … …  
    11061106        Assert(!fInRun && !fRun);
    11071107
    1108         LogFunc(("[SD%RU8]: Reset enter\n", pStream->u8SD));
     1108        LogFunc(("[SD%RU8] Reset enter\n", pStream->u8SD));
    11091109
    11101110        hdaStreamLock(pStream);
    … …  
    11291129        {
    11301130            Assert(!fReset && !fInReset);
    1131             LogFunc(("[SD%RU8]: State changed (fRun=%RTbool)\n", pStream->u8SD, fRun));
     1131            LogFunc(("[SD%RU8] State changed (fRun=%RTbool)\n", pStream->u8SD, fRun));
    11321132
    11331133            hdaStreamLock(pStream);
    … …  
    11951195    if (!pStream)
    11961196    {
    1197         AssertMsgFailed(("[SD%RU8]: Warning: Writing SDSTS on non-attached stream (0x%x)\n",
     1197        AssertMsgFailed(("[SD%RU8] Warning: Writing SDSTS on non-attached stream (0x%x)\n",
    11981198                         HDA_SD_NUM_FROM_REG(pThis, STS, iReg), u32Value));
    11991199        return hdaRegWriteU16(pThis, iReg, u32Value);
    … …  
    12571257    if (!pStream)
    12581258    {
    1259         AssertMsgFailed(("[SD%RU8]: Warning: Changing SDLVI on non-attached stream (0x%x)\n", uSD, u32Value));
     1259        AssertMsgFailed(("[SD%RU8] Warning: Changing SDLVI on non-attached stream (0x%x)\n", uSD, u32Value));
    12601260        return hdaRegWriteU16(pThis, iReg, u32Value);
    12611261    }
    … …  
    12631263    /** @todo Validate LVI. */
    12641264    pStream->u16LVI = u32Value;
    1265     LogFunc(("[SD%RU8]: Updating LVI to %RU16\n", uSD, pStream->u16LVI));
     1265    LogFunc(("[SD%RU8] Updating LVI to %RU16\n", uSD, pStream->u16LVI));
    12661266
    12671267# ifdef HDA_USE_DMA_ACCESS_HANDLER
    … …  
    12991299    if (!pStream)
    13001300    {
    1301         AssertMsgFailed(("[SD%RU8]: Warning: Changing FIFOW on non-attached stream (0x%x)\n", uSD, u32Value));
     1301        AssertMsgFailed(("[SD%RU8] Warning: Changing FIFOW on non-attached stream (0x%x)\n", uSD, u32Value));
    13021302        return hdaRegWriteU16(pThis, iReg, u32Value);
    13031303    }
    … …  
    13231323    {
    13241324        pStream->u16FIFOW = hdaSDFIFOWToBytes(u32FIFOW);
    1325         LogFunc(("[SD%RU8]: Updating FIFOW to %RU32 bytes\n", uSD, pStream->u16FIFOW));
     1325        LogFunc(("[SD%RU8] Updating FIFOW to %RU32 bytes\n", uSD, pStream->u16FIFOW));
    13261326
    13271327        int rc2 = hdaRegWriteU16(pThis, iReg, u32FIFOW);
    … …  
    13531353    if (!pStream)
    13541354    {
    1355         AssertMsgFailed(("[SD%RU8]: Warning: Changing FIFOS on non-attached stream (0x%x)\n", uSD, u32Value));
     1355        AssertMsgFailed(("[SD%RU8] Warning: Changing FIFOS on non-attached stream (0x%x)\n", uSD, u32Value));
    13561356        return hdaRegWriteU16(pThis, iReg, u32Value);
    13571357    }
    … …  
    13811381    {
    13821382        pStream->u16FIFOS = u32FIFOS + 1;
    1383         LogFunc(("[SD%RU8]: Updating FIFOS to %RU32 bytes\n", uSD, pStream->u16FIFOS));
     1383        LogFunc(("[SD%RU8] Updating FIFOS to %RU32 bytes\n", uSD, pStream->u16FIFOS));
    13841384
    13851385        int rc2 = hdaRegWriteU16(pThis, iReg, u32FIFOS);
    … …  
    16371637    if (!pStream)
    16381638    {
    1639         LogFunc(("[SD%RU8]: Warning: Changing SDFMT on non-attached stream (0x%x)\n",
     1639        LogFunc(("[SD%RU8] Warning: Changing SDFMT on non-attached stream (0x%x)\n",
    16401640                 HDA_SD_NUM_FROM_REG(pThis, FMT, iReg), u32Value));
    16411641        return hdaRegWriteU16(pThis, iReg, u32Value);
    … …  
    16941694# endif
    16951695
    1696     LogFlowFunc(("[SD%RU8]: BDLBase=0x%x\n", pStream->u8SD, pStream->u64BDLBase));
     1696    LogFlowFunc(("[SD%RU8] BDLBase=0x%x\n", pStream->u8SD, pStream->u64BDLBase));
    16971697
    16981698    return VINF_SUCCESS; /* Always return success to the MMIO handler. */

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

    r67930 r68021  
    695695#endif
    696696
    697     LogFunc(("[SD%RU8]: cStreamsActive=%RU8, rc=%Rrc\n", pStream->u8SD, pThis->cStreamsActive, rc));
     697    LogFunc(("[SD%RU8] cStreamsActive=%RU8, rc=%Rrc\n", pStream->u8SD, pThis->cStreamsActive, rc));
    698698    return rc;
    699699}
    … …  
    996996    RTThreadUserSignal(hThreadSelf);
    997997
    998     LogFunc(("[SD%RU8]: Started\n", pStream->u8SD));
     998    LogFunc(("[SD%RU8] Started\n", pStream->u8SD));
    999999
    10001000    for (;;)
    10011001    {
    1002         Log2Func(("[SD%RU8]: Waiting ...\n", pStream->u8SD));
     1002        Log2Func(("[SD%RU8] Waiting ...\n", pStream->u8SD));
    10031003
    10041004        int rc2 = RTSemEventWait(pAIO->Event, RT_INDEFINITE_WAIT);
    … …  
    10571057    }
    10581058
    1059     LogFunc(("[SD%RU8]: Ended\n", pStream->u8SD));
     1059    LogFunc(("[SD%RU8] Ended\n", pStream->u8SD));
    10601060
    10611061    ASMAtomicXchgBool(&pAIO->fStarted, false);
    … …  
    11021102        rc = VINF_SUCCESS;
    11031103
    1104     LogFunc(("[SD%RU8]: Returning %Rrc\n", pStream->u8SD, rc));
     1104    LogFunc(("[SD%RU8] Returning %Rrc\n", pStream->u8SD, rc));
    11051105    return rc;
    11061106}
    … …  
    11421142    }
    11431143
    1144     LogFunc(("[SD%RU8]: Returning %Rrc\n", pStream->u8SD, rc));
     1144    LogFunc(("[SD%RU8] Returning %Rrc\n", pStream->u8SD, rc));
    11451145    return rc;
    11461146}
    … …  
    23302330        }
    23312331
    2332         LogFlowFunc(("[SD%RU8]: cbChunk=%RU32, cbLeft=%RU32, cbTotal=%RU32, rc=%Rrc\n",
     2332        LogFlowFunc(("[SD%RU8] cbChunk=%RU32, cbLeft=%RU32, cbTotal=%RU32, rc=%Rrc\n",
    23332333                     pStream->u8SD, cbChunk, cbLeft, cbProcessedTotal, rc));
    23342334
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