VirtualBox

Changeset 44644 in vbox


Ignore:
Timestamp:
Feb 11, 2013 7:50:48 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
83732
Message:

DevIchIntelHDA.cpp: index -> iReg.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r44643 r44644  
    491491static FNPDMDEVRESET hdaReset;
    492492
    493 static int hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    494 static int hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    495 static int hdaRegReadGCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    496 static int hdaRegWriteGCTL(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    497 static int hdaRegReadSTATESTS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    498 static int hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    499 static int hdaRegReadGCAP(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    500 static int hdaRegReadINTSTS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    501 static int hdaRegReadWALCLK(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    502 static int hdaRegWriteINTSTS(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    503 static int hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    504 static int hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    505 static int hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    506 static int hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    507 static int hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    508 static int hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    509 static int hdaRegWriteIRS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    510 static int hdaRegReadIRS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    511 static int hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    512 static int hdaRegReadSDCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    513 
    514 static int hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    515 static int hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    516 static int hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    517 static int hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    518 static int hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    519 static int hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    520 static int hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    521 static int hdaRegWriteBase(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    522 static int hdaRegReadU32(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    523 static int hdaRegWriteU32(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    524 static int hdaRegReadU24(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    525 static int hdaRegWriteU24(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    526 static int hdaRegReadU16(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    527 static int hdaRegWriteU16(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    528 static int hdaRegReadU8(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    529 static int hdaRegWriteU8(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     493static int hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     494static int hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     495static int hdaRegReadGCTL(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     496static int hdaRegWriteGCTL(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     497static int hdaRegReadSTATESTS(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     498static int hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     499static int hdaRegReadGCAP(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     500static int hdaRegReadINTSTS(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     501static int hdaRegReadWALCLK(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     502static int hdaRegWriteINTSTS(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     503static int hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     504static int hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     505static int hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     506static int hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     507static int hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     508static int hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     509static int hdaRegWriteIRS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     510static int hdaRegReadIRS(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     511static int hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     512static int hdaRegReadSDCTL(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     513
     514static int hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     515static int hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     516static int hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     517static int hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     518static int hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     519static int hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     520static int hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     521static int hdaRegWriteBase(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
     522static int hdaRegReadU32(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     523static int hdaRegWriteU32(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     524static int hdaRegReadU24(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     525static int hdaRegWriteU24(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     526static int hdaRegReadU16(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     527static int hdaRegWriteU16(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
     528static int hdaRegReadU8(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
     529static int hdaRegWriteU8(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
    530530
    531531DECLINLINE(void) hdaInitTransferDescriptor(PHDASTATE pThis, PHDABDLEDESC pBdle, uint8_t u8Strm,
    … …  
    553553    uint32_t    writable;
    554554    /** Read callback. */
    555     int       (*pfnRead)(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     555    int       (*pfnRead)(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
    556556    /** Write callback. */
    557     int       (*pfnWrite)(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     557    int       (*pfnWrite)(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
    558558    /** Abbreviated name. */
    559559    const char *abbrev;
    … …  
    966966/* Register access handlers. */
    967967
    968 static int hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     968static int hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
    969969{
    970970    *pu32Value = 0;
    … …  
    972972}
    973973
    974 static int hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     974static int hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    975975{
    976976    return VINF_SUCCESS;
    … …  
    978978
    979979/* U8 */
    980 static int hdaRegReadU8(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    981 {
    982     Assert(((pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable) & 0xffffff00) == 0);
    983     return hdaRegReadU32(pThis, index, pu32Value);
    984 }
    985 
    986 static int hdaRegWriteU8(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     980static int hdaRegReadU8(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     981{
     982    Assert(((pThis->au32Regs[iReg] & g_aIchIntelHDRegMap[iReg].readable) & 0xffffff00) == 0);
     983    return hdaRegReadU32(pThis, iReg, pu32Value);
     984}
     985
     986static int hdaRegWriteU8(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    987987{
    988988    Assert((u32Value & 0xffffff00) == 0);
    989     return hdaRegWriteU32(pThis, index, u32Value);
     989    return hdaRegWriteU32(pThis, iReg, u32Value);
    990990}
    991991
    992992/* U16 */
    993 static int hdaRegReadU16(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    994 {
    995     Assert(((pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable) & 0xffff0000) == 0);
    996     return hdaRegReadU32(pThis, index, pu32Value);
    997 }
    998 
    999 static int hdaRegWriteU16(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     993static int hdaRegReadU16(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     994{
     995    Assert(((pThis->au32Regs[iReg] & g_aIchIntelHDRegMap[iReg].readable) & 0xffff0000) == 0);
     996    return hdaRegReadU32(pThis, iReg, pu32Value);
     997}
     998
     999static int hdaRegWriteU16(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    10001000{
    10011001    Assert((u32Value & 0xffff0000) == 0);
    1002     return hdaRegWriteU32(pThis, index, u32Value);
     1002    return hdaRegWriteU32(pThis, iReg, u32Value);
    10031003}
    10041004
    10051005/* U24 */
    1006 static int hdaRegReadU24(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    1007 {
    1008     Assert(((pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable) & 0xff000000) == 0);
    1009     return hdaRegReadU32(pThis, index, pu32Value);
    1010 }
    1011 
    1012 static int hdaRegWriteU24(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1006static int hdaRegReadU24(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     1007{
     1008    Assert(((pThis->au32Regs[iReg] & g_aIchIntelHDRegMap[iReg].readable) & 0xff000000) == 0);
     1009    return hdaRegReadU32(pThis, iReg, pu32Value);
     1010}
     1011
     1012static int hdaRegWriteU24(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    10131013{
    10141014    Assert((u32Value & 0xff000000) == 0);
    1015     return hdaRegWriteU32(pThis, index, u32Value);
     1015    return hdaRegWriteU32(pThis, iReg, u32Value);
    10161016}
    10171017
    10181018/* U32 */
    1019 static int hdaRegReadU32(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    1020 {
    1021     *pu32Value = pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable;
     1019static int hdaRegReadU32(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     1020{
     1021    *pu32Value = pThis->au32Regs[iReg] & g_aIchIntelHDRegMap[iReg].readable;
    10221022    return VINF_SUCCESS;
    10231023}
    10241024
    1025 static int hdaRegWriteU32(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1026 {
    1027     pThis->au32Regs[index]  = (u32Value & g_aIchIntelHDRegMap[index].writable)
    1028                             | (pThis->au32Regs[index] & ~g_aIchIntelHDRegMap[index].writable);
     1025static int hdaRegWriteU32(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1026{
     1027    pThis->au32Regs[iReg]  = (u32Value & g_aIchIntelHDRegMap[iReg].writable)
     1028                           | (pThis->au32Regs[iReg] & ~g_aIchIntelHDRegMap[iReg].writable);
    10291029    return VINF_SUCCESS;
    10301030}
    10311031
    1032 static int hdaRegReadGCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    1033 {
    1034     return hdaRegReadU32(pThis, index, pu32Value);
    1035 }
    1036 
    1037 static int hdaRegWriteGCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1032static int hdaRegReadGCTL(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     1033{
     1034    return hdaRegReadU32(pThis, iReg, pu32Value);
     1035}
     1036
     1037static int hdaRegWriteGCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    10381038{
    10391039    if (u32Value & HDA_REG_FIELD_FLAG_MASK(GCTL, RST))
    … …  
    10661066}
    10671067
    1068 static int hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1069 {
    1070     uint32_t v = pThis->au32Regs[index];
     1068static int hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1069{
     1070    uint32_t v = pThis->au32Regs[iReg];
    10711071    uint32_t nv = u32Value & ICH6_HDA_STATES_SCSF;
    1072     pThis->au32Regs[index] &= ~(v & nv); /* write of 1 clears corresponding bit */
     1072    pThis->au32Regs[iReg] &= ~(v & nv); /* write of 1 clears corresponding bit */
    10731073    return VINF_SUCCESS;
    10741074}
    10751075
    1076 static int hdaRegReadINTSTS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     1076static int hdaRegReadINTSTS(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
    10771077{
    10781078    uint32_t v = 0;
    … …  
    11001100}
    11011101
    1102 static int hdaRegReadWALCLK(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     1102static int hdaRegReadWALCLK(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
    11031103{
    11041104    /* HDA spec (1a): 3.3.16 WALCLK counter ticks with 24Mhz bitclock rate. */
    … …  
    11081108}
    11091109
    1110 static int hdaRegReadGCAP(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    1111 {
    1112     return hdaRegReadU16(pThis, index, pu32Value);
    1113 }
    1114 
    1115 static int hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1110static int hdaRegReadGCAP(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     1111{
     1112    return hdaRegReadU16(pThis, iReg, pu32Value);
     1113}
     1114
     1115static int hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    11161116{
    11171117    if (u32Value & HDA_REG_FIELD_FLAG_MASK(CORBRP, RST))
    11181118        CORBRP(pThis) = 0;
    11191119    else
    1120         return hdaRegWriteU8(pThis, index, u32Value);
     1120        return hdaRegWriteU8(pThis, iReg, u32Value);
    11211121    return VINF_SUCCESS;
    11221122}
    11231123
    1124 static int hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1125 {
    1126     int rc = hdaRegWriteU8(pThis, index, u32Value);
     1124static int hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1125{
     1126    int rc = hdaRegWriteU8(pThis, iReg, u32Value);
    11271127    AssertRC(rc);
    11281128    if (   CORBWP(pThis) != CORBRP(pThis)
    … …  
    11321132}
    11331133
    1134 static int hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1134static int hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    11351135{
    11361136    uint32_t v = CORBSTS(pThis);
    … …  
    11391139}
    11401140
    1141 static int hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1141static int hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    11421142{
    11431143    int rc;
    1144     rc = hdaRegWriteU16(pThis, index, u32Value);
     1144    rc = hdaRegWriteU16(pThis, iReg, u32Value);
    11451145    if (RT_FAILURE(rc))
    11461146        AssertRCReturn(rc, rc);
    … …  
    11531153}
    11541154
    1155 static int hdaRegReadSDCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    1156 {
    1157     return hdaRegReadU24(pThis, index, pu32Value);
    1158 }
    1159 
    1160 static int hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1155static int hdaRegReadSDCTL(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
     1156{
     1157    return hdaRegReadU24(pThis, iReg, pu32Value);
     1158}
     1159
     1160static int hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    11611161{
    11621162    bool fRun     = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
    1163     bool fInRun   = RT_BOOL(HDA_REG_IND(pThis, index) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     1163    bool fInRun   = RT_BOOL(HDA_REG_IND(pThis, iReg) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
    11641164    bool fReset   = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
    1165     bool fInReset = RT_BOOL(HDA_REG_IND(pThis, index) & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
     1165    bool fInReset = RT_BOOL(HDA_REG_IND(pThis, iReg) & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
    11661166    int rc = VINF_SUCCESS;
    11671167    if (fInReset)
    … …  
    11831183        HDASTREAMTRANSFERDESC StreamDesc;
    11841184        Assert((!fInRun && !fRun));
    1185         switch (index)
     1185        switch (iReg)
    11861186        {
    11871187            case ICH6_HDA_REG_SD0CTL:
    … …  
    12081208    {
    12091209        Assert((!fReset && !fInReset));
    1210         switch (index)
     1210        switch (iReg)
    12111211        {
    12121212            case ICH6_HDA_REG_SD0CTL:
    … …  
    12231223
    12241224l_done:
    1225     rc = hdaRegWriteU24(pThis, index, u32Value);
     1225    rc = hdaRegWriteU24(pThis, iReg, u32Value);
    12261226    if (RT_FAILURE(rc))
    12271227        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    12291229}
    12301230
    1231 static int hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1232 {
    1233     uint32_t v = HDA_REG_IND(pThis, index);
     1231static int hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1232{
     1233    uint32_t v = HDA_REG_IND(pThis, iReg);
    12341234    v &= ~(u32Value & v);
    1235     HDA_REG_IND(pThis, index) = v;
     1235    HDA_REG_IND(pThis, iReg) = v;
    12361236    hdaProcessInterrupt(pThis);
    12371237    return VINF_SUCCESS;
    12381238}
    12391239
    1240 static int hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1241 {
    1242     int rc = hdaRegWriteU32(pThis, index, u32Value);
     1240static int hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1241{
     1242    int rc = hdaRegWriteU32(pThis, iReg, u32Value);
    12431243    if (RT_FAILURE(rc))
    12441244        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    12461246}
    12471247
    1248 static int hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1248static int hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    12491249{
    12501250    switch (u32Value)
    … …  
    12531253        case HDA_SDFIFOW_16B:
    12541254        case HDA_SDFIFOW_32B:
    1255             return hdaRegWriteU16(pThis, index, u32Value);
     1255            return hdaRegWriteU16(pThis, iReg, u32Value);
    12561256        default:
    12571257            Log(("hda: Attempt to store unsupported value(%x) in SDFIFOW\n", u32Value));
    1258             return hdaRegWriteU16(pThis, index, HDA_SDFIFOW_32B);
     1258            return hdaRegWriteU16(pThis, iReg, HDA_SDFIFOW_32B);
    12591259    }
    12601260    return VINF_SUCCESS;
    12611261}
    12621262
    1263 /*
    1264  * Note this method could be called for changing value on Output Streams only (ICH6 datasheet 18.2.39)
    1265  *
    1266  */
    1267 static int hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1268 {
    1269     switch (index)
     1263/**
     1264 * @note This method could be called for changing value on Output Streams
     1265 *       only (ICH6 datasheet 18.2.39)
     1266 */
     1267static int hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1268{
     1269    switch (iReg)
    12701270    {
    12711271        /* SDInFIFOS is RO, n=0-3 */
    … …  
    12871287                case HDA_SDONFIFO_128B:
    12881288                case HDA_SDONFIFO_192B:
    1289                     return hdaRegWriteU16(pThis, index, u32Value);
     1289                    return hdaRegWriteU16(pThis, iReg, u32Value);
    12901290
    12911291                case HDA_SDONFIFO_256B:
    12921292                    Log(("hda: 256-bit is unsupported, HDA is switched into 192-bit mode\n"));
    12931293                default:
    1294                     return hdaRegWriteU16(pThis, index, HDA_SDONFIFO_192B);
     1294                    return hdaRegWriteU16(pThis, iReg, HDA_SDONFIFO_192B);
    12951295            }
    12961296            return VINF_SUCCESS;
    … …  
    13591359}
    13601360
    1361 static int hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1361static int hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    13621362{
    13631363#ifdef VBOX_WITH_HDA_CODEC_EMU
    … …  
    13661366    audsettings_t as;
    13671367    /* no reason to reopen voice with same settings */
    1368     if (u32Value == HDA_REG_IND(pThis, index))
     1368    if (u32Value == HDA_REG_IND(pThis, iReg))
    13691369        return VINF_SUCCESS;
    13701370    hdaSdFmtToAudSettings(u32Value, &as);
    1371     switch (index)
     1371    switch (iReg)
    13721372    {
    13731373        case ICH6_HDA_REG_SD0FMT:
    … …  
    13781378            break;
    13791379        default:
    1380             Log(("HDA: attempt to change format on %d\n", index));
     1380            Log(("HDA: attempt to change format on %d\n", iReg));
    13811381            rc = 0;
    13821382    }
    1383     return hdaRegWriteU16(pThis, index, u32Value);
     1383    return hdaRegWriteU16(pThis, iReg, u32Value);
    13841384#else
    1385     return hdaRegWriteU16(pThis, index, u32Value);
     1385    return hdaRegWriteU16(pThis, iReg, u32Value);
    13861386#endif
    13871387}
    13881388
    1389 static int hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1390 {
    1391     int rc = hdaRegWriteU32(pThis, index, u32Value);
     1389static int hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1390{
     1391    int rc = hdaRegWriteU32(pThis, iReg, u32Value);
    13921392    if (RT_FAILURE(rc))
    13931393        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    13951395}
    13961396
    1397 static int hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1398 {
    1399     int rc = hdaRegWriteU32(pThis, index, u32Value);
     1397static int hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1398{
     1399    int rc = hdaRegWriteU32(pThis, iReg, u32Value);
    14001400    if (RT_FAILURE(rc))
    14011401        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    14031403}
    14041404
    1405 static int hdaRegReadIRS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     1405static int hdaRegReadIRS(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
    14061406{
    14071407    int rc = VINF_SUCCESS;
    … …  
    14111411        IRS(pThis) = HDA_REG_FIELD_FLAG_MASK(IRS, ICB);  /* busy */
    14121412
    1413     rc = hdaRegReadU32(pThis, index, pu32Value);
     1413    rc = hdaRegReadU32(pThis, iReg, pu32Value);
    14141414    return rc;
    14151415}
    14161416
    1417 static int hdaRegWriteIRS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1417static int hdaRegWriteIRS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    14181418{
    14191419    int rc = VINF_SUCCESS;
    … …  
    14591459}
    14601460
    1461 static int hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1461static int hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    14621462{
    14631463    if (u32Value & HDA_REG_FIELD_FLAG_MASK(RIRBWP, RST))
    … …  
    14691469}
    14701470
    1471 static int hdaRegWriteBase(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    1472 {
    1473     int rc = hdaRegWriteU32(pThis, index, u32Value);
     1471static int hdaRegWriteBase(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
     1472{
     1473    int rc = hdaRegWriteU32(pThis, iReg, u32Value);
    14741474    if (RT_FAILURE(rc))
    14751475        AssertRCReturn(rc, rc);
    1476     switch(index)
     1476    switch(iReg)
    14771477    {
    14781478        case ICH6_HDA_REG_CORBLBASE:
    14791479            pThis->u64CORBBase &= 0xFFFFFFFF00000000ULL;
    1480             pThis->u64CORBBase |= pThis->au32Regs[index];
     1480            pThis->u64CORBBase |= pThis->au32Regs[iReg];
    14811481            break;
    14821482        case ICH6_HDA_REG_CORBUBASE:
    14831483            pThis->u64CORBBase &= 0x00000000FFFFFFFFULL;
    1484             pThis->u64CORBBase |= ((uint64_t)pThis->au32Regs[index] << 32);
     1484            pThis->u64CORBBase |= ((uint64_t)pThis->au32Regs[iReg] << 32);
    14851485            break;
    14861486        case ICH6_HDA_REG_RIRLBASE:
    14871487            pThis->u64RIRBBase &= 0xFFFFFFFF00000000ULL;
    1488             pThis->u64RIRBBase |= pThis->au32Regs[index];
     1488            pThis->u64RIRBBase |= pThis->au32Regs[iReg];
    14891489            break;
    14901490        case ICH6_HDA_REG_RIRUBASE:
    14911491            pThis->u64RIRBBase &= 0x00000000FFFFFFFFULL;
    1492             pThis->u64RIRBBase |= ((uint64_t)pThis->au32Regs[index] << 32);
     1492            pThis->u64RIRBBase |= ((uint64_t)pThis->au32Regs[iReg] << 32);
    14931493            break;
    14941494        case ICH6_HDA_REG_DPLBASE:
    14951495            /* @todo: first bit has special meaning */
    14961496            pThis->u64DPBase &= 0xFFFFFFFF00000000ULL;
    1497             pThis->u64DPBase |= pThis->au32Regs[index];
     1497            pThis->u64DPBase |= pThis->au32Regs[iReg];
    14981498            break;
    14991499        case ICH6_HDA_REG_DPUBASE:
    15001500            pThis->u64DPBase &= 0x00000000FFFFFFFFULL;
    1501             pThis->u64DPBase |= ((uint64_t)pThis->au32Regs[index] << 32);
     1501            pThis->u64DPBase |= ((uint64_t)pThis->au32Regs[iReg] << 32);
    15021502            break;
    15031503        default:
    … …  
    15081508}
    15091509
    1510 static int hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1510static int hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
    15111511{
    15121512    uint8_t v = RIRBSTS(pThis);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette