VirtualBox

Changeset 44642 in vbox for trunk/src/VBox/Devices/Audio


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

DevIchIntelHDA.cpp: drop the offset argument to the register read/write methods - nobody's using it.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r44641 r44642  
    493493/** @todo r=bird: Why aren't these static? And why use DECLCALLBACK for
    494494 *        internal functions? */
    495 DECLCALLBACK(int) hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    496 DECLCALLBACK(int) hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    497 DECLCALLBACK(int) hdaRegReadGCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    498 DECLCALLBACK(int) hdaRegWriteGCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    499 DECLCALLBACK(int) hdaRegReadSTATESTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    500 DECLCALLBACK(int) hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    501 DECLCALLBACK(int) hdaRegReadGCAP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    502 DECLCALLBACK(int) hdaRegReadINTSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    503 DECLCALLBACK(int) hdaRegReadWALCLK(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    504 DECLCALLBACK(int) hdaRegWriteINTSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    505 DECLCALLBACK(int) hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    506 DECLCALLBACK(int) hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    507 DECLCALLBACK(int) hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    508 DECLCALLBACK(int) hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    509 DECLCALLBACK(int) hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    510 DECLCALLBACK(int) hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    511 DECLCALLBACK(int) hdaRegWriteIRS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    512 DECLCALLBACK(int) hdaRegReadIRS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    513 DECLCALLBACK(int) hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    514 DECLCALLBACK(int) hdaRegReadSDCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    515 
    516 DECLCALLBACK(int) hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    517 DECLCALLBACK(int) hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    518 DECLCALLBACK(int) hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    519 DECLCALLBACK(int) hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    520 DECLCALLBACK(int) hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    521 DECLCALLBACK(int) hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    522 DECLCALLBACK(int) hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    523 DECLCALLBACK(int) hdaRegWriteBase(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
    524 DECLCALLBACK(int) hdaRegReadU32(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    525 DECLCALLBACK(int) hdaRegWriteU32(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    526 DECLCALLBACK(int) hdaRegReadU24(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    527 DECLCALLBACK(int) hdaRegWriteU24(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    528 DECLCALLBACK(int) hdaRegReadU16(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    529 DECLCALLBACK(int) hdaRegWriteU16(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
    530 DECLCALLBACK(int) hdaRegReadU8(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
    531 DECLCALLBACK(int) hdaRegWriteU8(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t pu32Value);
     495DECLCALLBACK(int) hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     496DECLCALLBACK(int) hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     497DECLCALLBACK(int) hdaRegReadGCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     498DECLCALLBACK(int) hdaRegWriteGCTL(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     499DECLCALLBACK(int) hdaRegReadSTATESTS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     500DECLCALLBACK(int) hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     501DECLCALLBACK(int) hdaRegReadGCAP(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     502DECLCALLBACK(int) hdaRegReadINTSTS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     503DECLCALLBACK(int) hdaRegReadWALCLK(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     504DECLCALLBACK(int) hdaRegWriteINTSTS(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     505DECLCALLBACK(int) hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     506DECLCALLBACK(int) hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     507DECLCALLBACK(int) hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     508DECLCALLBACK(int) hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     509DECLCALLBACK(int) hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     510DECLCALLBACK(int) hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     511DECLCALLBACK(int) hdaRegWriteIRS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     512DECLCALLBACK(int) hdaRegReadIRS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     513DECLCALLBACK(int) hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     514DECLCALLBACK(int) hdaRegReadSDCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     515
     516DECLCALLBACK(int) hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     517DECLCALLBACK(int) hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     518DECLCALLBACK(int) hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     519DECLCALLBACK(int) hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     520DECLCALLBACK(int) hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     521DECLCALLBACK(int) hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     522DECLCALLBACK(int) hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     523DECLCALLBACK(int) hdaRegWriteBase(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
     524DECLCALLBACK(int) hdaRegReadU32(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     525DECLCALLBACK(int) hdaRegWriteU32(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     526DECLCALLBACK(int) hdaRegReadU24(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     527DECLCALLBACK(int) hdaRegWriteU24(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     528DECLCALLBACK(int) hdaRegReadU16(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     529DECLCALLBACK(int) hdaRegWriteU16(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
     530DECLCALLBACK(int) hdaRegReadU8(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
     531DECLCALLBACK(int) hdaRegWriteU8(PHDASTATE pThis, uint32_t index, uint32_t pu32Value);
    532532
    533533DECLINLINE(void) hdaInitTransferDescriptor(PHDASTATE pThis, PHDABDLEDESC pBdle, uint8_t u8Strm,
    … …  
    555555    uint32_t    writable;
    556556    /** Read callback. */
    557     int       (*pfnRead)(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value);
     557    int       (*pfnRead)(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value);
    558558    /** Write callback. */
    559     int       (*pfnWrite)(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value);
     559    int       (*pfnWrite)(PHDASTATE pThis, uint32_t index, uint32_t u32Value);
    560560    /** Abbreviated name. */
    561561    const char *abbrev;
    … …  
    966966
    967967
    968 DECLCALLBACK(int) hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     968DECLCALLBACK(int) hdaRegReadUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    969969{
    970970    *pu32Value = 0;
    971971    return VINF_SUCCESS;
    972972}
    973 DECLCALLBACK(int) hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     973
     974DECLCALLBACK(int) hdaRegWriteUnimplemented(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    974975{
    975976    return VINF_SUCCESS;
    976977}
     978
    977979/* U8 */
    978 DECLCALLBACK(int) hdaRegReadU8(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     980DECLCALLBACK(int) hdaRegReadU8(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    979981{
    980982    Assert(((pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable) & 0xffffff00) == 0);
    981     return hdaRegReadU32(pThis, offset, index, pu32Value);
    982 }
    983 
    984 DECLCALLBACK(int) hdaRegWriteU8(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    985 {
    986     Assert(((u32Value & 0xffffff00) == 0));
    987     return hdaRegWriteU32(pThis, offset, index, u32Value);
    988 }
     983    return hdaRegReadU32(pThis, index, pu32Value);
     984}
     985
     986DECLCALLBACK(int) hdaRegWriteU8(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     987{
     988    Assert((u32Value & 0xffffff00) == 0);
     989    return hdaRegWriteU32(pThis, index, u32Value);
     990}
     991
    989992/* U16 */
    990 DECLCALLBACK(int) hdaRegReadU16(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     993DECLCALLBACK(int) hdaRegReadU16(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    991994{
    992995    Assert(((pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable) & 0xffff0000) == 0);
    993     return hdaRegReadU32(pThis, offset, index, pu32Value);
    994 }
    995 
    996 DECLCALLBACK(int) hdaRegWriteU16(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    997 {
    998     Assert(((u32Value & 0xffff0000) == 0));
    999     return hdaRegWriteU32(pThis, offset, index, u32Value);
     996    return hdaRegReadU32(pThis, index, pu32Value);
     997}
     998
     999DECLCALLBACK(int) hdaRegWriteU16(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1000{
     1001    Assert((u32Value & 0xffff0000) == 0);
     1002    return hdaRegWriteU32(pThis, index, u32Value);
    10001003}
    10011004
    10021005/* U24 */
    1003 DECLCALLBACK(int) hdaRegReadU24(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     1006DECLCALLBACK(int) hdaRegReadU24(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    10041007{
    10051008    Assert(((pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable) & 0xff000000) == 0);
    1006     return hdaRegReadU32(pThis, offset, index, pu32Value);
    1007 }
    1008 
    1009 DECLCALLBACK(int) hdaRegWriteU24(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    1010 {
    1011     Assert(((u32Value & 0xff000000) == 0));
    1012     return hdaRegWriteU32(pThis, offset, index, u32Value);
    1013 }
     1009    return hdaRegReadU32(pThis, index, pu32Value);
     1010}
     1011
     1012DECLCALLBACK(int) hdaRegWriteU24(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1013{
     1014    Assert((u32Value & 0xff000000) == 0);
     1015    return hdaRegWriteU32(pThis, index, u32Value);
     1016}
     1017
    10141018/* U32 */
    1015 DECLCALLBACK(int) hdaRegReadU32(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     1019DECLCALLBACK(int) hdaRegReadU32(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    10161020{
    10171021    *pu32Value = pThis->au32Regs[index] & g_aIchIntelHDRegMap[index].readable;
    … …  
    10191023}
    10201024
    1021 DECLCALLBACK(int) hdaRegWriteU32(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1025DECLCALLBACK(int) hdaRegWriteU32(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    10221026{
    10231027    pThis->au32Regs[index]  = (u32Value & g_aIchIntelHDRegMap[index].writable)
    1024                                   | (pThis->au32Regs[index] & ~g_aIchIntelHDRegMap[index].writable);
     1028                            | (pThis->au32Regs[index] & ~g_aIchIntelHDRegMap[index].writable);
    10251029    return VINF_SUCCESS;
    10261030}
    10271031
    1028 DECLCALLBACK(int) hdaRegReadGCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
    1029 {
    1030     return hdaRegReadU32(pThis, offset, index, pu32Value);
    1031 }
    1032 
    1033 DECLCALLBACK(int) hdaRegWriteGCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1032DECLCALLBACK(int) hdaRegReadGCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     1033{
     1034    return hdaRegReadU32(pThis, index, pu32Value);
     1035}
     1036
     1037DECLCALLBACK(int) hdaRegWriteGCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    10341038{
    10351039    if (u32Value & HDA_REG_FIELD_FLAG_MASK(GCTL, RST))
    … …  
    10621066}
    10631067
    1064 DECLCALLBACK(int) hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1068DECLCALLBACK(int) hdaRegWriteSTATESTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    10651069{
    10661070    uint32_t v = pThis->au32Regs[index];
    … …  
    10701074}
    10711075
    1072 DECLCALLBACK(int) hdaRegReadINTSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     1076DECLCALLBACK(int) hdaRegReadINTSTS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    10731077{
    10741078    uint32_t v = 0;
    … …  
    10961100}
    10971101
    1098 DECLCALLBACK(int) hdaRegReadWALCLK(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     1102DECLCALLBACK(int) hdaRegReadWALCLK(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    10991103{
    11001104    /* HDA spec (1a): 3.3.16 WALCLK counter ticks with 24Mhz bitclock rate. */
    … …  
    11041108}
    11051109
    1106 DECLCALLBACK(int) hdaRegReadGCAP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
    1107 {
    1108     return hdaRegReadU16(pThis, offset, index, pu32Value);
    1109 }
    1110 
    1111 DECLCALLBACK(int) hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1110DECLCALLBACK(int) hdaRegReadGCAP(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     1111{
     1112    return hdaRegReadU16(pThis, index, pu32Value);
     1113}
     1114
     1115DECLCALLBACK(int) hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    11121116{
    11131117    if (u32Value & HDA_REG_FIELD_FLAG_MASK(CORBRP, RST))
    11141118        CORBRP(pThis) = 0;
    11151119    else
    1116         return hdaRegWriteU8(pThis, offset, index, u32Value);
     1120        return hdaRegWriteU8(pThis, index, u32Value);
    11171121    return VINF_SUCCESS;
    11181122}
    11191123
    1120 DECLCALLBACK(int) hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    1121 {
    1122     int rc = hdaRegWriteU8(pThis, offset, index, u32Value);
     1124DECLCALLBACK(int) hdaRegWriteCORBCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1125{
     1126    int rc = hdaRegWriteU8(pThis, index, u32Value);
    11231127    AssertRC(rc);
    11241128    if (   CORBWP(pThis) != CORBRP(pThis)
    … …  
    11281132}
    11291133
    1130 DECLCALLBACK(int) hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1134DECLCALLBACK(int) hdaRegWriteCORBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    11311135{
    11321136    uint32_t v = CORBSTS(pThis);
    … …  
    11351139}
    11361140
    1137 DECLCALLBACK(int) hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1141DECLCALLBACK(int) hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    11381142{
    11391143    int rc;
    1140     rc = hdaRegWriteU16(pThis, offset, index, u32Value);
     1144    rc = hdaRegWriteU16(pThis, index, u32Value);
    11411145    if (RT_FAILURE(rc))
    11421146        AssertRCReturn(rc, rc);
    … …  
    11491153}
    11501154
    1151 DECLCALLBACK(int) hdaRegReadSDCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
    1152 {
    1153     return hdaRegReadU24(pThis, offset, index, pu32Value);
    1154 }
    1155 
    1156 DECLCALLBACK(int) hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1155DECLCALLBACK(int) hdaRegReadSDCTL(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
     1156{
     1157    return hdaRegReadU24(pThis, index, pu32Value);
     1158}
     1159
     1160DECLCALLBACK(int) hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    11571161{
    11581162    bool fRun     = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
    … …  
    12191223
    12201224l_done:
    1221     rc = hdaRegWriteU24(pThis, offset, index, u32Value);
     1225    rc = hdaRegWriteU24(pThis, index, u32Value);
    12221226    if (RT_FAILURE(rc))
    12231227        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    12251229}
    12261230
    1227 DECLCALLBACK(int) hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1231DECLCALLBACK(int) hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    12281232{
    12291233    uint32_t v = HDA_REG_IND(pThis, index);
    … …  
    12341238}
    12351239
    1236 DECLCALLBACK(int) hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    1237 {
    1238     int rc = hdaRegWriteU32(pThis, offset, index, u32Value);
     1240DECLCALLBACK(int) hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1241{
     1242    int rc = hdaRegWriteU32(pThis, index, u32Value);
    12391243    if (RT_FAILURE(rc))
    12401244        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    12421246}
    12431247
    1244 DECLCALLBACK(int) hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1248DECLCALLBACK(int) hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    12451249{
    12461250    switch (u32Value)
    … …  
    12491253        case HDA_SDFIFOW_16B:
    12501254        case HDA_SDFIFOW_32B:
    1251             return hdaRegWriteU16(pThis, offset, index, u32Value);
     1255            return hdaRegWriteU16(pThis, index, u32Value);
    12521256        default:
    12531257            Log(("hda: Attempt to store unsupported value(%x) in SDFIFOW\n", u32Value));
    1254             return hdaRegWriteU16(pThis, offset, index, HDA_SDFIFOW_32B);
     1258            return hdaRegWriteU16(pThis, index, HDA_SDFIFOW_32B);
    12551259    }
    12561260    return VINF_SUCCESS;
    12571261}
     1262
    12581263/*
    12591264 * Note this method could be called for changing value on Output Streams only (ICH6 datasheet 18.2.39)
    12601265 *
    12611266 */
    1262 DECLCALLBACK(int) hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1267DECLCALLBACK(int) hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    12631268{
    12641269    switch (index)
    … …  
    12821287                case HDA_SDONFIFO_128B:
    12831288                case HDA_SDONFIFO_192B:
    1284                     return hdaRegWriteU16(pThis, offset, index, u32Value);
     1289                    return hdaRegWriteU16(pThis, index, u32Value);
    12851290
    12861291                case HDA_SDONFIFO_256B:
    12871292                    Log(("hda: 256-bit is unsupported, HDA is switched into 192-bit mode\n"));
    12881293                default:
    1289                     return hdaRegWriteU16(pThis, offset, index, HDA_SDONFIFO_192B);
     1294                    return hdaRegWriteU16(pThis, index, HDA_SDONFIFO_192B);
    12901295            }
    12911296            return VINF_SUCCESS;
    … …  
    13541359}
    13551360
    1356 DECLCALLBACK(int) hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1361DECLCALLBACK(int) hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    13571362{
    13581363#ifdef VBOX_WITH_HDA_CODEC_EMU
    … …  
    13761381            rc = 0;
    13771382    }
    1378     return hdaRegWriteU16(pThis, offset, index, u32Value);
     1383    return hdaRegWriteU16(pThis, index, u32Value);
    13791384#else
    1380     return hdaRegWriteU16(pThis, offset, index, u32Value);
     1385    return hdaRegWriteU16(pThis, index, u32Value);
    13811386#endif
    13821387}
    13831388
    1384 DECLCALLBACK(int) hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    1385 {
    1386     int rc = hdaRegWriteU32(pThis, offset, index, u32Value);
     1389DECLCALLBACK(int) hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1390{
     1391    int rc = hdaRegWriteU32(pThis, index, u32Value);
    13871392    if (RT_FAILURE(rc))
    13881393        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    13901395}
    13911396
    1392 DECLCALLBACK(int) hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    1393 {
    1394     int rc = hdaRegWriteU32(pThis, offset, index, u32Value);
     1397DECLCALLBACK(int) hdaRegWriteSDBDPU(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1398{
     1399    int rc = hdaRegWriteU32(pThis, index, u32Value);
    13951400    if (RT_FAILURE(rc))
    13961401        AssertRCReturn(rc, VINF_SUCCESS);
    … …  
    13981403}
    13991404
    1400 DECLCALLBACK(int) hdaRegReadIRS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t *pu32Value)
     1405DECLCALLBACK(int) hdaRegReadIRS(PHDASTATE pThis, uint32_t index, uint32_t *pu32Value)
    14011406{
    14021407    int rc = VINF_SUCCESS;
    … …  
    14061411        IRS(pThis) = HDA_REG_FIELD_FLAG_MASK(IRS, ICB);  /* busy */
    14071412
    1408     rc = hdaRegReadU32(pThis, offset, index, pu32Value);
     1413    rc = hdaRegReadU32(pThis, index, pu32Value);
    14091414    return rc;
    14101415}
    14111416
    1412 DECLCALLBACK(int) hdaRegWriteIRS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1417DECLCALLBACK(int) hdaRegWriteIRS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    14131418{
    14141419    int rc = VINF_SUCCESS;
    … …  
    14541459}
    14551460
    1456 DECLCALLBACK(int) hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1461DECLCALLBACK(int) hdaRegWriteRIRBWP(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    14571462{
    14581463    if (u32Value & HDA_REG_FIELD_FLAG_MASK(RIRBWP, RST))
    … …  
    14641469}
    14651470
    1466 DECLCALLBACK(int) hdaRegWriteBase(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
    1467 {
    1468     int rc = hdaRegWriteU32(pThis, offset, index, u32Value);
     1471DECLCALLBACK(int) hdaRegWriteBase(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
     1472{
     1473    int rc = hdaRegWriteU32(pThis, index, u32Value);
    14691474    if (RT_FAILURE(rc))
    14701475        AssertRCReturn(rc, rc);
    … …  
    15031508}
    15041509
    1505 DECLCALLBACK(int) hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t offset, uint32_t index, uint32_t u32Value)
     1510DECLCALLBACK(int) hdaRegWriteRIRBSTS(PHDASTATE pThis, uint32_t index, uint32_t u32Value)
    15061511{
    15071512    uint8_t v = RIRBSTS(pThis);
    … …  
    17701775
    17711776    /*
    1772      * Copy from DMA to the corresponding hdaBuffer (if there are any bytes from the previous unreported transfer we write at offset ''pBdle->cbUnderFifoW'')
     1777     * Copy from DMA to the corresponding hdaBuffer (if there are any bytes from the
     1778     * previous unreported transfer we write at offset 'pBdle->cbUnderFifoW').
    17731779     */
    17741780    if (!cb2Copy)
    … …  
    19351941    if (idxReg != -1)
    19361942    {
    1937         rc = g_aIchIntelHDRegMap[idxReg].pfnRead(pThis, offReg, idxReg, (uint32_t *)pv);
     1943        rc = g_aIchIntelHDRegMap[idxReg].pfnRead(pThis, idxReg, (uint32_t *)pv);
    19381944        Log(("hda: read %s[%x/%x]\n", g_aIchIntelHDRegMap[idxReg].abbrev, *(uint32_t *)pv));
    19391945    }
    … …  
    19661972        uint32_t const u32CurValue = pThis->au32Regs[idxReg];
    19671973#endif
    1968         rc = g_aIchIntelHDRegMap[idxReg].pfnWrite(pThis, offReg, idxReg, *(uint32_t const *)pv);
     1974        rc = g_aIchIntelHDRegMap[idxReg].pfnWrite(pThis, idxReg, *(uint32_t const *)pv);
    19691975        Log(("hda: write %s:(%x) %x => %x\n", g_aIchIntelHDRegMap[idxReg].abbrev, *(uint32_t const *)pv,
    19701976             u32CurValue, pThis->au32Regs[idxReg]));
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