diff --git a/Makefile.am b/Makefile.am index d548e2b5..d14553f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,7 +170,11 @@ libpal_la_list = ./configs/qcm6490/mixer_paths_qcm6490_idp.xml \ ./configs/qcs6490/mixer_paths_QCS6490_RB3Gen2.xml \ ./configs/qcs6490/resourcemanager_QCS6490_RB3Gen2.xml \ ./configs/qcs9075/mixer_paths_LEMANS_EVK.xml \ - ./configs/qcs9075/resourcemanager_LEMANS_EVK.xml + ./configs/qcs9075/resourcemanager_LEMANS_EVK.xml \ + ./configs/x1e80100/mixer_paths_X1E80100_CRD.xml \ + ./configs/x1e80100/resourcemanager_X1E80100_CRD.xml \ + ./configs/x1e80100/mixer_paths_X1E80100_EVK.xml \ + ./configs/x1e80100/resourcemanager_X1E80100_EVK.xml lib_LTLIBRARIES += lib_bt_bundle.la lib_bt_bundle_la_SOURCES = $(btbundle_plugin_sources) @@ -219,6 +223,10 @@ install-data-hook: chmod go+r $(DESTDIR)$(root_etcdir)/resourcemanager_QCS6490_RB3Gen2.xml chmod go+r $(DESTDIR)$(root_etcdir)/mixer_paths_LEMANS_EVK.xml chmod go+r $(DESTDIR)$(root_etcdir)/resourcemanager_LEMANS_EVK.xml + chmod go+r $(DESTDIR)$(root_etcdir)/mixer_paths_X1E80100_CRD.xml + chmod go+r $(DESTDIR)$(root_etcdir)/resourcemanager_X1E80100_CRD.xml + chmod go+r $(DESTDIR)$(root_etcdir)/mixer_paths_X1E80100_EVK.xml + chmod go+r $(DESTDIR)$(root_etcdir)/resourcemanager_X1E80100_EVK.xml if COMPILE_ADSPRPCD adsprpc_sources = adsprpcd/adsprpcd.c diff --git a/configs/x1e80100/mixer_paths_X1E80100_CRD.xml b/configs/x1e80100/mixer_paths_X1E80100_CRD.xml new file mode 100644 index 00000000..6778b34c --- /dev/null +++ b/configs/x1e80100/mixer_paths_X1E80100_CRD.xml @@ -0,0 +1,677 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/x1e80100/mixer_paths_X1E80100_EVK.xml b/configs/x1e80100/mixer_paths_X1E80100_EVK.xml new file mode 100644 index 00000000..6778b34c --- /dev/null +++ b/configs/x1e80100/mixer_paths_X1E80100_EVK.xml @@ -0,0 +1,677 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/configs/x1e80100/resourcemanager_X1E80100_CRD.xml b/configs/x1e80100/resourcemanager_X1E80100_CRD.xml new file mode 100644 index 00000000..d2d40229 --- /dev/null +++ b/configs/x1e80100/resourcemanager_X1E80100_CRD.xml @@ -0,0 +1,512 @@ + + + + + 2.0 + + + + + + + + + + + + + + + + + 0 + + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_COMPRESSED + + + + + + + + + PAL_DEVICE_IN_HANDSET_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 4 + 1 + 48000 + handset-mic + 0 + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 1 + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_STREAM_VOIP_TX + 2 + 1 + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_STREAM_RAW + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_DEVICE_OUT_HANDSET + PAL_DEVICE_OUT_SPEAKER + + + + PAL_DEVICE_IN_SPEAKER_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 4 + 48000 + 1 + 0 + speaker-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 1 + + 2 + speaker-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + + PAL_STREAM_RAW + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + + PAL_STREAM_COMPRESSED + 1 + + + PAL_STREAM_VOIP_TX + 2 + 1 + + 2 + speaker-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_STREAM_LOOPBACK + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_SPEAKER + + + + PAL_DEVICE_IN_WIRED_HEADSET + CODEC_DMA-LPAIF_RXTX-TX-3 + 1 + 1 + headset-mic + 0 + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 1 + + + + PAL_STREAM_COMPRESSED + 1 + + + PAL_STREAM_VOIP_TX + 48000 + 16 + 1 + + + PAL_DEVICE_OUT_WIRED_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + + + + PAL_DEVICE_IN_BLUETOOTH_SCO_HEADSET + SLIM-DEV1-TX-7 + 1 + 1 + 8000 + 16 + bt-sco-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_COMPRESSED + + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_VOICE_CALL + 1 + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_BLUETOOTH_SCO + + + + PAL_DEVICE_IN_HANDSET_VA_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 2 + 1 + 48000 + 16 + va-mic + 1 + + PAL_DEVICE_OUT_SPEAKER + PAL_DEVICE_OUT_HANDSET + PAL_DEVICE_OUT_BLUETOOTH_A2DP + PAL_DEVICE_OUT_BLUETOOTH_BLE + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST + + + + PAL_DEVICE_IN_HEADSET_VA_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 2 + 1 + headset-va-mic + 48000 + 16 + 1 + + PAL_DEVICE_OUT_WIRED_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + PAL_DEVICE_OUT_BLUETOOTH_A2DP + PAL_DEVICE_OUT_BLUETOOTH_BLE + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST + + + + PAL_DEVICE_IN_BLUETOOTH_A2DP + SLIM-DEV1-TX-9 + 1 + 1 + bt-a2dp-mic + 44100 + 16 + + + PAL_DEVICE_NONE + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 1 + none + 48000 + 16 + + + PAL_DEVICE_OUT_SPEAKER + CODEC_DMA-LPAIF_WSA-RX-0 + 4 + 4 + 48000 + speaker + 0 + 0 + + 0 + 2 + 1 + + + + PAL_AUDIO_FMT_PCM_S16_LE + + 0 + + 0 + + 0 + + PAL_STREAM_VOIP_RX + 2 + + + PAL_STREAM_ULTRASOUND + 4 + 96000 + + + + PAL_DEVICE_OUT_HANDSET + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 2 + + 0 + 48000 + 0 + handset + + PAL_STREAM_VOIP_RX + 2 + + + + PAL_DEVICE_OUT_WIRED_HEADPHONE + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + headphones + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_WIRED_HEADSET + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + headphones + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_BLUETOOTH_A2DP + SLIM-DEV1-RX-7 + 1 + 1 + bt-a2dp + 44100 + 16 + + + PAL_DEVICE_OUT_BLUETOOTH_SCO + SLIM-DEV1-RX-7 + 1 + 1 + bt-sco + 8000 + 16 + + + PAL_DEVICE_OUT_AUX_DIGITAL + DISPLAY_PORT-RX + 32 + 2 + display-port + 1 + + + PAL_DEVICE_OUT_HDMI + DISPLAY_PORT-RX + 32 + 2 + 1 + display-port + + + + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_COMPRESSED + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_VOICE_UI + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_ACD + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_PROXY + + + PAL_STREAM_COMPRESSED + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_RAW + + + PAL_STREAM_COMPRESSED + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + diff --git a/configs/x1e80100/resourcemanager_X1E80100_EVK.xml b/configs/x1e80100/resourcemanager_X1E80100_EVK.xml new file mode 100644 index 00000000..d2d40229 --- /dev/null +++ b/configs/x1e80100/resourcemanager_X1E80100_EVK.xml @@ -0,0 +1,512 @@ + + + + + 2.0 + + + + + + + + + + + + + + + + + 0 + + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_COMPRESSED + + + + + + + + + PAL_DEVICE_IN_HANDSET_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 4 + 1 + 48000 + handset-mic + 0 + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 1 + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_STREAM_VOIP_TX + 2 + 1 + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_STREAM_RAW + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_DEVICE_OUT_HANDSET + PAL_DEVICE_OUT_SPEAKER + + + + PAL_DEVICE_IN_SPEAKER_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 4 + 48000 + 1 + 0 + speaker-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 1 + + 2 + speaker-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + + PAL_STREAM_RAW + + 2 + handset-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + + PAL_STREAM_COMPRESSED + 1 + + + PAL_STREAM_VOIP_TX + 2 + 1 + + 2 + speaker-dmic-endfire + + + 3 + three-mic + + + 4 + quad-mic + + + + PAL_STREAM_LOOPBACK + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_SPEAKER + + + + PAL_DEVICE_IN_WIRED_HEADSET + CODEC_DMA-LPAIF_RXTX-TX-3 + 1 + 1 + headset-mic + 0 + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + 1 + + + + PAL_STREAM_COMPRESSED + 1 + + + PAL_STREAM_VOIP_TX + 48000 + 16 + 1 + + + PAL_DEVICE_OUT_WIRED_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + + + + PAL_DEVICE_IN_BLUETOOTH_SCO_HEADSET + SLIM-DEV1-TX-7 + 1 + 1 + 8000 + 16 + bt-sco-mic + + PAL_STREAM_LOW_LATENCY + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_COMPRESSED + + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_VOICE_CALL + 1 + + + PAL_STREAM_ULTRA_LOW_LATENCY + + + PAL_DEVICE_OUT_BLUETOOTH_SCO + + + + PAL_DEVICE_IN_HANDSET_VA_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 2 + 1 + 48000 + 16 + va-mic + 1 + + PAL_DEVICE_OUT_SPEAKER + PAL_DEVICE_OUT_HANDSET + PAL_DEVICE_OUT_BLUETOOTH_A2DP + PAL_DEVICE_OUT_BLUETOOTH_BLE + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST + + + + PAL_DEVICE_IN_HEADSET_VA_MIC + CODEC_DMA-LPAIF_VA-TX-0 + 2 + 1 + headset-va-mic + 48000 + 16 + 1 + + PAL_DEVICE_OUT_WIRED_HEADSET + PAL_DEVICE_OUT_WIRED_HEADPHONE + PAL_DEVICE_OUT_BLUETOOTH_A2DP + PAL_DEVICE_OUT_BLUETOOTH_BLE + PAL_DEVICE_OUT_BLUETOOTH_BLE_BROADCAST + + + + PAL_DEVICE_IN_BLUETOOTH_A2DP + SLIM-DEV1-TX-9 + 1 + 1 + bt-a2dp-mic + 44100 + 16 + + + PAL_DEVICE_NONE + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 1 + none + 48000 + 16 + + + PAL_DEVICE_OUT_SPEAKER + CODEC_DMA-LPAIF_WSA-RX-0 + 4 + 4 + 48000 + speaker + 0 + 0 + + 0 + 2 + 1 + + + + PAL_AUDIO_FMT_PCM_S16_LE + + 0 + + 0 + + 0 + + PAL_STREAM_VOIP_RX + 2 + + + PAL_STREAM_ULTRASOUND + 4 + 96000 + + + + PAL_DEVICE_OUT_HANDSET + CODEC_DMA-LPAIF_WSA-RX-0 + 2 + 2 + + 0 + 48000 + 0 + handset + + PAL_STREAM_VOIP_RX + 2 + + + + PAL_DEVICE_OUT_WIRED_HEADPHONE + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + headphones + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_WIRED_HEADSET + CODEC_DMA-LPAIF_RXTX-RX-0 + 2 + 2 + 1 + headphones + + PAL_STREAM_VOIP_RX + 2 + 48000 + 16 + + + + PAL_DEVICE_OUT_BLUETOOTH_A2DP + SLIM-DEV1-RX-7 + 1 + 1 + bt-a2dp + 44100 + 16 + + + PAL_DEVICE_OUT_BLUETOOTH_SCO + SLIM-DEV1-RX-7 + 1 + 1 + bt-sco + 8000 + 16 + + + PAL_DEVICE_OUT_AUX_DIGITAL + DISPLAY_PORT-RX + 32 + 2 + display-port + 1 + + + PAL_DEVICE_OUT_HDMI + DISPLAY_PORT-RX + 32 + 2 + 1 + display-port + + + + + PAL_STREAM_VOIP_TX + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_DEEP_BUFFER + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_COMPRESSED + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_VOICE_UI + + + PAL_STREAM_GENERIC + + + + + PAL_STREAM_ACD + + + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_PROXY + + + PAL_STREAM_COMPRESSED + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + PAL_STREAM_RAW + + + PAL_STREAM_COMPRESSED + PAL_STREAM_ULTRA_LOW_LATENCY + PAL_STREAM_LOW_LATENCY + PAL_STREAM_GENERIC + + + + + diff --git a/resource_manager/src/ResourceManager.cpp b/resource_manager/src/ResourceManager.cpp index d7ef2c72..0f804e5f 100644 --- a/resource_manager/src/ResourceManager.cpp +++ b/resource_manager/src/ResourceManager.cpp @@ -1560,6 +1560,7 @@ int ResourceManager::init_audio() strstr(snd_card_name, "TALOS") || strstr(snd_card_name, "qcs8300") || strstr(snd_card_name, "qcs9100") || + strstr(snd_card_name, "X1E80100") || strstr(snd_card_name, "monaco")) { PAL_VERBOSE(LOG_TAG, "Found Codec sound card"); snd_card_found = true;