- Timestamp:
- Feb 11, 2013 7:26:35 PM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 83728
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp
r44639 r44640 449 449 RTGCPHYS addrMMReg; 450 450 uint32_t au32Regs[HDA_NREGS]; 451 HDABDLEDESC stInBdle;452 HDABDLEDESC stOutBdle;453 HDABDLEDESC stMicBdle;451 HDABDLEDESC StInBdle; 452 HDABDLEDESC StOutBdle; 453 HDABDLEDESC StMicBdle; 454 454 /** Interrupt on completion */ 455 455 bool fCviIoc; … … 1181 1181 case ICH6_HDA_REG_SD0CTL: 1182 1182 u8Strm = 0; 1183 pBdle = &pState-> stInBdle;1183 pBdle = &pState->StInBdle; 1184 1184 break; 1185 1185 case ICH6_HDA_REG_SD4CTL: 1186 1186 u8Strm = 4; 1187 pBdle = &pState-> stOutBdle;1187 pBdle = &pState->StOutBdle; 1188 1188 break; 1189 1189 default: … … 1715 1715 static uint32_t hdaReadAudio(INTELHDLinkState *pState, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit) 1716 1716 { 1717 PHDABDLEDESC pBdle = &pState-> stInBdle;1717 PHDABDLEDESC pBdle = &pState->StInBdle; 1718 1718 uint32_t cbTransferred = 0; 1719 1719 uint32_t cb2Copy = 0; … … 1758 1758 static uint32_t hdaWriteAudio(INTELHDLinkState *pState, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit) 1759 1759 { 1760 PHDABDLEDESC pBdle = &pState-> stOutBdle;1760 PHDABDLEDESC pBdle = &pState->StOutBdle; 1761 1761 uint32_t cbTransferred = 0; 1762 1762 uint32_t cb2Copy = 0; /* local byte counter (on local buffer) */ … … 1852 1852 { 1853 1853 u8Strm = 4; 1854 pBdle = &pState-> stOutBdle;1854 pBdle = &pState->StOutBdle; 1855 1855 break; 1856 1856 } … … 1858 1858 { 1859 1859 u8Strm = 0; 1860 pBdle = &pState-> stInBdle;1860 pBdle = &pState->StInBdle; 1861 1861 break; 1862 1862 } … … 2023 2023 2024 2024 /* Save HDA dma counters */ 2025 SSMR3PutStructEx(pSSM, &pThis-> stOutBdle, sizeof(pThis->stOutBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);2026 SSMR3PutStructEx(pSSM, &pThis-> stMicBdle, sizeof(pThis->stMicBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);2027 SSMR3PutStructEx(pSSM, &pThis-> stInBdle, sizeof(pThis->stInBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL);2025 SSMR3PutStructEx(pSSM, &pThis->StOutBdle, sizeof(pThis->StOutBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL); 2026 SSMR3PutStructEx(pSSM, &pThis->StMicBdle, sizeof(pThis->StMicBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL); 2027 SSMR3PutStructEx(pSSM, &pThis->StInBdle, sizeof(pThis->StInBdle), 0 /*fFlags*/, g_aHdaBDLEDescFields, NULL); 2028 2028 return VINF_SUCCESS; 2029 2029 } … … 2100 2100 uint32_t fFlags = uVersion <= HDA_SSM_VERSION_2 ? SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED : 0; 2101 2101 PCSSMFIELD paFields = uVersion <= HDA_SSM_VERSION_2 ? g_aHdaBDLEDescFieldsOld : g_aHdaBDLEDescFields; 2102 SSMR3GetStructEx(pSSM, &pThis-> stOutBdle, sizeof(pThis->stOutBdle), fFlags, paFields, NULL);2103 SSMR3GetStructEx(pSSM, &pThis-> stMicBdle, sizeof(pThis->stMicBdle), fFlags, paFields, NULL);2104 rc = SSMR3GetStructEx(pSSM, &pThis-> stInBdle, sizeof(pThis->stInBdle), fFlags, paFields, NULL);2102 SSMR3GetStructEx(pSSM, &pThis->StOutBdle, sizeof(pThis->StOutBdle), fFlags, paFields, NULL); 2103 SSMR3GetStructEx(pSSM, &pThis->StMicBdle, sizeof(pThis->StMicBdle), fFlags, paFields, NULL); 2104 rc = SSMR3GetStructEx(pSSM, &pThis->StInBdle, sizeof(pThis->StInBdle), fFlags, paFields, NULL); 2105 2105 AssertRCReturn(rc, rc); 2106 2106 … … 2366 2366 PHDABDLEDESC pBdle = NULL; 2367 2367 if (u8Strm == 0) 2368 pBdle = &pThis-> stInBdle;2368 pBdle = &pThis->StInBdle; 2369 2369 else if(u8Strm == 4) 2370 pBdle = &pThis-> stOutBdle;2370 pBdle = &pThis->StOutBdle; 2371 2371 else 2372 2372 {
Note:
See TracChangeset
for help on using the changeset viewer.