Index: /trunk/include/VBox/vmm/pdmaudioifs.h =================================================================== --- /trunk/include/VBox/vmm/pdmaudioifs.h (revision 65099) +++ /trunk/include/VBox/vmm/pdmaudioifs.h (revision 65100) @@ -963,5 +963,4 @@ * @param pInterface Pointer to the interface structure containing the called function pointer. * @param pStream Pointer to audio stream. - * @param pcData Data (in audio samples) available. Optional. */ DECLR3CALLBACKMEMBER(int, pfnStreamIterate, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)); @@ -1009,4 +1008,5 @@ * @returns VBox status code. * @param pInterface Pointer to the interface structure containing the called function pointer. + * @param pStream Pointer to audio stream. * @param pcSamplesPlayed Number of samples played. Optional. */ @@ -1018,4 +1018,5 @@ * @returns VBox status code. * @param pInterface Pointer to the interface structure containing the called function pointer. + * @param pStream Pointer to audio stream. * @param pcSamplesCaptured Number of samples captured. Optional. */ @@ -1148,5 +1149,5 @@ * @returns PDMAUDIOSTRMSTS * @param pInterface Pointer to the interface structure containing the called function pointer. - * @param enmDir Audio direction to check status for. + * @param pStream Pointer to audio stream. */ DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)); Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (revision 65099) +++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (revision 65100) @@ -905,6 +905,6 @@ * @returns IPRT status code. * @param pThis AC'97 state. - * @param pStream AC'97 stream to write to. - * @param pMixSink Mixer sink to get audio data to write from. + * @param pDstStream AC'97 stream to write to. + * @param pSrcMixSink Mixer sink to get audio data to write from. * @param cbToWrite Number of bytes to write. * @param pcbWritten Number of bytes written. Optional. @@ -2361,5 +2361,5 @@ * @callback_method_impl{FNIOMIOPORTIN} */ -static DECLCALLBACK(int) ichac97IOPortNABMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32Val, unsigned cbVal) +static DECLCALLBACK(int) ichac97IOPortNABMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) { RT_NOREF(pDevIns); @@ -2367,5 +2367,5 @@ /* Get the index of the NABMBAR port. */ - const uint32_t uPortIdx = Port - pThis->IOPortBase[1]; + const uint32_t uPortIdx = uPort - pThis->IOPortBase[1]; PAC97STREAM pStream = ichac97GetStreamFromIdx(pThis, AC97_PORT2IDX(uPortIdx)); @@ -2382,5 +2382,5 @@ int rc = VINF_SUCCESS; - switch (cbVal) + switch (cb) { case 1: @@ -2391,5 +2391,5 @@ /* Codec Access Semaphore Register */ Log3Func(("CAS %d\n", pThis->cas)); - *pu32Val = pThis->cas; + *pu32 = pThis->cas; pThis->cas = 1; break; @@ -2398,6 +2398,6 @@ case MC_CIV: /* Current Index Value Register */ - *pu32Val = pRegs->civ; - Log3Func(("CIV[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->civ; + Log3Func(("CIV[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; case PI_LVI: @@ -2405,6 +2405,6 @@ case MC_LVI: /* Last Valid Index Register */ - *pu32Val = pRegs->lvi; - Log3Func(("LVI[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->lvi; + Log3Func(("LVI[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; case PI_PIV: @@ -2412,6 +2412,6 @@ case MC_PIV: /* Prefetched Index Value Register */ - *pu32Val = pRegs->piv; - Log3Func(("PIV[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->piv; + Log3Func(("PIV[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; case PI_CR: @@ -2419,6 +2419,6 @@ case MC_CR: /* Control Register */ - *pu32Val = pRegs->cr; - Log3Func(("CR[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->cr; + Log3Func(("CR[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; case PI_SR: @@ -2426,10 +2426,10 @@ case MC_SR: /* Status Register (lower part) */ - *pu32Val = RT_LO_U8(pRegs->sr); - Log3Func(("SRb[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = RT_LO_U8(pRegs->sr); + Log3Func(("SRb[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; default: - *pu32Val = UINT32_MAX; - LogFunc(("U nabm readb %#x -> %#x\n", Port, *pu32Val)); + *pu32 = UINT32_MAX; + LogFunc(("U nabm readb %#x -> %#x\n", uPort, *pu32)); break; } @@ -2445,6 +2445,6 @@ case MC_SR: /* Status Register */ - *pu32Val = pRegs->sr; - Log3Func(("SR[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->sr; + Log3Func(("SR[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; case PI_PICB: @@ -2452,10 +2452,10 @@ case MC_PICB: /* Position in Current Buffer */ - *pu32Val = pRegs->picb; - Log3Func(("PICB[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->picb; + Log3Func(("PICB[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; default: - *pu32Val = UINT32_MAX; - LogFunc(("U nabm readw %#x -> %#x\n", Port, *pu32Val)); + *pu32 = UINT32_MAX; + LogFunc(("U nabm readw %#x -> %#x\n", uPort, *pu32)); break; } @@ -2471,6 +2471,6 @@ case MC_BDBAR: /* Buffer Descriptor Base Address Register */ - *pu32Val = pRegs->bdbar; - Log3Func(("BMADDR[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32Val)); + *pu32 = pRegs->bdbar; + Log3Func(("BMADDR[%d] -> %#x\n", AC97_PORT2IDX(uPortIdx), *pu32)); break; case PI_CIV: @@ -2480,5 +2480,5 @@ * Last Valid Index Register + * Status Register */ - *pu32Val = pRegs->civ | (pRegs->lvi << 8) | (pRegs->sr << 16); /** @todo r=andy Use RT_MAKE_U32_FROM_U8. */ + *pu32 = pRegs->civ | (pRegs->lvi << 8) | (pRegs->sr << 16); /** @todo r=andy Use RT_MAKE_U32_FROM_U8. */ Log3Func(("CIV LVI SR[%d] -> %#x, %#x, %#x\n", AC97_PORT2IDX(uPortIdx), pRegs->civ, pRegs->lvi, pRegs->sr)); @@ -2490,21 +2490,21 @@ * Prefetched Index Value Register + * Control Register */ - *pu32Val = pRegs->picb | (pRegs->piv << 16) | (pRegs->cr << 24); /** @todo r=andy Use RT_MAKE_U32_FROM_U8. */ + *pu32 = pRegs->picb | (pRegs->piv << 16) | (pRegs->cr << 24); /** @todo r=andy Use RT_MAKE_U32_FROM_U8. */ Log3Func(("PICB PIV CR[%d] -> %#x %#x %#x %#x\n", - AC97_PORT2IDX(uPortIdx), *pu32Val, pRegs->picb, pRegs->piv, pRegs->cr)); + AC97_PORT2IDX(uPortIdx), *pu32, pRegs->picb, pRegs->piv, pRegs->cr)); break; case AC97_GLOB_CNT: /* Global Control */ - *pu32Val = pThis->glob_cnt; - Log3Func(("glob_cnt -> %#x\n", *pu32Val)); + *pu32 = pThis->glob_cnt; + Log3Func(("glob_cnt -> %#x\n", *pu32)); break; case AC97_GLOB_STA: /* Global Status */ - *pu32Val = pThis->glob_sta | AC97_GS_S0CR; - Log3Func(("glob_sta -> %#x\n", *pu32Val)); + *pu32 = pThis->glob_sta | AC97_GS_S0CR; + Log3Func(("glob_sta -> %#x\n", *pu32)); break; default: - *pu32Val = UINT32_MAX; - LogFunc(("U nabm readl %#x -> %#x\n", Port, *pu32Val)); + *pu32 = UINT32_MAX; + LogFunc(("U nabm readl %#x -> %#x\n", uPort, *pu32)); break; } @@ -2531,6 +2531,6 @@ * @callback_method_impl{FNIOMIOPORTOUT} */ -static DECLCALLBACK(int) ichac97IOPortNABMWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, - uint32_t u32Val, unsigned cbVal) +static DECLCALLBACK(int) ichac97IOPortNABMWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, + uint32_t u32, unsigned cb) { RT_NOREF(pDevIns); @@ -2538,5 +2538,5 @@ /* Get the index of the NABMBAR register. */ - const uint32_t uPortIdx = Port - pThis->IOPortBase[1]; + const uint32_t uPortIdx = uPort - pThis->IOPortBase[1]; PAC97STREAM pStream = ichac97GetStreamFromIdx(pThis, AC97_PORT2IDX(uPortIdx)); @@ -2551,5 +2551,5 @@ } - switch (cbVal) + switch (cb) { case 1: @@ -2573,6 +2573,6 @@ ichac97StreamFetchBDLE(pThis, pStream); } - pRegs->lvi = u32Val % 32; - Log3Func(("[SD%RU8] LVI <- %#x\n", pStream->u8Strm, u32Val)); + pRegs->lvi = u32 % 32; + Log3Func(("[SD%RU8] LVI <- %#x\n", pStream->u8Strm, u32)); break; } @@ -2585,7 +2585,7 @@ case MC_CR: { - Log3Func(("[SD%RU8] CR <- %#x (cr %#x)\n", pStream->u8Strm, u32Val, pRegs->cr)); - - if (u32Val & AC97_CR_RR) /* Busmaster reset. */ + Log3Func(("[SD%RU8] CR <- %#x (cr %#x)\n", pStream->u8Strm, u32, pRegs->cr)); + + if (u32 & AC97_CR_RR) /* Busmaster reset. */ { Log3Func(("[SD%RU8] Reset\n", pStream->u8Strm)); @@ -2598,5 +2598,5 @@ else { - pRegs->cr = u32Val & AC97_CR_VALID_MASK; + pRegs->cr = u32 & AC97_CR_VALID_MASK; if (!(pRegs->cr & AC97_CR_RPBM)) @@ -2633,12 +2633,12 @@ case MC_SR: { - pRegs->sr |= u32Val & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK); - ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32Val & AC97_SR_WCLEAR_MASK)); - Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8Strm, u32Val, pRegs->sr)); + pRegs->sr |= u32 & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK); + ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32 & AC97_SR_WCLEAR_MASK)); + Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8Strm, u32, pRegs->sr)); break; } default: - LogFunc(("Unimplemented: %#x <- %#x (Byte)\n", Port, u32Val)); + LogFunc(("Unimplemented: %#x <- %#x (Byte)\n", uPort, u32)); break; } @@ -2654,10 +2654,10 @@ case MC_SR: /* Status Register */ - pRegs->sr |= u32Val & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK); - ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32Val & AC97_SR_WCLEAR_MASK)); - Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8Strm, u32Val, pRegs->sr)); + pRegs->sr |= u32 & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK); + ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32 & AC97_SR_WCLEAR_MASK)); + Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8Strm, u32, pRegs->sr)); break; default: - LogFunc(("Unimplemented: %#x <- %#x (Word)\n", Port, u32Val)); + LogFunc(("Unimplemented: %#x <- %#x (Word)\n", uPort, u32)); break; } @@ -2673,25 +2673,25 @@ case MC_BDBAR: /* Buffer Descriptor list Base Address Register */ - pRegs->bdbar = u32Val & ~3; - Log3Func(("[SD%RU8] BDBAR <- %#x (bdbar %#x)\n", AC97_PORT2IDX(uPortIdx), u32Val, pRegs->bdbar)); + pRegs->bdbar = u32 & ~3; + Log3Func(("[SD%RU8] BDBAR <- %#x (bdbar %#x)\n", AC97_PORT2IDX(uPortIdx), u32, pRegs->bdbar)); break; case AC97_GLOB_CNT: /* Global Control */ - if (u32Val & AC97_GC_WR) + if (u32 & AC97_GC_WR) ichac97WarmReset(pThis); - if (u32Val & AC97_GC_CR) + if (u32 & AC97_GC_CR) ichac97ColdReset(pThis); - if (!(u32Val & (AC97_GC_WR | AC97_GC_CR))) - pThis->glob_cnt = u32Val & AC97_GC_VALID_MASK; - Log3Func(("glob_cnt <- %#x (glob_cnt %#x)\n", u32Val, pThis->glob_cnt)); + if (!(u32 & (AC97_GC_WR | AC97_GC_CR))) + pThis->glob_cnt = u32 & AC97_GC_VALID_MASK; + Log3Func(("glob_cnt <- %#x (glob_cnt %#x)\n", u32, pThis->glob_cnt)); break; case AC97_GLOB_STA: /* Global Status */ - pThis->glob_sta &= ~(u32Val & AC97_GS_WCLEAR_MASK); - pThis->glob_sta |= (u32Val & ~(AC97_GS_WCLEAR_MASK | AC97_GS_RO_MASK)) & AC97_GS_VALID_MASK; - Log3Func(("glob_sta <- %#x (glob_sta %#x)\n", u32Val, pThis->glob_sta)); + pThis->glob_sta &= ~(u32 & AC97_GS_WCLEAR_MASK); + pThis->glob_sta |= (u32 & ~(AC97_GS_WCLEAR_MASK | AC97_GS_RO_MASK)) & AC97_GS_VALID_MASK; + Log3Func(("glob_sta <- %#x (glob_sta %#x)\n", u32, pThis->glob_sta)); break; default: - LogFunc(("Unimplemented: %#x <- %#x (DWord)\n", Port, u32Val)); + LogFunc(("Unimplemented: %#x <- %#x (DWord)\n", uPort, u32)); break; } @@ -2700,5 +2700,5 @@ default: - AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cbVal, u32Val)); + AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", uPort, cb, u32)); break; } @@ -2716,5 +2716,5 @@ * @callback_method_impl{FNIOMIOPORTIN} */ -static DECLCALLBACK(int) ichac97IOPortNAMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32Val, unsigned cbVal) +static DECLCALLBACK(int) ichac97IOPortNAMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) { RT_NOREF(pDevIns); @@ -2723,11 +2723,11 @@ int rc = VINF_SUCCESS; - switch (cbVal) + switch (cb) { case 1: { - Log3Func(("U nam readb %#x\n", Port)); + Log3Func(("U nam readb %#x\n", uPort)); pThis->cas = 0; - *pu32Val = UINT32_MAX; + *pu32 = UINT32_MAX; break; } @@ -2735,12 +2735,12 @@ case 2: { - uint32_t index = Port - pThis->IOPortBase[0]; - *pu32Val = UINT32_MAX; + uint32_t index = uPort - pThis->IOPortBase[0]; + *pu32 = UINT32_MAX; pThis->cas = 0; switch (index) { default: - *pu32Val = ichac97MixerGet(pThis, index); - Log3Func(("nam readw %#x -> %#x\n", Port, *pu32Val)); + *pu32 = ichac97MixerGet(pThis, index); + Log3Func(("nam readw %#x -> %#x\n", uPort, *pu32)); break; } @@ -2750,7 +2750,7 @@ case 4: { - Log3Func(("U nam readl %#x\n", Port)); + Log3Func(("U nam readl %#x\n", uPort)); pThis->cas = 0; - *pu32Val = UINT32_MAX; + *pu32 = UINT32_MAX; break; } @@ -2769,14 +2769,14 @@ * @callback_method_impl{FNIOMIOPORTOUT} */ -static DECLCALLBACK(int) ichac97IOPortNAMWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32Val, unsigned cbVal) +static DECLCALLBACK(int) ichac97IOPortNAMWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) { RT_NOREF(pDevIns); PAC97STATE pThis = (PAC97STATE)pvUser; - switch (cbVal) + switch (cb) { case 1: { - Log3Func(("U nam writeb %#x <- %#x\n", Port, u32Val)); + Log3Func(("U nam writeb %#x <- %#x\n", uPort, u32)); pThis->cas = 0; break; @@ -2785,5 +2785,5 @@ case 2: { - uint32_t index = Port - pThis->IOPortBase[0]; + uint32_t index = uPort - pThis->IOPortBase[0]; pThis->cas = 0; switch (index) @@ -2793,7 +2793,7 @@ break; case AC97_Powerdown_Ctrl_Stat: - u32Val &= ~0xf; - u32Val |= ichac97MixerGet(pThis, index) & 0xf; - ichac97MixerSet(pThis, index, u32Val); + u32 &= ~0xf; + u32 |= ichac97MixerGet(pThis, index) & 0xf; + ichac97MixerSet(pThis, index, u32); break; case AC97_Master_Volume_Mute: @@ -2803,5 +2803,5 @@ break; /* Register controls surround (rear), do nothing. */ } - ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32Val); + ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32); break; case AC97_Headphone_Volume_Mute: @@ -2811,26 +2811,26 @@ { /* Register controls PCM (front) outputs. */ - ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32Val); + ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME_MASTER, u32); } } break; case AC97_PCM_Out_Volume_Mute: - ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_FRONT, u32Val); + ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_FRONT, u32); break; case AC97_Line_In_Volume_Mute: - ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_LINE_IN, u32Val); + ichac97MixerSetVolume(pThis, index, PDMAUDIOMIXERCTL_LINE_IN, u32); break; case AC97_Record_Select: - ichac97MixerRecordSelect(pThis, u32Val); + ichac97MixerRecordSelect(pThis, u32); break; case AC97_Vendor_ID1: case AC97_Vendor_ID2: - LogFunc(("Attempt to write vendor ID to %#x\n", u32Val)); + LogFunc(("Attempt to write vendor ID to %#x\n", u32)); break; case AC97_Extended_Audio_ID: - LogFunc(("Attempt to write extended audio ID to %#x\n", u32Val)); + LogFunc(("Attempt to write extended audio ID to %#x\n", u32)); break; case AC97_Extended_Audio_Ctrl_Stat: - if (!(u32Val & AC97_EACS_VRA)) + if (!(u32 & AC97_EACS_VRA)) { ichac97MixerSet(pThis, AC97_PCM_Front_DAC_Rate, 48000); @@ -2843,5 +2843,5 @@ LogRel2(("AC97: Variable rate audio (VRA) is not supported\n")); - if (!(u32Val & AC97_EACS_VRM)) + if (!(u32 & AC97_EACS_VRM)) { ichac97MixerSet(pThis, AC97_MIC_ADC_Rate, 48000); @@ -2851,40 +2851,40 @@ LogRel2(("AC97: Variable rate microphone audio (VRM) is not supported\n")); - LogFunc(("Setting extended audio control to %#x\n", u32Val)); - ichac97MixerSet(pThis, AC97_Extended_Audio_Ctrl_Stat, u32Val); + LogFunc(("Setting extended audio control to %#x\n", u32)); + ichac97MixerSet(pThis, AC97_Extended_Audio_Ctrl_Stat, u32); break; case AC97_PCM_Front_DAC_Rate: if (ichac97MixerGet(pThis, AC97_Extended_Audio_Ctrl_Stat) & AC97_EACS_VRA) { - ichac97MixerSet(pThis, index, u32Val); - LogFunc(("Set front DAC rate to %RU32\n", u32Val)); + ichac97MixerSet(pThis, index, u32); + LogFunc(("Set front DAC rate to %RU32\n", u32)); ichac97StreamReOpen(pThis, &pThis->StreamOut); } else - AssertMsgFailed(("Attempt to set front DAC rate to %RU32, but VRA is not set\n", u32Val)); + AssertMsgFailed(("Attempt to set front DAC rate to %RU32, but VRA is not set\n", u32)); break; case AC97_MIC_ADC_Rate: if (ichac97MixerGet(pThis, AC97_Extended_Audio_Ctrl_Stat) & AC97_EACS_VRM) { - ichac97MixerSet(pThis, index, u32Val); - LogFunc(("Set MIC ADC rate to %RU32\n", u32Val)); + ichac97MixerSet(pThis, index, u32); + LogFunc(("Set MIC ADC rate to %RU32\n", u32)); ichac97StreamReOpen(pThis, &pThis->StreamMicIn); } else - AssertMsgFailed(("Attempt to set MIC ADC rate to %RU32, but VRM is not set\n", u32Val)); + AssertMsgFailed(("Attempt to set MIC ADC rate to %RU32, but VRM is not set\n", u32)); break; case AC97_PCM_LR_ADC_Rate: if (ichac97MixerGet(pThis, AC97_Extended_Audio_Ctrl_Stat) & AC97_EACS_VRA) { - ichac97MixerSet(pThis, index, u32Val); - LogFunc(("Set front LR ADC rate to %RU32\n", u32Val)); + ichac97MixerSet(pThis, index, u32); + LogFunc(("Set front LR ADC rate to %RU32\n", u32)); ichac97StreamReOpen(pThis, &pThis->StreamLineIn); } else - AssertMsgFailed(("Attempt to set LR ADC rate to %RU32, but VRA is not set\n", u32Val)); + AssertMsgFailed(("Attempt to set LR ADC rate to %RU32, but VRA is not set\n", u32)); break; default: - LogFunc(("U nam writew %#x <- %#x\n", Port, u32Val)); - ichac97MixerSet(pThis, index, u32Val); + LogFunc(("U nam writew %#x <- %#x\n", uPort, u32)); + ichac97MixerSet(pThis, index, u32); break; } @@ -2894,5 +2894,5 @@ case 4: { - Log3Func(("U nam writel %#x <- %#x\n", Port, u32Val)); + Log3Func(("U nam writel %#x <- %#x\n", uPort, u32)); pThis->cas = 0; break; @@ -2900,5 +2900,5 @@ default: - AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cbVal, u32Val)); + AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", uPort, cb, u32)); break; } Index: /trunk/src/VBox/Devices/Audio/DrvAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvAudio.cpp (revision 65099) +++ /trunk/src/VBox/Devices/Audio/DrvAudio.cpp (revision 65100) @@ -1193,5 +1193,5 @@ */ static DECLCALLBACK(int) drvAudioStreamPlay(PPDMIAUDIOCONNECTOR pInterface, - PPDMAUDIOSTREAM pStream, uint32_t *pcsPlayed) + PPDMAUDIOSTREAM pStream, uint32_t *pcSamplesPlayed) { AssertPtrReturn(pInterface, VERR_INVALID_POINTER); @@ -1295,6 +1295,6 @@ if (RT_SUCCESS(rc)) { - if (pcsPlayed) - *pcsPlayed = csPlayed; + if (pcSamplesPlayed) + *pcSamplesPlayed = csPlayed; } @@ -2592,7 +2592,7 @@ * @copydoc FNPDMDRVCONSTRUCT */ -static DECLCALLBACK(int) drvAudioConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags) -{ - LogFlowFunc(("pDrvIns=%#p, pCfgHandle=%#p, fFlags=%x\n", pDrvIns, pCfgHandle, fFlags)); +static DECLCALLBACK(int) drvAudioConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags) +{ + LogFlowFunc(("pDrvIns=%#p, pCfgHandle=%#p, fFlags=%x\n", pDrvIns, pCfg, fFlags)); PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO); @@ -2654,5 +2654,5 @@ } - rc = drvAudioInit(pDrvIns, pCfgHandle); + rc = drvAudioInit(pDrvIns, pCfg); if (RT_SUCCESS(rc)) { Index: /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (revision 65099) +++ /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (revision 65100) @@ -1676,5 +1676,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream) Index: /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (revision 65099) +++ /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (revision 65100) @@ -1932,5 +1932,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamCapture} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture} */ static DECLCALLBACK(int) drvHostCoreAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, @@ -2059,5 +2059,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamPlay} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay} */ static DECLCALLBACK(int) drvHostCoreAudioStreamPlay(PPDMIHOSTAUDIO pInterface, @@ -2249,5 +2249,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnGetConfig} + * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig} */ static DECLCALLBACK(int) drvHostCoreAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg) @@ -2270,5 +2270,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnGetDevices} + * @interface_method_impl{PDMIHOSTAUDIO,pfnGetDevices} */ static DECLCALLBACK(int) drvHostCoreAudioGetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIODEVICEENUM pDeviceEnum) @@ -2307,5 +2307,5 @@ #ifdef VBOX_WITH_AUDIO_CALLBACKS /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnSetCallback} + * @interface_method_impl{PDMIHOSTAUDIO,pfnSetCallback} */ static DECLCALLBACK(int) drvHostCoreAudioSetCallback(PPDMIHOSTAUDIO pInterface, PFNPDMHOSTAUDIOCALLBACK pfnCallback) @@ -2342,5 +2342,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamGetStatus} + * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus} */ static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostCoreAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir) @@ -2354,5 +2354,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamCreate} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate} */ static DECLCALLBACK(int) drvHostCoreAudioStreamCreate(PPDMIHOSTAUDIO pInterface, @@ -2428,5 +2428,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamDestroy} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy} */ static DECLCALLBACK(int) drvHostCoreAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream) @@ -2475,5 +2475,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamControl} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl} */ static DECLCALLBACK(int) drvHostCoreAudioStreamControl(PPDMIHOSTAUDIO pInterface, @@ -2494,5 +2494,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamGetStatus} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream) @@ -2528,5 +2528,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamIterate} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate} */ static DECLCALLBACK(int) drvHostCoreAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream) @@ -2541,5 +2541,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnInit} + * @interface_method_impl{PDMIHOSTAUDIO,pfnInit} */ static DECLCALLBACK(int) drvHostCoreAudioInit(PPDMIHOSTAUDIO pInterface) @@ -2584,5 +2584,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO, pfnShutdown} + * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown} */ static DECLCALLBACK(void) drvHostCoreAudioShutdown(PPDMIHOSTAUDIO pInterface) Index: /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (revision 65099) +++ /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (revision 65100) @@ -1502,5 +1502,5 @@ /** - * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetConfig} + * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate} */ static DECLCALLBACK(int) drvHostPulseAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream) @@ -1536,5 +1536,5 @@ * Destructs a PulseAudio Audio driver instance. * - * @copydoc FNPDMDRVCONSTRUCT + * @copydoc FNPDMDRVDESTRUCT */ static DECLCALLBACK(void) drvHostPulseAudioDestruct(PPDMDRVINS pDrvIns)