Changeset 62969 in vbox for trunk/src/VBox/Devices/Audio
- Timestamp:
- Aug 4, 2016 10:22:13 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
r62605 r62969 494 494 495 495 bool fSignal = false; 496 int iIRQL ;496 int iIRQL = 0; 497 497 498 498 uint32_t new_mask = new_sr & AC97_SR_INT_MASK; … … 1388 1388 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser) 1389 1389 { 1390 RT_NOREF(pDevIns); 1390 1391 PAC97STATE pThis = (PAC97STATE)pvUser; 1391 1392 Assert(pThis == PDMINS_2_DATA(pDevIns, PAC97STATE)); … … 1395 1396 1396 1397 uint64_t cTicksNow = TMTimerGet(pTimer); 1397 uint64_t cTicksElapsed = cTicksNow - pThis->uTimerTS;1398 uint64_t cTicksPerSec = TMTimerGetFreq(pTimer);1399 1398 1400 1399 LogFlowFuncEnter(); … … 1625 1624 * @callback_method_impl{FNIOMIOPORTIN} 1626 1625 */ 1627 static DECLCALLBACK(int) ichac97IOPortNABMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, 1628 uint32_t *pu32Val, unsigned cbVal) 1629 { 1626 static DECLCALLBACK(int) ichac97IOPortNABMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32Val, unsigned cbVal) 1627 { 1628 RT_NOREF(pDevIns); 1630 1629 PAC97STATE pThis = (PAC97STATE)pvUser; 1631 1630 … … 1778 1777 uint32_t u32Val, unsigned cbVal) 1779 1778 { 1779 RT_NOREF(pDevIns); 1780 1780 PAC97STATE pThis = (PAC97STATE)pvUser; 1781 1781 … … 1918 1918 static DECLCALLBACK(int) ichac97IOPortNAMRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32Val, unsigned cbVal) 1919 1919 { 1920 RT_NOREF(pDevIns); 1920 1921 PAC97STATE pThis = (PAC97STATE)pvUser; 1921 1922 … … 1962 1963 * @callback_method_impl{FNIOMIOPORTOUT} 1963 1964 */ 1964 static DECLCALLBACK(int) ichac97IOPortNAMWrite(PPDMDEVINS pDevIns, 1965 void *pvUser, RTIOPORT Port, uint32_t u32Val, unsigned cbVal) 1966 { 1965 static DECLCALLBACK(int) ichac97IOPortNAMWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32Val, unsigned cbVal) 1966 { 1967 RT_NOREF(pDevIns); 1967 1968 PAC97STATE pThis = (PAC97STATE)pvUser; 1968 1969 … … 2098 2099 * @callback_method_impl{FNPCIIOREGIONMAP} 2099 2100 */ 2100 static DECLCALLBACK(int) ichac97IOPortMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, 2101 PCIADDRESSSPACE enmType) 2102 { 2101 static DECLCALLBACK(int) 2102 ichac97IOPortMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType) 2103 { 2104 RT_NOREF(cb, enmType); 2103 2105 PPDMDEVINS pDevIns = pPciDev->pDevIns; 2104 2106 PAC97STATE pThis = RT_FROM_MEMBER(pPciDev, AC97STATE, PciDev); … … 2143 2145 static int ichac97SaveStream(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, PAC97STREAM pStream) 2144 2146 { 2147 RT_NOREF(pDevIns); 2145 2148 PAC97BMREGS pRegs = &pStream->Regs; 2146 2149 … … 2197 2200 static int ichac97LoadStream(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, PAC97STREAM pStream) 2198 2201 { 2202 RT_NOREF(pDevIns); 2199 2203 PAC97BMREGS pRegs = &pStream->Regs; 2200 2204 … … 2401 2405 static DECLCALLBACK(int) ichac97AttachInternal(PPDMDEVINS pDevIns, PAC97DRIVER pDrv, unsigned uLUN, uint32_t fFlags) 2402 2406 { 2407 RT_NOREF(fFlags); 2403 2408 PAC97STATE pThis = PDMINS_2_DATA(pDevIns, PAC97STATE); 2404 2409 … … 2480 2485 static DECLCALLBACK(void) ichac97Detach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags) 2481 2486 { 2487 RT_NOREF(pDevIns, uLUN, fFlags); 2482 2488 LogFunc(("iLUN=%u, fFlags=0x%x\n", uLUN, fFlags)); 2483 2489 } … … 2548 2554 static DECLCALLBACK(int) ichac97Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg) 2549 2555 { 2556 RT_NOREF(iInstance); 2550 2557 PAC97STATE pThis = PDMINS_2_DATA(pDevIns, PAC97STATE); 2551 2558 … … 2587 2594 * 48 kHz rate, which is exactly what we need. Same goes for AD1981B. 2588 2595 */ 2589 bool fChipAD1980 = false;2590 2596 if (!strcmp(szCodec, "STAC9700")) 2591 2597 pThis->uCodecModel = AC97_CODEC_STAC9700;
Note:
See TracChangeset
for help on using the changeset viewer.