Car dock analog audio support (fixes CYAN-40 on i9100).
Change-Id: Ie1b26cc1d67ada9c1d639dc6fc6f69fd7504707a
This commit is contained in:
parent
7b432a83f4
commit
e3591e7a64
|
@ -26,7 +26,7 @@ audio_hw_modules {
|
||||||
sampling_rates 44100
|
sampling_rates 44100
|
||||||
channel_masks AUDIO_CHANNEL_OUT_STEREO
|
channel_masks AUDIO_CHANNEL_OUT_STEREO
|
||||||
formats AUDIO_FORMAT_PCM_16_BIT
|
formats AUDIO_FORMAT_PCM_16_BIT
|
||||||
devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET
|
devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
|
||||||
flags AUDIO_OUTPUT_FLAG_PRIMARY
|
flags AUDIO_OUTPUT_FLAG_PRIMARY
|
||||||
}
|
}
|
||||||
# deep_buffer {
|
# deep_buffer {
|
||||||
|
|
|
@ -79,6 +79,16 @@
|
||||||
<ctrl name="Headphone Playback Switch" value="off" />
|
<ctrl name="Headphone Playback Switch" value="off" />
|
||||||
</path>
|
</path>
|
||||||
</device>
|
</device>
|
||||||
|
<device type="analog-dock-headset">
|
||||||
|
<path type="enable">
|
||||||
|
<ctrl name="Line 1 Playback Volume" value="31" />
|
||||||
|
<ctrl name="Line 1 Playback Switch" value="on" />
|
||||||
|
</path>
|
||||||
|
<path type="disable">
|
||||||
|
<ctrl name="Line 1 Playback Volume" value="0" />
|
||||||
|
<ctrl name="Line 1 Playback Switch" value="off" />
|
||||||
|
</path>
|
||||||
|
</device>
|
||||||
</output>
|
</output>
|
||||||
|
|
||||||
<input card="0" device="0"
|
<input card="0" device="0"
|
||||||
|
|
|
@ -163,4 +163,8 @@
|
||||||
|
|
||||||
<!-- Device supports LED flashlight -->
|
<!-- Device supports LED flashlight -->
|
||||||
<bool name="config_enableTorch">true</bool>
|
<bool name="config_enableTorch">true</bool>
|
||||||
|
|
||||||
|
<!-- Control whether a car dock event should override the default bluetooth
|
||||||
|
audio routing, FORCE_BT_CAR_DOCK, with an analog dock, FORCE_ANALOG_DOCK. -->
|
||||||
|
<bool name="config_forceAnalogCarDock">true</bool>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -471,6 +471,56 @@ struct yamaha_mc1n2_audio_params_route galaxys2_params_routes[] = {
|
||||||
.bDcCut = 0,
|
.bDcCut = 0,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.device = AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET,
|
||||||
|
.direction = YAMAHA_MC1N2_AUDIO_DIRECTION_OUTPUT,
|
||||||
|
|
||||||
|
.ae_info = {
|
||||||
|
.bOnOff = 0x00,
|
||||||
|
.abBex = { 0x00 },
|
||||||
|
.abWide = { 0x00 },
|
||||||
|
.abDrc = { 0x00 },
|
||||||
|
.abEq5 = { 0x00 },
|
||||||
|
.abEq3 = { 0x00 },
|
||||||
|
},
|
||||||
|
|
||||||
|
.path_info.asHpOut[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asHpOut[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asSpOut[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asSpOut[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asRcOut[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asLout1[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asLout1[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asLout2[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asLout2[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asPeak[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asDit0[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asDit1[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asDit2[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asDac[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asDac[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asAe[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asCdsp[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asCdsp[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asCdsp[2].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asCdsp[3].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asAdc0[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asAdc0[1].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asAdc1[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asMix[0].abSrcOnOff = { 0 },
|
||||||
|
.path_info.asBias[0].abSrcOnOff = { 0 },
|
||||||
|
|
||||||
|
.path_info.asLout1[0].abSrcOnOff[5] = MCDRV_SRC5_DAC_L_ON,
|
||||||
|
.path_info.asLout1[1].abSrcOnOff[5] = MCDRV_SRC5_DAC_R_ON,
|
||||||
|
.path_info.asDac[0].abSrcOnOff[6] = MCDRV_SRC6_MIX_ON,
|
||||||
|
.path_info.asMix[0].abSrcOnOff[3] = MCDRV_SRC3_DIR0_ON,
|
||||||
|
|
||||||
|
.dac_info = {
|
||||||
|
.bMasterSwap = 0,
|
||||||
|
.bVoiceSwap = 0,
|
||||||
|
.bDcCut = 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.device = AUDIO_DEVICE_IN_BUILTIN_MIC,
|
.device = AUDIO_DEVICE_IN_BUILTIN_MIC,
|
||||||
.direction = YAMAHA_MC1N2_AUDIO_DIRECTION_INPUT,
|
.direction = YAMAHA_MC1N2_AUDIO_DIRECTION_INPUT,
|
||||||
|
|
Loading…
Reference in New Issue