VirtualBox

Changeset 31085 in vbox


Ignore:
Timestamp:
Jul 25, 2010 4:10:21 AM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
64033
Message:

Audio/HDA: nuked trailing whitespaces.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp

    r31065 r31085  
    352352    uint32_t     au32Regs[113];
    353353    /* Current BD index  */
    354     uint32_t    u32Cvi; 
    355     uint64_t    u64CviAddr; 
     354    uint32_t    u32Cvi;
     355    uint64_t    u64CviAddr;
    356356    /* Length of current BD entry */
    357357    uint32_t    u32CviLen;
     
    577577{
    578578    bool fIrq = false;
    579    /* @todo add state change */   
     579   /* @todo add state change */
    580580    if(   INTCTL_CIE(pState)
    581581       && (   RIRBSTS_RINTFL(pState)
     
    585585        fIrq = true;
    586586    }
    587     if (   INTCTL_SX(pState, 4) 
     587    if (   INTCTL_SX(pState, 4)
    588588        && SDSTS(pState, 4) && HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS))
    589589    {
     
    677677
    678678    PFNCODECVERBPROCESSOR pfn = (PFNCODECVERBPROCESSOR)NULL;
    679    
     679
    680680    rc = hdaCmdSync(pState, true);
    681681    if (RT_FAILURE(rc))
     
    800800    {
    801801        /* enter reset state*/
    802         if (   HDA_REG_FLAG_VALUE(pState, CORBCTL, DMA) 
     802        if (   HDA_REG_FLAG_VALUE(pState, CORBCTL, DMA)
    803803            || HDA_REG_FLAG_VALUE(pState, RIRBCTL, DMA))
    804804        {
     
    976976    }
    977977#endif
    978     return VINF_SUCCESS; 
     978    return VINF_SUCCESS;
    979979}
    980980DECLCALLBACK(int)hdaRegWriteSDLVI(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value)
     
    10841084    uint8_t v = RIRBSTS(pState);
    10851085    RIRBSTS(pState) = (v ^ nv) & v;
    1086    
     1086
    10871087    return hdaProcessInterrupt(pState);
    10881088}
     
    11151115static void fetch_bd(INTELHDLinkState *pState)
    11161116{
    1117     dump_bd(pState); 
     1117    dump_bd(pState);
    11181118    pState->u32Cvi;
    11191119    uint8_t  bdle[16];
     
    12091209                        }
    12101210                        if (pState->u32CviPos == pState->u32CviLen)
    1211                         { 
     1211                        {
    12121212                            pState->u32CviPos = 0;
    12131213                            pState->u32Cvi++;
     
    12331233 *
    12341234 * @note: while implementation was detected so called "forgotten" or "hole" registers
    1235  * which description is missed in RPM, datasheet or spec. 
     1235 * which description is missed in RPM, datasheet or spec.
    12361236 *
    12371237 * @returns VBox status code.
     
    12531253        Log(("hda: access to registers except GCTL is blocked while reset\n"));
    12541254    }
    1255     Assert(   index != -1 
    1256            && u32Offset == s_ichIntelHDRegMap[index].offset 
     1255    Assert(   index != -1
     1256           && u32Offset == s_ichIntelHDRegMap[index].offset
    12571257           && cb <= 4);
    12581258    if (index != -1)
     
    12621262        switch(cb)
    12631263        {
    1264             case 1: mask = 0x000000ff; break; 
    1265             case 2: mask = 0x0000ffff; break; 
    1266             case 3: mask = 0x00ffffff; break; 
    1267             case 4: mask = 0xffffffff; break; 
     1264            case 1: mask = 0x000000ff; break;
     1265            case 2: mask = 0x0000ffff; break;
     1266            case 3: mask = 0x00ffffff; break;
     1267            case 4: mask = 0xffffffff; break;
    12681268        }
    12691269        Assert(u32Offset == s_ichIntelHDRegMap[index].offset);
     
    13011301        Log(("hda: access to registers except GCTL is blocked while reset\n"));
    13021302    }
    1303     Assert(   index != -1 
    1304            && u32Offset == s_ichIntelHDRegMap[index].offset 
     1303    Assert(   index != -1
     1304           && u32Offset == s_ichIntelHDRegMap[index].offset
    13051305           && cb <= 4);
    13061306    if (index != -1)
     
    13111311        switch(cb)
    13121312        {
    1313             case 1: mask = 0xffffff00; break; 
    1314             case 2: mask = 0xffff0000; break; 
    1315             case 3: mask = 0xff000000; break; 
    1316             case 4: mask = 0x00000000; break; 
     1313            case 1: mask = 0xffffff00; break;
     1314            case 2: mask = 0xffff0000; break;
     1315            case 3: mask = 0xff000000; break;
     1316            case 4: mask = 0x00000000; break;
    13171317        }
    1318         *(uint32_t *)pv = (v & mask) | (*(uint32_t *)pv & ~mask); 
     1318        *(uint32_t *)pv = (v & mask) | (*(uint32_t *)pv & ~mask);
    13191319        rc = s_ichIntelHDRegMap[index].pfnWrite(&pThis->hda, u32Offset, index, *(uint32_t *)pv);
    13201320        Log(("hda: write %s:(%x) %x => %x\n", s_ichIntelHDRegMap[index].abbrev, *(uint32_t *)pv, v, pThis->hda.au32Regs[index]));
     
    14011401        pThis->hda.pu64RirbBuf = (uint64_t *)RTMemAllocZ(pThis->hda.cbRirbBuf);
    14021402
    1403     /* Accoding to ICH6 datasheet, 0x40000 is default value for stream descriptor register 23:20 
     1403    /* Accoding to ICH6 datasheet, 0x40000 is default value for stream descriptor register 23:20
    14041404     * bits are reserved for stream number 18.2.33 */
    14051405    SDCTL(&pThis->hda, 0) = 0x40000;
     
    14211421    SDFIFOS(&pThis->hda, 6) = 0xBF;
    14221422    SDFIFOS(&pThis->hda, 7) = 0xBF;
    1423    
     1423
    14241424    /* emulateion of codec "wake up" HDA spec (5.5.1 and 6.5)*/
    14251425    STATESTS(&pThis->hda) = 0x1;
     
    14831483    PCIDevSetBaseAddress        (&pThis->dev, 0,       /* 10 rw - MMIO */
    14841484                                 false /* fIoSpace */, false /* fPrefetchable */, true /* f64Bit */, 0x00000000);
    1485     /* ICH6 datasheet defines 0 values for SVID and SID (18.1.14-15), which together with values returned for 
     1485    /* ICH6 datasheet defines 0 values for SVID and SID (18.1.14-15), which together with values returned for
    14861486       verb F20 should provide device/codec recognition. */
    14871487    PCIDevSetSubSystemVendorId  (&pThis->dev, 0x0000); /* 2c ro - intel.) */
     
    14921492
    14931493    //** @todo r=michaln: If there are really no PCIDevSetXx for these, the meaning
    1494     // of these values needs to be properly documented! 
     1494    // of these values needs to be properly documented!
    14951495    /* HDCTL off 0x40 bit 0 selects signaling mode (1-HDA, 0 - Ac97) 18.1.19 */
    14961496    pThis->dev.config[0x40] = 0x01;
     
    15411541    pThis->hda.Codec.pfnTransfer = hdaTransfer;
    15421542    pThis->hda.Codec.pfnReset = hdaCodecReset;
    1543     /* 
     1543    /*
    15441544     * 18.2.6,7 defines that values of this registers might be cleared on power on/reset
    15451545     * hdaReset shouldn't affects these registers.
     
    15571557{
    15581558    PCIINTELHDLinkState *pThis = PDMINS_2_DATA(pDevIns, PCIINTELHDLinkState *);
    1559    
     1559
    15601560    int rc = stac9220Destruct(&pThis->hda.Codec);
    15611561    AssertRC(rc);
Note: See TracChangeset for help on using the changeset viewer.

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