Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2fa68a authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d4e8ced3 on remote branch 

Change-Id: Ie74f4cb56820fcd373eeb2aff0a0e2d59df26b95
parents 8333405a d4e8ced3

adsprpcd/adsprpcd.c

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ int main(int argc, char *argv[]) { 
      VERIFY_EPRINTF("audio adsp daemon error %s", dlerror());

    }

    if (nErr == AEE_ECONNREFUSED) {

      VERIFY_EPRINTF("fastRPC device driver is disabled, daemon exiting...");

      break;

      VERIFY_EPRINTF("fastRPC device driver is disabled, retrying...");

    }

    VERIFY_EPRINTF("audio adsp daemon will restart after 25ms...");

    usleep(25000);

configs/atoll/mixer_paths.xml

+0 −1
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ 
    <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="ADC2_MIXER Switch" value="0" />

    <ctl name="ADC2 MUX" value="ZERO" />

    <ctl name="DEC0_BCS Switch" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />

configs/atoll/mixer_paths_qrd.xml

+0 −3
Original line number Diff line number Diff line
@@ -335,11 +335,8 @@ 
    <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="ADC1_MIXER Switch" value="0" />

    <ctl name="ADC1 MUX" value="ZERO" />

    <ctl name="ADC2_MIXER Switch" value="0" />

    <ctl name="ADC2 MUX" value="ZERO" />

    <ctl name="ADC3_MIXER Switch" value="0" />

    <ctl name="ADC3 MUX" value="ZERO" />

    <ctl name="DEC0_BCS Switch" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />

configs/bengal/mixer_paths.xml

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ 
    <ctl name="DEC0_BCS Switch" value="0" />

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="ADC2_MIXER Switch" value="0" />

    <ctl name="ADC2 MUX" value="ZERO" />

    <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />

configs/bengal/mixer_paths_qrd.xml

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ 
    <ctl name="DEC0_BCS Switch" value="0" />

    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />

    <ctl name="ADC2_MIXER Switch" value="0" />

    <ctl name="ADC2 MUX" value="ZERO" />

    <ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />

    <ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />