VirtualBox

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


Ignore:
Timestamp:
Jul 25, 2010 3:49:20 AM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
64032
Message:

Audio/HDA: nuked trailing white spaces.

File:
1 edited

Legend:

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

    r31083 r31084  
    123123    int rc;
    124124    rc = codecUnimplemented(pState, cmd, pResp);
    125     *pResp |= CODEC_RESPONSE_UNSOLICITED; 
     125    *pResp |= CODEC_RESPONSE_UNSOLICITED;
    126126    return rc;
    127127}
     
    132132    PCODECNODE pNode = &pState->pNodes[CODEC_NID(cmd)];
    133133    if (STAC9220_IS_DAC_CMD(cmd))
    134         *pResp = AMPLIFIER_REGISTER(pNode->dac.B_params, 
    135                             CODEC_B_DIRECTION(cmd), 
    136                             CODEC_B_SIDE(cmd), 
     134        *pResp = AMPLIFIER_REGISTER(pNode->dac.B_params,
     135                            CODEC_B_DIRECTION(cmd),
     136                            CODEC_B_SIDE(cmd),
    137137                            CODEC_B_INDEX(cmd));
    138138    else if (STAC9220_IS_ADCVOL_CMD(cmd))
    139         *pResp = AMPLIFIER_REGISTER(pNode->adcvol.B_params, 
    140                             CODEC_B_DIRECTION(cmd), 
    141                             CODEC_B_SIDE(cmd), 
     139        *pResp = AMPLIFIER_REGISTER(pNode->adcvol.B_params,
     140                            CODEC_B_DIRECTION(cmd),
     141                            CODEC_B_SIDE(cmd),
    142142                            CODEC_B_INDEX(cmd));
    143143    else if (STAC9220_IS_ADCMUX_CMD(cmd))
    144         *pResp = AMPLIFIER_REGISTER(pNode->adcmux.B_params, 
    145                             CODEC_B_DIRECTION(cmd), 
    146                             CODEC_B_SIDE(cmd), 
     144        *pResp = AMPLIFIER_REGISTER(pNode->adcmux.B_params,
     145                            CODEC_B_DIRECTION(cmd),
     146                            CODEC_B_SIDE(cmd),
    147147                            CODEC_B_INDEX(cmd));
    148148    else {
     
    159159    *pResp = 0;
    160160    if (STAC9220_IS_DAC_CMD(cmd))
    161         pu32Bparam = &AMPLIFIER_REGISTER(pNode->dac.B_params, 
    162             CODEC_B_DIRECTION(cmd), 
    163             CODEC_B_SIDE(cmd), 
     161        pu32Bparam = &AMPLIFIER_REGISTER(pNode->dac.B_params,
     162            CODEC_B_DIRECTION(cmd),
     163            CODEC_B_SIDE(cmd),
    164164            CODEC_B_INDEX(cmd));
    165165    else if (STAC9220_IS_ADCVOL_CMD(cmd))
    166         pu32Bparam = &AMPLIFIER_REGISTER(pNode->adcvol.B_params, 
    167             CODEC_B_DIRECTION(cmd), 
    168             CODEC_B_SIDE(cmd), 
     166        pu32Bparam = &AMPLIFIER_REGISTER(pNode->adcvol.B_params,
     167            CODEC_B_DIRECTION(cmd),
     168            CODEC_B_SIDE(cmd),
    169169            CODEC_B_INDEX(cmd));
    170170    else if (STAC9220_IS_ADCMUX_CMD(cmd))
    171         pu32Bparam = &AMPLIFIER_REGISTER(pNode->adcmux.B_params, 
    172             CODEC_B_DIRECTION(cmd), 
    173             CODEC_B_SIDE(cmd), 
     171        pu32Bparam = &AMPLIFIER_REGISTER(pNode->adcmux.B_params,
     172            CODEC_B_DIRECTION(cmd),
     173            CODEC_B_SIDE(cmd),
    174174            CODEC_B_INDEX(cmd));
    175175    Assert(pu32Bparam);
     
    239239    if (STAC9220_IS_ADC_CMD(cmd))
    240240    {
    241         pState->pNodes[CODEC_NID(cmd)].adc.u32F03_param &= ~CODEC_VERB_8BIT_DATA; 
    242         pState->pNodes[CODEC_NID(cmd)].adc.u32F03_param |= cmd & CODEC_VERB_8BIT_DATA; 
     241        pState->pNodes[CODEC_NID(cmd)].adc.u32F03_param &= ~CODEC_VERB_8BIT_DATA;
     242        pState->pNodes[CODEC_NID(cmd)].adc.u32F03_param |= cmd & CODEC_VERB_8BIT_DATA;
    243243    }
    244244    *pResp = 0;
     
    260260    if (STAC9220_IS_SPDIFOUT_CMD(cmd))
    261261    {
    262         pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param &= ~CODEC_VERB_8BIT_DATA; 
    263         pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param |= cmd & CODEC_VERB_8BIT_DATA; 
     262        pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param &= ~CODEC_VERB_8BIT_DATA;
     263        pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param |= cmd & CODEC_VERB_8BIT_DATA;
    264264    }
    265265    *pResp = 0;
     
    272272    if (STAC9220_IS_SPDIFOUT_CMD(cmd))
    273273    {
    274         pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param &= ~(CODEC_VERB_8BIT_DATA << 8); 
    275         pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param |= cmd & (CODEC_VERB_8BIT_DATA << 8); 
     274        pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param &= ~(CODEC_VERB_8BIT_DATA << 8);
     275        pState->pNodes[CODEC_NID(cmd)].spdifout.u32F0d_param |= cmd & (CODEC_VERB_8BIT_DATA << 8);
    276276    }
    277277    *pResp = 0;
     
    400400        case 1:
    401401            pNode->afg.node.name = "AFG";
    402             pNode->node.au32F00_param[4] = RT_MAKE_U32_FROM_U8(0x1a, 0x00, 0x02, 0x00); 
    403             pNode->node.au32F00_param[5] = RT_MAKE_U32_FROM_U8(0x1, 0x01, 0x00, 0x0); 
     402            pNode->node.au32F00_param[4] = RT_MAKE_U32_FROM_U8(0x1a, 0x00, 0x02, 0x00);
     403            pNode->node.au32F00_param[5] = RT_MAKE_U32_FROM_U8(0x1, 0x01, 0x00, 0x0);
    404404            pNode->node.au32F00_param[8] = RT_MAKE_U32_FROM_U8(0x0d, 0x0d, 0x01, 0x0); /* Capabilities */
    405405            //pNode->node.au32F00_param[0xa] = RT_BIT(19)|RT_BIT(18)|RT_BIT(17)|RT_BIT(10)|RT_BIT(9)|RT_BIT(8)|RT_BIT(7)|RT_BIT(6)|RT_BIT(5);
     
    660660    uint32_t multFrq = CODEC_FMT_MUL_FRQ(dacFmt);
    661661    switch (baseFrq)
    662     {   
     662    {
    663663        case 0: baseFrq = 48000; break;
    664664        case 0x1: baseFrq = 44100; break;
     
    685685        case 0x7: divFrq = 8; break;
    686686    }
    687     return baseFrq * multFrq / divFrq; 
     687    return baseFrq * multFrq / divFrq;
    688688}
    689689static int codec_dac_to_aud(CODECState *pState, int dacnum, audsettings_t *paud)
     
    691691    uint32_t dacfmt = pState->pNodes[dacnum].dac.u32A_param;
    692692    paud->freq = 44100;//codecFrequencyCalculate(dacfmt);
    693     paud->nchannels = 2;//CODEC_DAC_CHANELS(dacfmt); 
     693    paud->nchannels = 2;//CODEC_DAC_CHANELS(dacfmt);
    694694    paud->fmt = AUD_FMT_U16;
    695    
     695
    696696    paud->endianness = 0;
    697697    return VINF_SUCCESS;
     
    701701{
    702702    CODECState *pState = (CODECState *)opaque;
    703     pState->pfnTransfer(pState, PI_INDEX, avail); 
     703    pState->pfnTransfer(pState, PI_INDEX, avail);
    704704}
    705705
     
    707707{
    708708    CODECState *pState = (CODECState *)opaque;
    709     pState->pfnTransfer(pState, PO_INDEX, avail); 
     709    pState->pfnTransfer(pState, PO_INDEX, avail);
    710710}
    711711
     
    713713{
    714714    CODECState *pState = (CODECState *)opaque;
    715     pState->pfnTransfer(pState, MC_INDEX, avail); 
     715    pState->pfnTransfer(pState, MC_INDEX, avail);
    716716}
    717717#define STAC9220_DAC_PI (0x2)
     
    732732    AUD_register_card ("ICH0", &pState->card);
    733733
    734    
     734
    735735    codec_dac_to_aud(pState, STAC9220_DAC_PI, &as);
    736736    pState->voice_pi = AUD_open_in(&pState->card, pState->voice_pi, "hda.in", pState, pi_callback, &as);
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