Skip to content

Instantly share code, notes, and snippets.

@h2o64

h2o64/patch.patch

Last active November 21, 2015 20:04
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save h2o64/21567bf280a7e0b16f59 to your computer and use it in GitHub Desktop.
Save h2o64/21567bf280a7e0b16f59 to your computer and use it in GitHub Desktop.
Download ZIP
android_device_oneplus_onyx
Raw
patch.patch
diff -u -r android_device_oneplus_bacon-cm-12.1/AndroidBoard.mk android_device_oneplus_onyx-master/AndroidBoard.mk
--- android_device_oneplus_bacon-cm-12.1/AndroidBoard.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/AndroidBoard.mk 2015-11-21 16:33:29.000000000 +0100
@@ -3,4 +3,4 @@
#----------------------------------------------------------------------
# extra images
#----------------------------------------------------------------------
-include build/core/generate_extra_images.mk
+#include build/core/generate_extra_images.mk
diff -u -r android_device_oneplus_bacon-cm-12.1/Android.mk android_device_oneplus_onyx-master/Android.mk
--- android_device_oneplus_bacon-cm-12.1/Android.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/Android.mk 2015-11-21 16:33:29.000000000 +0100
@@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(filter bacon,$(TARGET_DEVICE)),)
+ifneq ($(filter onyx,$(TARGET_DEVICE)),)
include $(call all-subdir-makefiles,$(LOCAL_PATH))
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_Bluetooth_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_Bluetooth_cal.acdb sont différents
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_General_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_General_cal.acdb sont différents
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_Global_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_Global_cal.acdb sont différents
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_Handset_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_Handset_cal.acdb sont différents
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_Hdmi_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_Hdmi_cal.acdb sont différents
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_Headset_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_Headset_cal.acdb sont différents
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/audio/acdb/MTP_Speaker_cal.acdb et android_device_oneplus_onyx-master/audio/acdb/MTP_Speaker_cal.acdb sont différents
diff -u -r android_device_oneplus_bacon-cm-12.1/audio/audio_effects.conf android_device_oneplus_onyx-master/audio/audio_effects.conf
--- android_device_oneplus_bacon-cm-12.1/audio/audio_effects.conf 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/audio/audio_effects.conf 2015-11-21 16:33:29.000000000 +0100
@@ -1,3 +1,22 @@
+#
+# This file was modified by Dolby Laboratories, Inc. The portions of the
+# code that are surrounded by "DOLBY..." are copyrighted and
+# licensed separately, as follows:
+#
+# (C) 2012-2014 Dolby Laboratories, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# List of effect libraries to load. Each library element must contain a "path" element
# giving the full path of the library .so file.
# libraries {
@@ -6,42 +25,43 @@
# }
# }
libraries {
+# This is a proxy library that will be an abstraction for
+# the HW and SW effects
+
+ #proxy {
+ #path /system/lib/soundfx/libeffectproxy.so
+ #}
+
+# This is the SW implementation library of the effect
+ #libSW {
+ #path /system/lib/soundfx/libswwrapper.so
+ #}
+
+# This is the HW implementation library for the effect
+ #libHW {
+ #path /system/lib/soundfx/libhwwrapper.so
+ #}
+
bundle {
path /system/lib/soundfx/libbundlewrapper.so
}
reverb {
path /system/lib/soundfx/libreverbwrapper.so
}
- qcbassboost {
- path /vendor/lib/soundfx/libqcbassboost.so
- }
- qcvirt {
- path /vendor/lib/soundfx/libqcvirt.so
- }
- qcreverb {
- path /vendor/lib/soundfx/libqcreverb.so
- }
- visualizer_sw {
+ visualizer {
path /system/lib/soundfx/libvisualizer.so
}
- visualizer_hw {
- path /system/lib/soundfx/libqcomvisualizer.so
- }
downmix {
path /system/lib/soundfx/libdownmix.so
}
loudness_enhancer {
path /system/lib/soundfx/libldnhncr.so
}
- proxy {
- path /system/lib/soundfx/libeffectproxy.so
- }
- offload_bundle {
- path /system/lib/soundfx/libqcompostprocbundle.so
- }
- audio_pre_processing {
- path /system/lib/soundfx/libqcomvoiceprocessing.so
+#DOLBY_DAP
+ ds {
+ path /system/vendor/lib/soundfx/libswdap.so
}
+#DOLBY_END
}
# Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -90,120 +110,40 @@
#} End of effect proxy
bassboost {
- library proxy
- uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b
-
- libsw {
- library qcbassboost
- uuid 23aca180-44bd-11e2-bcfd-0800200c9a66
- }
-
- libhw {
- library offload_bundle
- uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b
- }
+ library bundle
+ uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
}
virtualizer {
- library proxy
- uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b
-
- libsw {
- library qcvirt
- uuid e6c98a16-22a3-11e2-b87b-f23c91aec05e
- }
-
- libhw {
- library offload_bundle
- uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b
- }
+ library bundle
+ uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
}
equalizer {
- library proxy
- uuid c8e70ecd-48ca-456e-8a4f-0002a5d5c51b
-
- libsw {
- library bundle
- uuid ce772f20-847d-11df-bb17-0002a5d5c51b
- }
-
- libhw {
- library offload_bundle
- uuid a0dac280-401c-11e3-9379-0002a5d5c51b
- }
+ library bundle
+ uuid ce772f20-847d-11df-bb17-0002a5d5c51b
}
volume {
library bundle
uuid 119341a0-8469-11df-81f9-0002a5d5c51b
}
reverb_env_aux {
- library proxy
- uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b
-
- libsw {
- library qcreverb
- uuid a8c1e5f3-293d-43cd-95ec-d5e26c02e217
- }
-
- libhw {
- library offload_bundle
- uuid 79a18026-18fd-4185-8233-0002a5d5c51b
- }
+ library reverb
+ uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
}
reverb_env_ins {
- library proxy
- uuid b707403a-a1c1-4291-9573-0002a5d5c51b
-
- libsw {
- library qcreverb
- uuid 791fff8b-8129-4655-83a4-59bc61034c3a
- }
-
- libhw {
- library offload_bundle
- uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b
- }
+ library reverb
+ uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
}
reverb_pre_aux {
- library proxy
- uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b
-
- libsw {
- library qcreverb
- uuid 53ef1db5-c0c0-445b-b060-e34d20ebb70a
- }
-
- libhw {
- library offload_bundle
- uuid 6987be09-b142-4b41-9056-0002a5d5c51b
- }
+ library reverb
+ uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
}
reverb_pre_ins {
- library proxy
- uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b
-
- libsw {
- library qcreverb
- uuid b08a0e38-22a5-11e2-b87b-f23c91aec05e
- }
-
- libhw {
- library offload_bundle
- uuid aa2bebf6-47cf-4613-9bca-0002a5d5c51b
- }
+ library reverb
+ uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
}
visualizer {
- library proxy
- uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c
-
- libsw {
- library visualizer_sw
- uuid d069d9e0-8329-11df-9168-0002a5d5c51b
- }
-
- libhw {
- library visualizer_hw
- uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b
- }
+ library visualizer
+ uuid d069d9e0-8329-11df-9168-0002a5d5c51b
}
downmix {
library downmix
@@ -213,14 +153,12 @@
library loudness_enhancer
uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
}
-# aec {
-# library audio_pre_processing
-# uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
-# }
-# ns {
-# library audio_pre_processing
-# uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
-# }
+#DOLBY_DAP
+ ds {
+ library ds
+ uuid 9d4921da-8225-4f29-aefa-39537a04bcaa
+ }
+#DOLBY_END
}
# Default pre-processing effects. Add to audio_effect.conf "effects" section if
diff -u -r android_device_oneplus_bacon-cm-12.1/audio/audio_policy.conf android_device_oneplus_onyx-master/audio/audio_policy.conf
--- android_device_oneplus_bacon-cm-12.1/audio/audio_policy.conf 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/audio/audio_policy.conf 2015-11-21 16:33:29.000000000 +0100
@@ -5,8 +5,7 @@
global_configuration {
attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_TELEPHONY_TX
default_output_device AUDIO_DEVICE_OUT_SPEAKER
- attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_TELEPHONY_RX
- speaker_drc_enabled true
+ attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_FM_RX|AUDIO_DEVICE_IN_FM_RX_A2DP|AUDIO_DEVICE_IN_TELEPHONY_RX
}
# audio hardware module section: contains descriptors for all audio hw modules present on the
@@ -27,28 +26,28 @@
sampling_rates 44100|48000
channel_masks AUDIO_CHANNEL_OUT_STEREO
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_PROXY
+ 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_PROXY|AUDIO_DEVICE_OUT_FM|AUDIO_DEVICE_OUT_FM_TX
flags AUDIO_OUTPUT_FLAG_PRIMARY
}
- deep_buffer {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
- channel_masks AUDIO_CHANNEL_OUT_STEREO
- 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_PROXY
- flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
+ low_latency {
+ sampling_rates 44100|48000
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_FM|AUDIO_DEVICE_OUT_FM_TX
+ flags AUDIO_OUTPUT_FLAG_FAST
}
multichannel {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|96000
+ sampling_rates 44100|48000
channel_masks dynamic
formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY
flags AUDIO_OUTPUT_FLAG_DIRECT
}
compress_offload {
- sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000|64000|88200|96000|176400|192000
+ sampling_rates 8000|11025|16000|22050|32000|44100|48000
channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1
- formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_MP2|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD
- devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL
+ formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3
+ devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_PROXY|AUDIO_DEVICE_OUT_FM_TX
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
}
incall_music {
@@ -75,9 +74,9 @@
inputs {
primary {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
- channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK
+ channel_masks AUDIO_CHANNEL_IN_5POINT1|AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW
- devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_VOICE_CALL
+ devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_FM_RX|AUDIO_DEVICE_IN_FM_RX_A2DP|AUDIO_DEVICE_IN_VOICE_CALL
}
voice_rx {
sampling_rates 8000|16000|48000
@@ -115,8 +114,8 @@
inputs {
usb_device {
sampling_rates dynamic
- channel_masks dynamic
- formats dynamic
+ channel_masks AUDIO_CHANNEL_IN_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
devices AUDIO_DEVICE_IN_USB_DEVICE
}
}
diff -u -r android_device_oneplus_bacon-cm-12.1/audio/mixer_paths.xml android_device_oneplus_onyx-master/audio/mixer_paths.xml
--- android_device_oneplus_bacon-cm-12.1/audio/mixer_paths.xml 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/audio/mixer_paths.xml 2015-11-21 16:33:29.000000000 +0100
@@ -20,73 +20,91 @@
<ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
<ctl name="Voip Dtx Mode" value="0" />
<ctl name="TTY Mode" value="OFF" />
- <ctl name="LINEOUT1 Volume" value="0" />
- <ctl name="LINEOUT2 Volume" value="0" />
- <ctl name="LINEOUT3 Volume" value="0" />
- <ctl name="LINEOUT4 Volume" value="0" />
- <ctl name="HPHL Volume" value="0" />
- <ctl name="HPHR Volume" value="0" />
- <ctl name="RX1 Digital Volume" value="0" />
- <ctl name="RX2 Digital Volume" value="0" />
- <ctl name="RX3 Digital Volume" value="0" />
- <ctl name="RX4 Digital Volume" value="0" />
- <ctl name="RX5 Digital Volume" value="0" />
- <ctl name="RX6 Digital Volume" value="0" />
- <ctl name="RX7 Digital Volume" value="-" />
- <ctl name="ADC1 Volume" value="0" />
- <ctl name="ADC2 Volume" value="0" />
- <ctl name="ADC3 Volume" value="19" />
+ <ctl name="LINEOUT1 Volume" value="13" />
+ <ctl name="LINEOUT2 Volume" value="13" />
+ <ctl name="LINEOUT3 Volume" value="13" />
+ <ctl name="LINEOUT4 Volume" value="13" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
+ <ctl name="RX1 Digital Volume" value="84" />
+ <ctl name="RX2 Digital Volume" value="84" />
+ <ctl name="RX3 Digital Volume" value="84" />
+ <ctl name="RX4 Digital Volume" value="84" />
+ <ctl name="RX5 Digital Volume" value="84" />
+ <ctl name="RX6 Digital Volume" value="84" />
+ <ctl name="RX7 Digital Volume" value="84" />
+ <ctl name="ADC1 Volume" value="19" />
+ <ctl name="ADC2 Volume" value="19" />
+ <ctl name="ADC3 Volume" value="0" />
<ctl name="ADC4 Volume" value="0" />
- <ctl name="ADC5 Volume" value="0" />
- <ctl name="ADC6 Volume" value="0" />
- <ctl name="DEC1 Volume" value="0" />
- <ctl name="DEC2 Volume" value="0" />
- <ctl name="DEC3 Volume" value="0" />
+ <ctl name="ADC5 Volume" value="19" />
+ <ctl name="ADC6 Volume" value="19" />
+ <ctl name="DEC1 Volume" value="84" />
+ <ctl name="DEC2 Volume" value="84" />
+ <ctl name="DEC3 Volume" value="84" />
<ctl name="DEC4 Volume" value="84" />
- <ctl name="DEC5 Volume" value="0" />
- <ctl name="DEC6 Volume" value="0" />
- <ctl name="DEC7 Volume" value="0" />
- <ctl name="DEC8 Volume" value="0" />
- <ctl name="DEC9 Volume" value="0" />
- <ctl name="DEC10 Volume" value="0" />
+ <ctl name="DEC5 Volume" value="84" />
+ <ctl name="DEC6 Volume" value="84" />
+ <ctl name="DEC7 Volume" value="84" />
+ <ctl name="DEC8 Volume" value="84" />
+ <ctl name="DEC9 Volume" value="84" />
+ <ctl name="DEC10 Volume" value="84" />
<ctl name="COMP0 Switch" value="0" />
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
+ <ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INT_BT_SCO_TX" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="AUX_PCM_RX_Voice Mixer CSVoice" value="0" />
<ctl name="SEC_AUX_PCM_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<ctl name="Voice_Tx Mixer SEC_AUX_PCM_TX_Voice" value="0" />
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
<!-- Audio BTSCO -->
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="0" />
<!-- Voice BTSCO -->
- <ctl name="Internal BTSCO SampleRate" value="8000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_8KHZ" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer Multimedia6" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
+ <ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
<ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_4_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="MultiMedia5 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
+ <ctl name="MultiMedia4 Mixer MI2S_TX" value="0" />
<ctl name="MultiMedia1 Mixer MI2S_TX" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_4_TX" value="0" />
+ <ctl name="HDMI Mixer MultiMedia1" value="0" />
+ <ctl name="HDMI Mixer MultiMedia2" value="0" />
+ <ctl name="HDMI Mixer MultiMedia3" value="0" />
+ <ctl name="HDMI Mixer MultiMedia4" value="0" />
+ <ctl name="HDMI Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia6" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia8" value="0" />
+ <!-- wangdongdong add for audio path initial state begin -->
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SEC_MI2S_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SEC_MI2S_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SEC_MI2S_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SECMI2S_DL_HL Switch" value="0" />
+ <ctl name="SEC_MI2S_RX_Voice Mixer Voip" value="0" />
+ <!--wangdongdong add for audio path initial state end-->
<ctl name="IIR1 INP1 MUX" value="ZERO" />
<ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="ZERO" />
<ctl name="SLIM TX10 MUX" value="ZERO" />
@@ -132,40 +150,67 @@
<ctl name="DAC1 Switch" value="0" />
<ctl name="SLIM_0_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM RX1 MUX" value="ZERO" />
- <ctl name="EAR PA Gain" value="POS_0_DB" />
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="EAR PA Gain" value="POS_6_DB" />
<ctl name="SLIM RX2 MUX" value="ZERO" />
+ <ctl name="SPK DRV Volume" value="8" />
<ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="0"/>
<ctl name="CLASS_H_DSM MUX" value="ZERO" />
- <ctl name="RDAC5 MUX" value="ZERO" />
-
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="HDMI Mixer MultiMedia4" value="0" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
<!-- usb headset -->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="0" />
<ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
<ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="0" />
+ <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
<!-- usb headset end -->
+ <!-- fm -->
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="MultiMedia1 Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="MultiMedia2 Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
+ <!-- fm end -->
<!-- Incall Recording -->
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
<ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
+ <!-- Incall Music -->
+ <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
+ <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
+ <!-- Incall Music End -->
+
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
+ <ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer INTERNAL_BT_SCO_TX_VoLTE" value="0" />
<ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="0" />
<!-- VoLTE end-->
+ <!-- VoWLAN -->
+ <ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
+ <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="VoWLAN_Tx Mixer INTERNAL_BT_SCO_TX_VoWLAN" value="0" />
+ <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="0" />
+ <!-- VoWLAN end-->
+
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
+ <ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="0" />
@@ -182,6 +227,69 @@
<ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="0" />
<!-- compress-voip-call End-->
+ <!-- QCHAT -->
+ <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
+ <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
+ <!-- QCHAT End -->
+
+ <!-- EC_REF -->
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
+
+ <!-- anc headset -->
+ <!-- speaker anc combo -->
+ <ctl name="RX4 DSM MUX" value="CIC_OUT" />
+ <ctl name="RX6 DSM MUX" value="CIC_OUT" />
+ <!-- speaker anc combo end -->
+ <!-- IIR/voice anc -->
+ <ctl name="IIR1 Band1" id ="0" value="268435456" />
+ <ctl name="IIR1 Band1" id ="1" value="0" />
+ <ctl name="IIR1 Band1" id ="2" value="0" />
+ <ctl name="IIR1 Band1" id ="3" value="0" />
+ <ctl name="IIR1 Band1" id ="4" value="0" />
+ <ctl name="IIR1 Band2" id ="0" value="268435456" />
+ <ctl name="IIR1 Band2" id ="1" value="0" />
+ <ctl name="IIR1 Band2" id ="2" value="0" />
+ <ctl name="IIR1 Band2" id ="3" value="0" />
+ <ctl name="IIR1 Band2" id ="4" value="0" />
+ <ctl name="IIR1 Band3" id ="0" value="268435456" />
+ <ctl name="IIR1 Band3" id ="1" value="0" />
+ <ctl name="IIR1 Band3" id ="2" value="0" />
+ <ctl name="IIR1 Band3" id ="3" value="0" />
+ <ctl name="IIR1 Band3" id ="4" value="0" />
+ <ctl name="IIR1 Band4" id ="0" value="268435456" />
+ <ctl name="IIR1 Band4" id ="1" value="0" />
+ <ctl name="IIR1 Band4" id ="2" value="0" />
+ <ctl name="IIR1 Band4" id ="3" value="0" />
+ <ctl name="IIR1 Band4" id ="4" value="0" />
+ <ctl name="IIR1 Band5" id ="0" value="268435456" />
+ <ctl name="IIR1 Band5" id ="1" value="0" />
+ <ctl name="IIR1 Band5" id ="2" value="0" />
+ <ctl name="IIR1 Band5" id ="3" value="0" />
+ <ctl name="IIR1 Band5" id ="4" value="0" />
+ <ctl name="IIR1 Enable Band1" value="0" />
+ <ctl name="IIR1 Enable Band2" value="0" />
+ <ctl name="IIR1 Enable Band3" value="0" />
+ <ctl name="IIR1 Enable Band4" value="0" />
+ <ctl name="IIR1 Enable Band5" value="0" />
+ <ctl name="IIR1 INP1 Volume" value="62" />
+ <!-- IIR/voice anc end -->
+ <!-- anc handset -->
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ANC1 FB MUX" value="ZERO" />
+ <!-- anc handset end -->
+ <ctl name="ANC1 MUX" value="ZERO" />
+ <ctl name="ANC2 MUX" value="ZERO" />
+ <ctl name="ANC Function" value="OFF" />
+ <!-- anc headset end-->
+ <!-- aanc handset mic -->
+ <ctl name="AIF1_CAP Mixer SLIM TX9" value="0" />
+ <ctl name="SLIM_0_RX AANC MUX" value="ZERO" />
+ <!-- aanc handset mic end -->
+ <!-- ssr qmic -->
+ <ctl name="AIF1_CAP Mixer SLIM TX10" value="0" />
+ <!-- ssr qmic end-->
<!-- audio record compress-->
<ctl name="MultiMedia8 Mixer SLIM_0_TX" value="0" />
<ctl name="MultiMedia8 Mixer INTERNAL_BT_SCO_TX" value="0" />
@@ -189,7 +297,6 @@
<ctl name="MultiMedia8 Mixer VOC_REC_UL" value="0" />
<ctl name="MultiMedia8 Mixer VOC_REC_DL" value="0" />
<!-- audio record compress end-->
-
<!-- listen -->
<ctl name="LSM1 MUX" value="None" />
<ctl name="LSM2 MUX" value="None" />
@@ -201,41 +308,39 @@
<ctl name="LSM8 MUX" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
- <ctl name="MAD Input" value="ADC3" />
+ <ctl name="VIONOFF Switch" value="0" />
+ <ctl name="MAD Input" value="DMIC1" />
<!-- listen end-->
-
- <!-- EC_REF -->
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
-
<!-- afe-proxy -->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
<!-- afe-proxy end-->
-
- <!-- BT SCO samplerate -->
- <path name="bt-sco-samplerate">
- <ctl name="Internal BTSCO SampleRate" value="8000" />
- </path>
+ <ctl name="AFE_PCM_RX Port Mixer INTERNAL_FM_TX" value="0" />
<!-- BT SCO WB Sample Rate -->
<path name="bt-sco-wb-samplerate">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
</path>
- <!-- 24bit/96KHz toggle -->
- <ctl name="SLIM_0_RX Format" value="S16_LE" />
- <ctl name="SLIM_0_RX SampleRate" value="KHZ_48" />
-
<!-- These are audio route (FE to BE) specific mixer settings -->
<path name="deep-buffer-playback">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback hdmi">
+ <ctl name="HDMI Mixer MultiMedia1" value="1" />
+ </path>
+
+ <path name="deep-buffer-playback speaker-and-hdmi">
+ <path name="deep-buffer-playback hdmi" />
+ <path name="deep-buffer-playback" />
+ </path>
+
<path name="deep-buffer-playback bt-sco">
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="1" />
</path>
<path name="deep-buffer-playback bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="deep-buffer-playback bt-sco" />
</path>
@@ -252,19 +357,32 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback transmission-fm">
+ <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="low-latency-playback">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback hdmi">
+ <ctl name="HDMI Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback bt-sco">
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="1" />
</path>
<path name="low-latency-playback bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="low-latency-playback bt-sco" />
</path>
+ <path name="low-latency-playback speaker-and-hdmi">
+ <path name="low-latency-playback hdmi" />
+ <path name="low-latency-playback" />
+ </path>
+
<path name="low-latency-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -278,132 +396,98 @@
<path name="low-latency-playback" />
</path>
- <path name="ultra-low-latency-playback">
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="1" />
- </path>
-
- <path name="ultra-low-latency-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="1" />
- </path>
-
- <path name="ultra-low-latency-playback usb-headphones">
- <path name="ultra-low-latency-playback afe-proxy" />
- </path>
-
- <path name="ultra-low-latency-playback speaker-and-usb-headphones">
- <path name="ultra-low-latency-playback usb-headphones" />
- <path name="ultra-low-latency-playback" />
- </path>
-
- <path name="multi-channel-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
- </path>
-
- <path name="compress-offload-playback">
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco">
- <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
- <path name="compress-offload-playback bt-sco" />
- </path>
-
- <path name="compress-offload-playback afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
- </path>
-
- <path name="compress-offload-playback usb-headphones">
- <path name="compress-offload-playback afe-proxy" />
+ <!-- add mi2s use case -->
+ <path name="deep-buffer-playback i2s">
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="compress-offload-playback speaker-and-usb-headphones">
- <path name="compress-offload-playback usb-headphones" />
- <path name="compress-offload-playback" />
+ <path name="deep-buffer-playback i2s-slimbus">
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="compress-offload-playback2">
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia6" value="1" />
+ <path name="low-latency-playback i2s">
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="1" />
</path>
- <path name="compress-offload-playback2 bt-sco">
- <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <path name="low-latency-playback i2s-slimbus">
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="1" />
</path>
- <path name="compress-offload-playback2 bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
- <path name="compress-offload-playback2 bt-sco" />
+ <path name="voice-call i2s">
+ <ctl name="VOC_EXT_EC MUX" value="SEC_MI2S_TX" />
+ <ctl name="SEC_MI2S_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
</path>
- <path name="compress-offload-playback2 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia6" value="1" />
+ <path name="voice2-call i2s">
+ <ctl name="VOC_EXT_EC MUX" value="SEC_MI2S_TX" />
+ <ctl name="SEC_MI2S_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
</path>
+ <!-- add mi2s use case end -->
- <path name="compress-offload-playback2 usb-headphones">
- <path name="compress-offload-playback2 afe-proxy" />
+ <path name="low-latency-playback transmission-fm">
+ <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />
</path>
- <path name="compress-offload-playback2 speaker-and-usb-headphones">
- <path name="compress-offload-playback2 usb-headphones" />
- <path name="compress-offload-playback2" />
+ <path name="multi-channel-playback hdmi">
+ <ctl name="HDMI Mixer MultiMedia2" value="1" />
</path>
- <path name="compress-offload-playback3">
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
+ <path name="multi-channel-playback afe-proxy">
+ <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
- <path name="compress-offload-playback3 bt-sco">
- <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia7" value="1" />
+ <path name="compress-offload-playback">
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback3 bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
- <path name="compress-offload-playback3 bt-sco" />
+ <path name="compress-offload-playback i2s">
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback3 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
+ <path name="compress-offload-playback i2s-slimbus">
+ <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback3 usb-headphones">
- <path name="compress-offload-playback3 afe-proxy" />
+ <path name="compress-offload-playback hdmi">
+ <ctl name="HDMI Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback3 speaker-and-usb-headphones">
- <path name="compress-offload-playback3 usb-headphones" />
- <path name="compress-offload-playback3" />
+ <path name="compress-offload-playback bt-sco">
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback8">
- <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia8" value="1" />
+ <path name="compress-offload-playback bt-sco-wb">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="compress-offload-playback bt-sco" />
</path>
- <path name="compress-offload-playback8 bt-sco">
- <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia8" value="1" />
+ <path name="compress-offload-playback speaker-and-hdmi">
+ <path name="compress-offload-playback hdmi" />
+ <path name="compress-offload-playback" />
</path>
- <path name="compress-offload-playback8 bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
- <path name="compress-offload-playback8 bt-sco" />
+ <path name="compress-offload-playback afe-proxy">
+ <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
</path>
- <path name="compress-offload-playback8 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
+ <path name="compress-offload-playback usb-headphones">
+ <path name="compress-offload-playback afe-proxy" />
</path>
- <path name="compress-offload-playback8 usb-headphones">
- <path name="compress-offload-playback8 afe-proxy" />
+ <path name="compress-offload-playback speaker-and-usb-headphones">
+ <path name="compress-offload-playback usb-headphones" />
+ <path name="compress-offload-playback" />
</path>
- <path name="compress-offload-playback8 speaker-and-usb-headphones">
- <path name="compress-offload-playback8 usb-headphones" />
- <path name="compress-offload-playback8" />
+ <path name="compress-offload-playback transmission-fm">
+ <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />
</path>
-
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -417,28 +501,14 @@
</path>
<path name="audio-record bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="audio-record bt-sco" />
</path>
- <path name="low-latency-record">
- <ctl name="MultiMedia5 Mixer SLIM_0_TX" value="1" />
- </path>
-
- <path name="low-latency-record usb-headset-mic">
- <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="1" />
+ <path name="audio-record capture-fm">
+ <ctl name="MultiMedia1 Mixer INTERNAL_FM_TX" value="1" />
</path>
- <path name="low-latency-record bt-sco">
- <ctl name="MultiMedia5 Mixer INTERNAL_BT_SCO_TX" value="1" />
- </path>
-
- <path name="low-latency-record bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
- <path name="audio-record bt-sco" />
- </path>
-
-
<path name="audio-record-compress">
<ctl name="MultiMedia8 Mixer SLIM_0_TX" value="1" />
</path>
@@ -448,7 +518,7 @@
</path>
<path name="audio-record-compress bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="audio-record-compress bt-sco" />
</path>
@@ -456,18 +526,27 @@
<ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="1" />
</path>
+ <path name="fm-virtual-record capture-fm">
+ <ctl name="MultiMedia2 Mixer INTERNAL_FM_TX" value="1" />
+ </path>
+
<path name="voice-call">
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="1" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
</path>
+ <path name="voice-call hdmi">
+ <ctl name="HDMI_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="1" />
<ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="1" />
</path>
<path name="voice-call bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="voice-call bt-sco" />
</path>
@@ -492,13 +571,18 @@
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
</path>
+ <path name="voice2-call hdmi">
+ <ctl name="HDMI_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="voice2-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="1" />
</path>
<path name="voice2-call bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="voice2-call bt-sco" />
</path>
@@ -507,16 +591,22 @@
<ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="1" />
</path>
- <path name="hfp-sco">
- <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
- <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
- <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <path name="play-fm">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="1" />
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
- <path name="hfp-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
- <path name="hfp-sco" />
+ <path name="play-fm i2s">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SEC_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SECMI2S_DL_HL Switch" value="1" />
+ </path>
+
+ <path name="play-fm usb-headphones">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="AFE_PCM_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
<path name="incall-rec-uplink">
@@ -527,6 +617,17 @@
<path name="incall-rec-uplink" />
</path>
+ <path name="hfp-sco">
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS_DL_HL Switch" value="1" />
+ </path>
+ <path name="hfp-sco-wb">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="hfp-sco" />
+ </path>
+
<path name="incall-rec-uplink bt-sco-wb">
<path name="incall-rec-uplink" />
</path>
@@ -535,6 +636,10 @@
<path name="incall-rec-uplink" />
</path>
+ <path name="incall-rec-uplink afe-proxy">
+ <path name="incall-rec-uplink" />
+ </path>
+
<path name="incall-rec-uplink-compress">
<ctl name="MultiMedia8 Mixer VOC_REC_UL" value="1" />
</path>
@@ -551,6 +656,10 @@
<path name="incall-rec-uplink-compress" />
</path>
+ <path name="incall-rec-uplink-compress afe-proxy">
+ <path name="incall-rec-uplink-compress" />
+ </path>
+
<path name="incall-rec-downlink">
<ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
</path>
@@ -567,6 +676,10 @@
<path name="incall-rec-downlink" />
</path>
+ <path name="incall-rec-downlink afe-proxy">
+ <path name="incall-rec-downlink" />
+ </path>
+
<path name="incall-rec-downlink-compress">
<ctl name="MultiMedia8 Mixer VOC_REC_DL" value="1" />
</path>
@@ -583,6 +696,10 @@
<path name="incall-rec-downlink-compress" />
</path>
+ <path name="incall-rec-downlink-compress afe-proxy">
+ <path name="incall-rec-downlink-compress" />
+ </path>
+
<path name="incall-rec-uplink-and-downlink">
<path name="incall-rec-uplink" />
<path name="incall-rec-downlink" />
@@ -600,6 +717,10 @@
<path name="incall-rec-uplink-and-downlink" />
</path>
+ <path name="incall-rec-uplink-and-downlink afe-proxy">
+ <path name="incall-rec-uplink-and-downlink" />
+ </path>
+
<path name="incall-rec-uplink-and-downlink-compress">
<path name="incall-rec-uplink-compress" />
<path name="incall-rec-downlink-compress" />
@@ -617,18 +738,68 @@
<path name="incall-rec-uplink-and-downlink-compress" />
</path>
+ <path name="incall-rec-uplink-and-downlink-compress afe-proxy">
+ <path name="incall-rec-uplink-and-downlink-compress" />
+ </path>
+
+ <path name="incall_music_uplink">
+ <ctl name="Incall_Music Audio Mixer MultiMedia2" value="1" />
+ </path>
+
+ <path name="incall_music_uplink bt-sco">
+ <path name="incall_music_uplink" />
+ </path>
+
+ <path name="incall_music_uplink bt-sco-wb">
+ <path name="incall_music_uplink" />
+ </path>
+
+ <path name="incall_music_uplink usb-headphones">
+ <path name="incall_music_uplink" />
+ </path>
+
+ <path name="incall_music_uplink hdmi">
+ <path name="incall_music_uplink" />
+ </path>
+
+
+ <path name="incall_music_uplink2">
+ <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
+ </path>
+
+ <path name="incall_music_uplink2 bt-sco">
+ <path name="incall_music_uplink2" />
+ </path>
+
+ <path name="incall_music_uplink2 bt-sco-wb">
+ <path name="incall_music_uplink2" />
+ </path>
+
+ <path name="incall_music_uplink2 usb-headphones">
+ <path name="incall_music_uplink2" />
+ </path>
+
+ <path name="incall_music_uplink2 hdmi">
+ <path name="incall_music_uplink2" />
+ </path>
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call hdmi">
+ <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer INTERNAL_BT_SCO_TX_VoLTE" value="1" />
</path>
<path name="volte-call bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="volte-call bt-sco" />
</path>
@@ -637,18 +808,49 @@
<ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
</path>
+ <path name="vowlan-call">
+ <ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
+ <path name="vowlan-call hdmi">
+ <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
+ <path name="vowlan-call bt-sco">
+ <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer INTERNAL_BT_SCO_TX_VoWLAN" value="1" />
+ </path>
+
+ <path name="vowlan-call bt-sco-wb">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="vowlan-call bt-sco" />
+ </path>
+
+ <path name="vowlan-call usb-headphones">
+ <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />
+ </path>
+
<path name="compress-voip-call">
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call i2s">
+ <ctl name="VOC_EXT_EC MUX" value="SEC_MI2S_TX" />
+ <ctl name="SEC_MI2S_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
<path name="compress-voip-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
</path>
<path name="compress-voip-call bt-sco-wb">
- <ctl name="Internal BTSCO SampleRate" value="16000" />
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="compress-voip-call bt-sco" />
</path>
@@ -657,6 +859,14 @@
<ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
</path>
+ <path name="spkr-rx-calib">
+ <ctl name="SLIMBUS_DL_HL Switch" value="1" />
+ </path>
+
+ <path name="spkr-vi-record">
+ <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
+ </path>
+
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -666,58 +876,227 @@
<ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
-
<path name="listen-voice-wakeup-3">
<ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
-
<path name="listen-voice-wakeup-4">
<ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
-
<path name="listen-voice-wakeup-5">
<ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
-
<path name="listen-voice-wakeup-6">
<ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
-
<path name="listen-voice-wakeup-7">
<ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
-
<path name="listen-voice-wakeup-8">
<ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
</path>
+ <path name="qchat-call">
+ <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="1" />
+ <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="1" />
+ </path>
- <!-- Analog output devices -->
- <path name="ear">
- <ctl name="RX1 MIX1 INP1" value="RX1" />
- <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
- <ctl name="RX1 Digital Volume" value="90" />
- <ctl name="EAR PA Gain" value="POS_6_DB" />
- <ctl name="DAC1 Switch" value="1" />
+ <path name="qchat-call bt-sco">
+ <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="1" />
+ <ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="1" />
+ </path>
+
+ <path name="qchat-call bt-sco-wb">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="qchat-call bt-sco" />
</path>
- <path name="spk">
+ <!-- These are actual sound device specific mixer settings -->
+ <path name="adc1">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC6" />
+ <ctl name="DEC6 MUX" value="ADC1" />
+ <ctl name="IIR1 INP1 MUX" value="DEC6" />
+ </path>
+
+ <path name="adc2">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC5" />
+ <ctl name="DEC5 MUX" value="ADC2" />
+ <ctl name="IIR1 INP1 MUX" value="DEC5" />
+ <ctl name="DEC5 Volume" value="83" />
+ <ctl name="ADC2 Volume" value="19" />
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
+ </path>
+
+ <path name="adc4">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC3" />
+ <ctl name="DEC3 MUX" value="ADC4" />
+ <ctl name="ADC4 Volume" value="19" />
+ <ctl name="DEC3 Volume" value="84" />
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
+ </path>
+
+ <!--xiaojun.lv@phoneSW.AudioDrv,14001 need use ANC mic-->
+ <path name="adc5">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC2" />
+ <ctl name="DEC2 MUX" value="ADC5" />
+ <ctl name="ADC5 Volume" value="19" />
+ <ctl name="DEC2 Volume" value="84" />
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
+ </path>
+
+ <path name="dmic1">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC4" />
+ <ctl name="DEC4 MUX" value="ADC3" />
+ <ctl name="ADC3 Volume" value="19" />
+ <ctl name="DEC4 Volume" value="84" />
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
+ </path>
+
+ <path name="speaker">
<ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
<ctl name="RX3 MIX1 INP1" value="RX1" />
<ctl name="RDAC5 MUX" value="DEM3_INV" />
<ctl name="COMP2 Switch" value="1" />
<ctl name="LINEOUT1 Volume" value="13" />
<ctl name="LINEOUT3 Volume" value="13" />
+ <ctl name="RX3 Digital Volume" value="80" />
+ <ctl name="RX4 Digital Volume" value="80" />
+ <ctl name="SPKR Enable" value="1" />
+ </path>
+
+ <path name="speaker-fluid">
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="RX7 MIX1 INP1" value="RX1" />
+ <ctl name="COMP0 Switch" value="1" />
+ </path>
+
+ <path name="speaker-cdp">
+ <path name="speaker-fluid" />
</path>
- <path name="hph">
+ <path name="speaker-DB">
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="Two" />
+ <ctl name="RX3 MIX1 INP1" value="RX1" />
+ <ctl name="RX5 MIX1 INP1" value="RX2" />
+ <ctl name="LINEOUT1 Volume" value="20" />
+ <ctl name="LINEOUT2 Volume" value="20" />
+ </path>
+
+ <path name="speaker-liquid">
+ <path name="speaker-DB" />
+ <ctl name="RDAC5 MUX" value="DEM3_INV" />
+ <ctl name="RDAC7 MUX" value="DEM5_INV" />
+ <ctl name="COMP2 Switch" value="1" />
+ <ctl name="LINEOUT3 Volume" value="20" />
+ <ctl name="LINEOUT4 Volume" value="20" />
+ </path>
+
+ <path name="sidetone-iir">
+ <ctl name="IIR1 Enable Band1" value="1" />
+ <ctl name="IIR1 Enable Band2" value="1" />
+ <ctl name="IIR1 Enable Band3" value="1" />
+ <ctl name="IIR1 Enable Band4" value="1" />
+ <ctl name="IIR1 Enable Band5" value="1" />
+ </path>
+
+ <path name="sidetone-headphones">
+ <path name="sidetone-iir" />
+ <ctl name="IIR1 INP1 Volume" value="77" />
+ <ctl name="RX1 MIX2 INP1" value="IIR1" />
+ <ctl name="RX2 MIX2 INP1" value="IIR1" />
+ </path>
+
+ <path name="sidetone-handset">
+ <path name="sidetone-iir" />
+ <ctl name="IIR1 INP1 Volume" value="62" />
+ <ctl name="RX1 MIX2 INP1" value="IIR1" />
+ </path>
+
+ <path name="speaker-mic">
+ <path name="adc5" />
+ </path>
+
+ <path name="speaker-mic-liquid">
+ <path name="dmic1" />
+ <ctl name="DEC9 Volume" value="111" />
+ </path>
+
+ <path name="speaker-mic-DB">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
+ <ctl name="SLIM_0_TX Channels" value="One" />
+ <ctl name="SLIM TX7 MUX" value="DEC6" />
+ <ctl name="DEC6 MUX" value="ADC1" />
+ <ctl name="ADC1 Volume" value="124" />
+ <ctl name="IIR1 INP1 MUX" value="DEC7" />
+ </path>
+
+ <path name="speaker-protected">
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX7 MIX1 INP1" value="RX1" />
+ <ctl name="COMP0 Switch" value="1" />
+ </path>
+
+ <path name="vi-feedback">
+ <ctl name="VIONOFF Switch" value="1" />
+ </path>
+
+ <path name="handset">
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX1 MIX1 INP1" value="RX1" />
+ <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
+ <ctl name="DAC1 Switch" value="1" />
+ <ctl name="RX1 Digital Volume" value="84" />
+ </path>
+ <path name="voip-handset">
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX1 MIX1 INP1" value="RX1" />
+ <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
+ <ctl name="DAC1 Switch" value="1" />
+ <ctl name="RX1 Digital Volume" value="78" />
+ </path>
+
+ <path name="handset-mic">
+ <path name="dmic1" />
+ </path>
+
+ <path name="handset-mic-DB">
+ <path name="adc1" />
+ </path>
+
+ <path name="anc-handset">
+ <ctl name="ANC Function" value="ON" />
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX1 MIX1 INP1" value="RX1" />
+ <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
+ <ctl name="DAC1 Switch" value="1" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="ANC Slot" value="6" />
+ <ctl name="ANC1 MUX" value="DMIC4" />
+ <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
+ </path>
+
+ <path name="headphones">
<ctl name="SLIM RX1 MUX" value="AIF1_PB" />
<ctl name="SLIM RX2 MUX" value="AIF1_PB" />
<ctl name="SLIM_0_RX Channels" value="Two" />
@@ -726,128 +1105,233 @@
<ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
<ctl name="HPHL DAC Switch" value="1" />
<ctl name="COMP1 Switch" value="1" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="RX2 Digital Volume" value="81" />
<ctl name="HPHL Volume" value="20" />
<ctl name="HPHR Volume" value="20" />
</path>
- <path name="spk-hph">
- <path name="hph" />
- <ctl name="RX3 MIX1 INP1" value="RX1" />
- <ctl name="RDAC5 MUX" value="DEM3_INV" />
- <ctl name="COMP2 Switch" value="1" />
- <ctl name="LINEOUT1 Volume" value="14" />
- <ctl name="LINEOUT3 Volume" value="14" />
+ <path name="headset-mic">
+ <path name="adc2" />
+ <ctl name="ADC2 Volume" value="13" />
</path>
+ <path name="headset-mic-DB">
+ <path name="adc2" />
+ <ctl name="ADC2 Volume" value="14" />
+ </path>
- <!-- Output paths -->
- <path name="handset">
- <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <path name="ear" />
+ <path name="headset-mic-liquid">
+ <path name="adc2" />
+ <ctl name="ADC2 Volume" value="20" />
</path>
<path name="voice-handset">
+ <path name="sidetone-handset" />
<path name="handset" />
+ <!--wangdongdong@OnePlus.AudioDrv,2015/02/02,increase 5dB(84-89) of voice handset rx-->
+ <ctl name="RX1 Digital Volume" value="89" />
</path>
- <path name="speaker">
- <path name="spk" />
- <ctl name="RX3 Digital Volume" value="80" />
- <ctl name="RX4 Digital Volume" value="80" />
+ <path name="voice-handset-qosound">
+ <path name="sidetone-handset" />
+ <path name="handset" />
+ <!--lifei@OnePlus.AudioDrv,2015/08/25,increase 5dB(84-89) of voice handset rx-->
+ <ctl name="RX1 Digital Volume" value="89" />
+ </path>
+
+ <path name="voice-handset-tmus">
+ <path name="handset" />
</path>
<path name="voice-speaker">
- <path name="spk" />
- <ctl name="RX3 Digital Volume" value="92" />
- <ctl name="RX4 Digital Volume" value="92" />
+ <path name="speaker" />
+ <!--lifei1@phoneSW.AudioDrv,14001 voice speaker use 16bit format-->
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
+ <!--lifei@phoneSW.AudioDrv,14001 end-->
</path>
- <path name="headphones">
- <path name="hph" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
+ <path name="voice-speaker-DB">
+ <path name="speaker-DB" />
+ </path>
+
+ <path name="voice-speaker-mic">
+ <path name="speaker-mic" />
+ </path>
+
+ <path name="voice-speaker-mic-DB">
+ <path name="speaker-mic-DB" />
</path>
<path name="voice-headphones">
- <path name="hph" />
- <ctl name="RX1 Digital Volume" value="85" />
- <ctl name="RX2 Digital Volume" value="85" />
+ <path name="headphones" />
+ </path>
+
+ <path name="voice-headset-mic">
+ <path name="headset-mic" />
+ <!--lifei1@phoneSW.AudioDrv,14001 remove sidetone-handset for phone -->
+ <!--path name="sidetone-headphones" /-->
+ <!--lifei@phoneSW.AudioDrv,14001 remove sidetone-handset for phone end-->
+ <ctl name="ADC2 Volume" value="13" />
</path>
<path name="speaker-and-headphones">
- <path name="spk-hph" />
- <ctl name="RX1 Digital Volume" value="84" />
- <ctl name="RX2 Digital Volume" value="84" />
- <ctl name="RX3 Digital Volume" value="80" />
- <ctl name="RX4 Digital Volume" value="80" />
+ <path name="headphones" />
+ <ctl name="RX1 Digital Volume" value="76" />
+ <ctl name="RX2 Digital Volume" value="76" />
+ <ctl name="RX3 MIX1 INP1" value="RX1" />
+ <ctl name="RDAC5 MUX" value="DEM3_INV" />
+ <ctl name="COMP2 Switch" value="1" />
+ <ctl name="LINEOUT1 Volume" value="13" />
+ <ctl name="LINEOUT3 Volume" value="13" />
+ <ctl name="RX3 Digital Volume" value="84" />
+ <ctl name="RX4 Digital Volume" value="84" />
+ <ctl name="SPKR Enable" value="1" />
</path>
+ <path name="speaker-and-headphones-fluid">
+ <path name="headphones" />
+ <ctl name="RX7 MIX1 INP1" value="RX1" />
+ <ctl name="COMP0 Switch" value="1" />
+ </path>
- <!-- Analog input devices -->
- <path name="hph-mic">
- <ctl name="DEC5 MUX" value="ADC2" />
- <ctl name="IIR1 INP1 MUX" value="DEC5" />
- <ctl name="DEC5 Volume" value="84" />
+ <path name="speaker-and-headphones-cdp">
+ <path name="speaker-and-headphones-fluid" />
</path>
- <path name="main-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="SLIM TX7 MUX" value="DEC4" />
- <ctl name="DEC4 MUX" value="ADC3" />
- <ctl name="DEC4 Volume" value="84" />
+ <path name="speaker-and-headphones-DB">
+ <path name="headphones" />
+ <ctl name="RX3 MIX1 INP1" value="RX1" />
+ <ctl name="RX5 MIX1 INP1" value="RX2" />
+ <ctl name="LINEOUT1 Volume" value="20" />
+ <ctl name="LINEOUT2 Volume" value="20" />
</path>
- <path name="anc-mic">
- <ctl name="DEC2 MUX" value="ADC5" />
- <ctl name="DEC2 Volume" value="84" />
+ <path name="speaker-and-headphones-liquid">
+ <path name="speaker-and-headphones-DB" />
+ <ctl name="RDAC5 MUX" value="DEM3_INV" />
+ <ctl name="RDAC7 MUX" value="DEM5_INV" />
+ <ctl name="COMP2 Switch" value="1" />
+ <ctl name="LINEOUT2 Volume" value="20" />
+ <ctl name="LINEOUT4 Volume" value="20" />
</path>
+ <path name="usb-headphones">
+ </path>
- <!-- Recording paths -->
- <path name="handset-mic">
- <path name="main-mic" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC3 Volume" value="19" />
+ <path name="afe-proxy">
</path>
- <path name="speaker-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM TX7 MUX" value="DEC2" />
- <ctl name="ADC5 Volume" value="19" />
- <path name="anc-mic" />
+ <path name="transmission-fm">
</path>
- <path name="headset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM TX7 MUX" value="DEC5" />
- <ctl name="ADC2 Volume" value="13" />
- <path name="hph-mic" />
+ <path name="anc-headphones">
+ <ctl name="ANC Function" value="ON" />
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="Two" />
+ <ctl name="RX1 MIX1 INP1" value="RX1" />
+ <ctl name="RX2 MIX1 INP1" value="RX2" />
+ <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
+ <ctl name="HPHL DAC Switch" value="1" />
+ <ctl name="HPHL Volume" value="14" />
+ <ctl name="HPHR Volume" value="14" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="RX2 Digital Volume" value="81" />
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
+ <ctl name="ANC1 MUX" value="ADC3" />
+ <ctl name="ANC2 MUX" value="ADC4" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
</path>
- <path name="voice-rec-mic">
- <path name="main-mic" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="ADC3 Volume" value="19" />
+ <path name="speaker-and-anc-headphones">
+ <ctl name="ANC Function" value="ON" />
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="Two" />
+ <ctl name="RX3 MIX1 INP1" value="RX1" />
+ <ctl name="RX5 MIX1 INP1" value="RX2" />
+ <ctl name="RX4 DSM MUX" value="DSM_INV" />
+ <ctl name="RX6 DSM MUX" value="DSM_INV" />
+ <ctl name="LINEOUT1 Volume" value="13" />
+ <ctl name="LINEOUT2 Volume" value="13" />
+ <ctl name="LINEOUT3 Volume" value="13" />
+ <ctl name="LINEOUT4 Volume" value="13" />
+ <ctl name="RX1 MIX1 INP1" value="RX1" />
+ <ctl name="RX2 MIX1 INP1" value="RX2" />
+ <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
+ <ctl name="HPHL DAC Switch" value="1" />
+ <ctl name="HPHL Volume" value="14" />
+ <ctl name="HPHR Volume" value="14" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="RX2 Digital Volume" value="81" />
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
+ <ctl name="ANC1 MUX" value="ADC3" />
+ <ctl name="ANC2 MUX" value="ADC4" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
</path>
- <path name="voice-speaker-mic">
- <path name="speaker-mic" />
+ <path name="voice-anc-headphones">
+ <ctl name="ANC Function" value="ON" />
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="SLIM RX2 MUX" value="AIF1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="Two" />
+ <ctl name="RX1 MIX1 INP1" value="RX1" />
+ <ctl name="RX2 MIX1 INP1" value="RX2" />
+ <ctl name="IIR1 Enable Band1" value="1" />
+ <ctl name="IIR1 Enable Band2" value="1" />
+ <ctl name="IIR1 Enable Band3" value="1" />
+ <ctl name="IIR1 Enable Band4" value="1" />
+ <ctl name="IIR1 Enable Band5" value="1" />
+ <ctl name="IIR1 INP1 Volume" value="62" />
+ <ctl name="RX1 MIX2 INP1" value="IIR1" />
+ <ctl name="RX2 MIX2 INP1" value="IIR1" />
+ <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" />
+ <ctl name="HPHL DAC Switch" value="1" />
+ <ctl name="HPHL Volume" value="14" />
+ <ctl name="HPHR Volume" value="14" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="RX2 Digital Volume" value="81" />
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ANC1 FB MUX" value="EAR_HPH_L" />
+ <ctl name="ANC1 MUX" value="ADC3" />
+ <ctl name="ANC2 MUX" value="ADC4" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
+ </path>
+
+ <path name="speaker-and-anc-headphones-fluid">
+ <path name="anc-headphones" />
+ <ctl name="RX7 MIX1 INP1" value="RX1" />
+ <ctl name="COMP0 Switch" value="1" />
</path>
- <path name="voice-headset-mic">
- <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
- <ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="SLIM TX7 MUX" value="DEC5" />
- <ctl name="ADC2 Volume" value="13" />
- <path name="hph-mic" />
+ <path name="speaker-and-anc-headphones-cdp">
+ <path name="speaker-and-anc-headphones-fluid" />
</path>
+ <path name="speaker-and-anc-headphones-DB">
+ <path name="anc-headphones" />
+ <ctl name="RX3 MIX1 INP1" value="RX1" />
+ <ctl name="RX5 MIX1 INP1" value="RX2" />
+ <ctl name="LINEOUT1 Volume" value="20" />
+ <ctl name="LINEOUT2 Volume" value="20" />
+ </path>
- <!-- USB digital audio -->
- <path name="usb-headphones">
+ <path name="speaker-and-anc-headphones-liquid">
+ <path name="speaker-and-anc-headphones-DB" />
+ <ctl name="RDAC5 MUX" value="DEM3_INV" />
+ <ctl name="RDAC7 MUX" value="DEM5_INV" />
+ <ctl name="COMP2 Switch" value="1" />
+ <ctl name="LINEOUT2 Volume" value="20" />
+ <ctl name="LINEOUT4 Volume" value="20" />
+ </path>
+
+ <path name="hdmi">
</path>
<path name="speaker-and-usb-headphones">
@@ -855,16 +1339,19 @@
<path name="usb-headphones" />
</path>
- <path name="usb-headset-mic">
+ <path name="speaker-and-hdmi">
+ <path name="speaker" />
+ <path name="hdmi" />
</path>
-
- <!-- AFE proxy -->
- <path name="afe-proxy">
+ <path name="voice-rec-mic">
+ <path name="handset-mic" />
</path>
+ <path name="hdmi-tx">
+ <path name="handset-mic" />
+ </path>
- <!-- Bluetooth -->
<path name="bt-sco-headset">
</path>
@@ -877,57 +1364,221 @@
<path name="bt-sco-mic-wb">
</path>
- <!-- Dual-mic recording -->
- <path name="handset-dmic">
+ <path name="usb-headset-mic">
+ </path>
+
+ <path name="capture-fm">
+ </path>
+
+
+ <path name="aanc-handset-mic">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Three" />
+ <ctl name="SLIM_0_RX AANC MUX" value="SLIMBUS_0_TX" />
+ <ctl name="SLIM TX7 MUX" value="DEC7" />
+ <ctl name="DEC7 MUX" value="DMIC1" />
+ <ctl name="SLIM TX8 MUX" value="DEC9" />
+ <ctl name="DEC9 MUX" value="DMIC4" />
+ <ctl name="SLIM TX9 MUX" value="DEC6" />
+ <ctl name="DEC6 MUX" value="DMIC6" />
+ <ctl name="IIR1 INP1 MUX" value="DEC7" />
+ </path>
+
+ <!-- Dual MIC devices -->
+ <path name="speaker-dmic-endfire">
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
<ctl name="SLIM TX7 MUX" value="DEC4" />
<ctl name="DEC4 MUX" value="ADC3" />
- <ctl name="DEC4 Volume" value="84" />
<ctl name="SLIM TX8 MUX" value="DEC3" />
<ctl name="DEC3 MUX" value="ADC4" />
- <ctl name="DEC3 Volume" value="84" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
+ <ctl name="SLIM_0_RX Format" value="S16_LE" />
+ </path>
+
+ <path name="speaker-dmic-endfire-liquid">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="SLIM TX7 MUX" value="DEC7" />
+ <ctl name="DEC7 MUX" value="DMIC1" />
+ <ctl name="SLIM TX8 MUX" value="DEC9" />
+ <ctl name="DEC9 MUX" value="DMIC4" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
+ </path>
+
+ <path name="echo-reference-speaker">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_MI2S_TX" />
+ </path>
+
+ <path name="echo-reference">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
</path>
<path name="dmic-endfire">
- <path name="handset-dmic" />
- <ctl name="ADC3 Volume" value="9" />
- <ctl name="ADC4 Volume" value="9" />
+ <path name="speaker-dmic-endfire" />
+ <ctl name="IIR1 INP1 MUX" value="DEC7" />
</path>
- <path name="voice-dmic-ef">
- <path name="dmic-endfire" />
+ <path name="dmic-endfire-liquid">
+ <path name="speaker-dmic-endfire-liquid" />
+ <ctl name="IIR1 INP1 MUX" value="DEC7" />
</path>
+ <path name="voice-speaker-voip-mic">
+ <path name="speaker-dmic-endfire" />
+ <ctl name="DEC3 Volume" value="84" />
+ <ctl name="DEC4 Volume" value="78" />
+ <ctl name="ADC3 Volume" value="13" />
+ <ctl name="ADC4 Volume" value="13" />
+ <ctl name="left Profile" value="1"/>
+ </path>
- <!-- Stereo recording -->
- <path name="speaker-stereo-dmic-ef">
+ <path name="handset-stereo-dmic-ef">
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
- <ctl name="SLIM_0_TX Channels" value="Two" />
- <ctl name="SLIM TX7 MUX" value="DEC4" />
+ <ctl name="SLIM TX7 MUX" value="DEC3" />
+ <ctl name="DEC3 MUX" value="ADC4" />
+ <ctl name="SLIM TX8 MUX" value="DEC4" />
<ctl name="DEC4 MUX" value="ADC3" />
+ <ctl name="SLIM_0_TX Channels" value="Two" />
+ <ctl name="DEC3 Volume" value="84" />
<ctl name="DEC4 Volume" value="84" />
- <ctl name="SLIM TX8 MUX" value="DEC2" />
- <ctl name="DEC2 MUX" value="ADC5" />
- <ctl name="DEC2 Volume" value="84" />
- <ctl name="ADC3 Volume" value="19" />
- <ctl name="ADC5 Volume" value="19" />
+ <ctl name="ADC3 Volume" value="13" />
+ <ctl name="ADC4 Volume" value="8" />
</path>
- <path name="handset-stereo-dmic-ef">
- <path name="handset-dmic" />
- <ctl name="ADC3 Volume" value="19" />
- <ctl name="ADC4 Volume" value="19" />
+ <path name="speaker-stereo-dmic-ef">
+ <path name="speaker-dmic-endfire" />
+ </path>
+
+ <path name="voice-dmic-ef-tmus">
+ <path name="dmic-endfire" />
+ </path>
+
+ <path name="voice-dmic-ef">
+ <path name="speaker-dmic-endfire" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
+ <ctl name="DEC3 Volume" value="84" />
+ <ctl name="DEC4 Volume" value="84" />
</path>
+ <!--wangdongdong.AudioDrv,14001 camcorder use dual mic-->
<path name="camcorder-mic">
- <path name="speaker-stereo-dmic-ef" />
+ <path name="handset-stereo-dmic-ef" />
+ </path>
+
+ <!--xiaojun.lv@phoneSW.AudioDrv,14001 handsfree call use ANC mic-->
+ <path name="voice-speaker-dmic-ef">
+ <path name="speaker-dmic-endfire" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="12" />
+ <ctl name="DEC3 Volume" value="84" />
+ <ctl name="DEC4 Volume" value="84" />
+ <ctl name="left Profile" value="1"/>
+ </path>
+
+ <path name="voice-rec-dmic-ef">
+ <path name="dmic-endfire" />
+ </path>
+
+ <path name="voice-rec-dmic-ef-fluence">
+ <path name="dmic-endfire" />
+ </path>
+
+ <path name="handset-stereo-dmic-ef-liquid">
+ <path name="speaker-dmic-endfire-liquid" />
+ </path>
+
+ <path name="speaker-stereo-dmic-ef-liquid">
+ <path name="speaker-dmic-endfire-liquid" />
+ </path>
+
+ <path name="voice-dmic-ef-liquid-liquid">
+ <path name="dmic-endfire-liquid" />
+ </path>
+
+ <path name="voice-speaker-dmic-ef-liquid">
+ <path name="dmic-endfire-liquid" />
+ </path>
+
+ <path name="voice-rec-dmic-ef-liquid">
+ <path name="dmic-endfire-liquid" />
</path>
+ <path name="voice-rec-dmic-ef-fluence-liquid">
+ <path name="dmic-endfire-liquid" />
+ </path>
+
+ <!-- Quad MIC devices -->
+ <path name="speaker-qmic">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX10" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Four" />
+ <ctl name="SLIM TX7 MUX" value="DEC9" />
+ <ctl name="DEC9 MUX" value="DMIC4" />
+ <ctl name="SLIM TX8 MUX" value="DEC10" />
+ <ctl name="DEC10 MUX" value="DMIC3" />
+ <ctl name="SLIM TX9 MUX" value="DEC8" />
+ <ctl name="DEC8 MUX" value="DMIC2" />
+ <ctl name="SLIM TX10 MUX" value="DEC6" />
+ <ctl name="DEC6 MUX" value="DMIC6" />
+ </path>
+
+ <path name="speaker-qmic-cdp">
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX9" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX10" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Four" />
+ <ctl name="SLIM TX7 MUX" value="DEC9" />
+ <ctl name="DEC9 MUX" value="DMIC4" />
+ <ctl name="SLIM TX8 MUX" value="DEC10" />
+ <ctl name="DEC10 MUX" value="DMIC3" />
+ <ctl name="SLIM TX9 MUX" value="DEC7" />
+ <ctl name="DEC7 MUX" value="DMIC1" />
+ <ctl name="SLIM TX10 MUX" value="DEC6" />
+ <ctl name="DEC6 MUX" value="DMIC6" />
+ </path>
+
+ <path name="voice-speaker-qmic">
+ <path name="speaker-qmic" />
+ </path>
+
+ <path name="quad-mic">
+ <path name="speaker-qmic" />
+ </path>
+
+ <path name="voice-speaker-qmic-cdp">
+ <path name="speaker-qmic-cdp" />
+ </path>
+
+ <path name="quad-mic-cdp">
+ <path name="speaker-qmic-cdp" />
+ </path>
+
+ <path name="voice-speaker-qmic-liquid">
+ <path name="speaker-qmic-cdp" />
+ </path>
+
+ <path name="quad-mic-liquid">
+ <path name="speaker-qmic-cdp" />
+ </path>
+
+ <path name="voice-speaker-qmic-DB">
+ <path name="speaker-qmic-cdp" />
+ </path>
+
+ <path name="quad-mic-DB">
+ <path name="speaker-qmic-cdp" />
+ </path>
<!-- TTY devices -->
+
<path name="tty-headphones">
<ctl name="SLIM RX1 MUX" value="AIF1_PB" />
<ctl name="SLIM_0_RX Channels" value="One" />
@@ -954,7 +1605,7 @@
</path>
<path name="voice-tty-full-headset-mic">
- <path name="hph-mic" />
+ <path name="adc2" />
<ctl name="ADC2 Volume" value="12" />
</path>
@@ -963,14 +1614,14 @@
</path>
<path name="voice-tty-vco-handset-mic">
- <path name="handset-mic" />
+ <path name="dmic1" />
</path>
-
- <!-- MAD -->
<path name="listen-handset-mic">
<ctl name="MADONOFF Switch" value="1" />
- <ctl name="MAD Input" value="ADC3" />
+ <!--ctl name="MAD Input" value="DMIC1" /-->
+ <ctl name="MAD Input" value="ADC3" />
+ <ctl name="ADC3 Volume" value="12" />
</path>
<path name="voice-rx">
@@ -979,7 +1630,4 @@
<path name="voice-tx">
</path>
- <path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
- </path>
</mixer>
diff -u -r android_device_oneplus_bacon-cm-12.1/bacon.mk android_device_oneplus_onyx-master/bacon.mk
--- android_device_oneplus_bacon-cm-12.1/bacon.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/bacon.mk 2015-11-21 16:33:29.000000000 +0100
@@ -22,7 +22,7 @@
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay vendor/extra/overlays/phone-1080p
# Haters gonna hate..
-PRODUCT_CHARACTERISTICS := nosdcard
+# PRODUCT_CHARACTERISTICS := nosdcard
# Config scripts
PRODUCT_PACKAGES += \
@@ -30,20 +30,29 @@
# Ramdisk
PRODUCT_PACKAGES += \
- libinit_bacon \
- fstab.bacon \
- init.bacon.rc \
+ libinit_onyx \
+ fstab.onyx \
+ init.onyx.rc \
init.qcom-common.rc \
init.qcom.power.rc \
init.qcom.usb.rc \
init.recovery.qcom.rc \
- ueventd.bacon.rc
+ ueventd.onyx.rc
# ANT+
PRODUCT_PACKAGES += \
AntHalService \
com.dsi.ant.antradio_library \
libantradio
+
+#~ # Keyhandler
+#~ PRODUCT_PACKAGES += \
+#~ com.cyanogenmod.keyhandler
+
+#~ PRODUCT_SYSTEM_SERVER_JARS += com.cyanogenmod.keyhandler
+
+#~ # never dexopt the keyhandler
+#~ $(call add-product-dex-preopt-module-config,com.cyanogenmod.keyhandler,disable)
# Audio
PRODUCT_COPY_FILES += \
@@ -57,7 +66,6 @@
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
- $(LOCAL_PATH)/audio/audio_platform_info.xml:system/etc/audio_platform_info.xml \
$(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \
$(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
@@ -93,13 +101,18 @@
PRODUCT_PROPERTY_OVERRIDES +=
bluetooth.hfp.client=1
+# Kernel
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/dt.img:dt.img
+
+
# Boot animation
TARGET_SCREEN_HEIGHT := 1920
TARGET_SCREEN_WIDTH := 1080
# Camera
PRODUCT_PACKAGES += \
- camera.bacon
+ camera.onyx
# Charger
PRODUCT_PACKAGES += \
@@ -180,23 +193,23 @@
PRODUCT_BOOT_JARS += qcmediaplayer
# NFC
-ifeq ($(TARGET_BUILD_VARIANT),user)
- NFCEE_ACCESS_PATH := $(LOCAL_PATH)/configs/nfcee_access.xml
-else
- NFCEE_ACCESS_PATH := $(LOCAL_PATH)/configs/nfcee_access_debug.xml
-endif
-PRODUCT_COPY_FILES += \
- $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml
-
-PRODUCT_PACKAGES += \
- NfcNci \
- Tag \
- nfc_nci.pn54x.default \
- com.android.nfc_extras
-
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/libnfc-nxp.conf:system/etc/libnfc-nxp.conf \
- $(LOCAL_PATH)/configs/libnfc-brcm.conf:system/etc/libnfc-brcm.conf
+#~ ifeq ($(TARGET_BUILD_VARIANT),user)
+#~ NFCEE_ACCESS_PATH := $(LOCAL_PATH)/configs/nfcee_access.xml
+#~ else
+#~ NFCEE_ACCESS_PATH := $(LOCAL_PATH)/configs/nfcee_access_debug.xml
+#~ endif
+#~ PRODUCT_COPY_FILES += \
+#~ $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml
+
+#~ PRODUCT_PACKAGES += \
+#~ NfcNci \
+#~ Tag \
+#~ nfc_nci.pn54x.default \
+#~ com.android.nfc_extras
+
+#~ PRODUCT_COPY_FILES += \
+#~ $(LOCAL_PATH)/configs/libnfc-nxp.conf:system/etc/libnfc-nxp.conf \
+#~ $(LOCAL_PATH)/configs/libnfc-brcm.conf:system/etc/libnfc-brcm.conf
# Permissions
PRODUCT_COPY_FILES += \
@@ -237,7 +250,7 @@
# Recovery
PRODUCT_EXTRA_RECOVERY_KEYS += \
- $(LOCAL_PATH)/bacon
+ $(LOCAL_PATH)/onyx
# Thermal config
PRODUCT_COPY_FILES += \
@@ -307,7 +320,7 @@
ro.telephony.default_network=9
# Call the proprietary setup
-$(call inherit-product-if-exists, vendor/oneplus/bacon/bacon-vendor.mk)
+$(call inherit-product-if-exists, vendor/oneplus/onyx/onyx-vendor.mk)
ifneq ($(QCPATH),)
$(call inherit-product-if-exists, $(QCPATH)/prebuilt_HY11/target/product/msm8974/prebuilt.mk)
Seulement dans android_device_oneplus_bacon-cm-12.1/: bacon.x509.pem
diff -u -r android_device_oneplus_bacon-cm-12.1/bluetooth/bdroid_buildcfg.h android_device_oneplus_onyx-master/bluetooth/bdroid_buildcfg.h
--- android_device_oneplus_bacon-cm-12.1/bluetooth/bdroid_buildcfg.h 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/bluetooth/bdroid_buildcfg.h 2015-11-21 16:33:29.000000000 +0100
@@ -19,7 +19,7 @@
#define BLUETOOTH_QTI_SW TRUE
-#define BTM_DEF_LOCAL_NAME "OnePlus One"
+#define BTM_DEF_LOCAL_NAME "OnePlus X"
#define MAX_ACL_CONNECTIONS 7
#define MAX_L2CAP_CHANNELS 16
diff -u -r android_device_oneplus_bacon-cm-12.1/BoardConfig.mk android_device_oneplus_onyx-master/BoardConfig.mk
--- android_device_oneplus_bacon-cm-12.1/BoardConfig.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/BoardConfig.mk 2015-11-21 16:33:29.000000000 +0100
@@ -17,7 +17,7 @@
# inherit from Oppo common
-include device/oppo/common/BoardConfigCommon.mk
-PLATFORM_PATH := device/oneplus/bacon
+PLATFORM_PATH := device/oneplus/onyx
# Include path
TARGET_SPECIFIC_HEADER_PATH := $(PLATFORM_PATH)/include
@@ -42,14 +42,15 @@
TARGET_BOARD_INFO_FILE ?= $(PLATFORM_PATH)/board-info.txt
# Kernel
-BOARD_CUSTOM_BOOTIMG_MK := $(PLATFORM_PATH)/mkbootimg.mk
+# BOARD_CUSTOM_BOOTIMG_MK := $(PLATFORM_PATH)/mkbootimg.mk
BOARD_KERNEL_BASE := 0x00000000
-BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1
+BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=onyx user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 androidboot.selinux=permissive
BOARD_KERNEL_PAGESIZE := 2048
-BOARD_KERNEL_SEPARATED_DT := true
-BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01e00000
+# BOARD_KERNEL_SEPARATED_DT := true
+BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 01000000 --tags_offset 00000100 --dt device/oneplus/onyx/dt.img
TARGET_KERNEL_ARCH := arm
-TARGET_KERNEL_CONFIG := cyanogenmod_bacon_defconfig
+# TARGET_KERNEL_CONFIG := cyanogenmod_onyx_defconfig
+TARGET_KERNEL_CONFIG := opx_defconfig
TARGET_KERNEL_SOURCE := kernel/oneplus/msm8974
# Enable DIAG on debug builds
@@ -61,7 +62,7 @@
BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
# Assert
-TARGET_OTA_ASSERT_DEVICE := bacon,A0001
+# TARGET_OTA_ASSERT_DEVICE := onyx,E1003
# Audio
BOARD_USES_ALSA_AUDIO := true
@@ -146,13 +147,13 @@
VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
# Init
-TARGET_INIT_VENDOR_LIB := libinit_bacon
+TARGET_INIT_VENDOR_LIB := libinit_onyx
# Lights
TARGET_PROVIDES_LIBLIGHT := true
# NFC
-BOARD_NFC_CHIPSET := pn547
+# BOARD_NFC_CHIPSET := pn547
# Protobuf-c
PROTOBUF_SUPPORTED := true
@@ -164,7 +165,7 @@
TARGET_RIL_VARIANT := caf
# Recovery
-TARGET_RECOVERY_FSTAB := $(PLATFORM_PATH)/rootdir/etc/fstab.bacon
+TARGET_RECOVERY_FSTAB := $(PLATFORM_PATH)/rootdir/etc/fstab.onyx
# RPC
TARGET_NO_RPC := true
@@ -201,4 +202,4 @@
endif
endif
--include vendor/oneplus/bacon/BoardConfigVendor.mk
+-include vendor/oneplus/onyx/BoardConfigVendor.mk
diff -u -r android_device_oneplus_bacon-cm-12.1/board-info.txt android_device_oneplus_onyx-master/board-info.txt
--- android_device_oneplus_bacon-cm-12.1/board-info.txt 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/board-info.txt 2015-11-21 16:33:29.000000000 +0100
@@ -1 +1 @@
-require version-trustzone=TZ.BF.2.0-2.0.0123
+require version-trustzone=TZ.BF.2.0-2.0.0134
diff -u -r android_device_oneplus_bacon-cm-12.1/camera/Android.mk android_device_oneplus_onyx-master/camera/Android.mk
--- android_device_oneplus_bacon-cm-12.1/camera/Android.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/camera/Android.mk 2015-11-21 16:33:29.000000000 +0100
@@ -1,15 +1,15 @@
-LOCAL_PATH := $(call my-dir)
+#~ LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := camera.bacon
-LOCAL_SRC_FILES := CameraWrapper.cpp
+#~ include $(CLEAR_VARS)
+#~ LOCAL_MODULE := camera.onyx
+#~ LOCAL_SRC_FILES := CameraWrapper.cpp
-LOCAL_C_INCLUDES := \
- system/media/camera/include
+#~ LOCAL_C_INCLUDES := \
+#~ system/media/camera/include
-LOCAL_SHARED_LIBRARIES := \
- libhardware liblog libcamera_client libutils libcutils libdl
+#~ LOCAL_SHARED_LIBRARIES := \
+#~ libhardware liblog libcamera_client libutils libcutils libdl
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw
-LOCAL_CFLAGS := -Werror
-include $(BUILD_SHARED_LIBRARY)
+#~ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/hw
+#~ LOCAL_CFLAGS := -Werror
+#~ include $(BUILD_SHARED_LIBRARY)
Seulement dans android_device_oneplus_bacon-cm-12.1/: cm.dependencies
diff -u -r android_device_oneplus_bacon-cm-12.1/cm.mk android_device_oneplus_onyx-master/cm.mk
--- android_device_oneplus_bacon-cm-12.1/cm.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/cm.mk 2015-11-21 16:33:29.000000000 +0100
@@ -15,31 +15,31 @@
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-# Inherit from bacon device
-$(call inherit-product, device/oneplus/bacon/bacon.mk)
+# Inherit from onyx device
+$(call inherit-product, device/oneplus/onyx/onyx.mk)
# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
+#~ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
# Inherit some common CM stuff.
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-PRODUCT_NAME := cm_bacon
-PRODUCT_DEVICE := bacon
+PRODUCT_NAME := cm_onyx
+PRODUCT_DEVICE := onyx
PRODUCT_MANUFACTURER := OnePlus
-PRODUCT_MODEL := A0001
+PRODUCT_MODEL := E1003
PRODUCT_GMS_CLIENTID_BASE := android-oneplus
PRODUCT_BRAND := oneplus
TARGET_VENDOR := oneplus
-TARGET_VENDOR_PRODUCT_NAME := bacon
-TARGET_VENDOR_DEVICE_NAME := A0001
-PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=A0001 PRODUCT_NAME=bacon
+TARGET_VENDOR_PRODUCT_NAME := onyx
+TARGET_VENDOR_DEVICE_NAME := E1003
+PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=E1003 PRODUCT_NAME=onyx
## Use the latest approved GMS identifiers unless running a signed build
-ifneq ($(SIGN_BUILD),true)
-PRODUCT_BUILD_PROP_OVERRIDES += \
- BUILD_FINGERPRINT=oneplus/bacon/A0001:5.1.1/LMY48B/YOG4PAS1N0:user/release-keys \
- PRIVATE_BUILD_DESC="bacon-user 5.1.1 LMY48B YOG4PAS1N0 release-keys"
-endif
+#~ ifneq ($(SIGN_BUILD),true)
+#~ PRODUCT_BUILD_PROP_OVERRIDES += \
+#~ BUILD_FINGERPRINT=oneplus/onyx/E1003:5.1.1/LMY48B/YOG4PAS1N0:user/release-keys \
+#~ PRIVATE_BUILD_DESC="onyx-user 5.1.1 LMY48B YOG4PAS1N0 release-keys"
+#~ endif
diff -u -r android_device_oneplus_bacon-cm-12.1/configs/thermal-engine.conf android_device_oneplus_onyx-master/configs/thermal-engine.conf
--- android_device_oneplus_bacon-cm-12.1/configs/thermal-engine.conf 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/configs/thermal-engine.conf 2015-11-21 16:33:29.000000000 +0100
@@ -1,55 +1,55 @@
sampling 5000
[SS-CPU0]
-algo_type ss
-sampling 65
-sensor cpu0
-device cpu
-set_point 85000
-set_point_clr 65000
-override 20000
+algo_type ss
+sampling 65
+sensor cpu0
+device cpu
+set_point 80000
+set_point_clr 60000
+override 20000
[SS-CPU1]
-algo_type ss
-sampling 65
-sensor cpu1
-device cpu
-set_point 85000
-set_point_clr 65000
-override 20000
+algo_type ss
+sampling 65
+sensor cpu1
+device cpu
+set_point 80000
+set_point_clr 60000
+override 20000
[SS-CPU2]
-algo_type ss
-sampling 65
-sensor cpu2
-device cpu
-set_point 85000
-set_point_clr 65000
-override 20000
+algo_type ss
+sampling 65
+sensor cpu2
+device cpu
+set_point 80000
+set_point_clr 60000
+override 20000
[SS-CPU3]
-algo_type ss
-sampling 65
-sensor cpu3
-device cpu
-set_point 85000
-set_point_clr 65000
-override 20000
+algo_type ss
+sampling 65
+sensor cpu3
+device cpu
+set_point 80000
+set_point_clr 60000
+override 20000
[SS-GPU]
-algo_type ss
-sampling 65
-sensor tsens_tz_sensor10
-device gpu
-set_point 95000
-set_point_clr 75000
-override 20000
+algo_type ss
+sampling 65
+sensor tsens_tz_sensor10
+device gpu
+set_point 95000
+set_point_clr 75000
+override 20000
[CPU0_MONITOR]
algo_type monitor
sensor cpu0
-sampling 1000
-thresholds 120000
+sampling 65
+thresholds 115000
thresholds_clr 110000
actions shutdown
action_info 0
@@ -57,8 +57,8 @@
[CPU1_MONITOR]
algo_type monitor
sensor cpu1
-sampling 1000
-thresholds 120000
+sampling 65
+thresholds 115000
thresholds_clr 110000
actions shutdown
action_info 0
@@ -66,8 +66,8 @@
[CPU2_MONITOR]
algo_type monitor
sensor cpu2
-sampling 1000
-thresholds 120000
+sampling 65
+thresholds 115000
thresholds_clr 110000
actions shutdown
action_info 0
@@ -75,23 +75,21 @@
[CPU3_MONITOR]
algo_type monitor
sensor cpu3
-sampling 1000
-thresholds 120000
+sampling 65
+thresholds 115000
thresholds_clr 110000
actions shutdown
action_info 0
-[HOTPLUG-CPU1]
-sampling 65
-thresholds 110000
-thresholds_clr 95000
+[QUIET_THERM_BATTERY_MITIGATION]
+algo_type monitor
+sensor emmc_therm
+sampling 1000
+thresholds 40000 45000 50000 55000
+thresholds_clr 38000 43000 48000 53000
+actions battery battery battery battery
+action_info 1 2 3 4
+
+
-[HOTPLUG-CPU2]
-sampling 65
-thresholds 110000
-thresholds_clr 95000
-[HOTPLUG-CPU3]
-sampling 65
-thresholds 110000
-thresholds_clr 95000
Seulement dans android_device_oneplus_onyx-master/: dt.img
diff -u -r android_device_oneplus_bacon-cm-12.1/gps/Android.mk android_device_oneplus_onyx-master/gps/Android.mk
--- android_device_oneplus_bacon-cm-12.1/gps/Android.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/gps/Android.mk 2015-11-21 16:33:29.000000000 +0100
@@ -14,7 +14,7 @@
# limitations under the License.
#
-ifneq ($(filter bacon,$(TARGET_DEVICE)),)
+ifneq ($(filter onyx,$(TARGET_DEVICE)),)
LOC_PATH := $(call my-dir)
diff -u -r android_device_oneplus_bacon-cm-12.1/init/Android.mk android_device_oneplus_onyx-master/init/Android.mk
--- android_device_oneplus_bacon-cm-12.1/init/Android.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/init/Android.mk 2015-11-21 16:33:29.000000000 +0100
@@ -5,6 +5,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := system/core/init
LOCAL_CFLAGS := -Wall
-LOCAL_SRC_FILES := init_bacon.c
-LOCAL_MODULE := libinit_bacon
+LOCAL_SRC_FILES := init_onyx.c
+LOCAL_MODULE := libinit_onyx
include $(BUILD_STATIC_LIBRARY)
Seulement dans android_device_oneplus_onyx-master/: keyhandler
Seulement dans android_device_oneplus_bacon-cm-12.1/: mkbootimg.mk
diff -u -r android_device_oneplus_bacon-cm-12.1/overlay/frameworks/base/core/res/res/xml/power_profile.xml android_device_oneplus_onyx-master/overlay/frameworks/base/core/res/res/xml/power_profile.xml
--- android_device_oneplus_bacon-cm-12.1/overlay/frameworks/base/core/res/res/xml/power_profile.xml 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/overlay/frameworks/base/core/res/res/xml/power_profile.xml 2015-11-21 16:33:29.000000000 +0100
@@ -16,62 +16,58 @@
** limitations under the License.
*/
-->
-
<device name="Android">
- <!-- All values are in mAh except as noted -->
- <item name="none">0</item>
- <item name="screen.on">71.55</item>
- <item name="screen.full">211.6</item>
- <item name="bluetooth.active">59.22</item>
- <item name="bluetooth.on">0.7</item>
- <item name="wifi.on">3.30</item>
- <item name="wifi.active">62.09</item>
- <item name="wifi.scan">52.1</item>
- <item name="dsp.audio">0.1</item>
- <item name="dsp.video">0.1</item>
- <item name="gps.on">20.9</item>
- <!-- The current consumed by the radio when it is scanning for a signal -->
- <item name="radio.active">185.6</item>
- <item name="radio.scanning">122.68</item>
- <!-- Current consumed by the radio at different signal strengths, when paging -->
- <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
- <value>1.16</value>
- <value>2.15</value>
- </array>
- <!-- Different CPU speeds as reported in
- /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
- <array name="cpu.speeds">
- <value>384000</value>
- <value>486000</value>
- <value>594000</value>
- <value>702000</value>
- <value>810000</value>
- <value>918000</value>
- <value>1026000</value>
- <value>1134000</value>
- <value>1242000</value>
- <value>1350000</value>
- <value>1458000</value>
- <value>1512000</value>
- </array>
- <!-- Power consumption when CPU is idle -->
- <item name="cpu.idle">3.5</item>
- <item name="cpu.awake">10.43</item>
- <!-- Power consumption at different speeds -->
- <array name="cpu.active">
- <value>92.6</value>
- <value>108.6</value>
- <value>118.8</value>
- <value>121.4</value>
- <value>127.3</value>
- <value>133.1</value>
- <value>173.3</value>
- <value>209.5</value>
- <value>216.5</value>
- <value>228.5</value>
- <value>236.0</value>
- <value>239.7</value>
- </array>
- <!-- This is the battery capacity in mAh -->
- <item name="battery.capacity">3100</item>
+ <item name="none">0</item>
+ <item name="screen.on">79.6</item>
+ <item name="screen.full">232.2</item>
+ <item name="bluetooth.active">47</item>
+ <item name="bluetooth.on">0.9</item>
+ <item name="wifi.on">1.6</item>
+ <item name="wifi.active">132.5</item>
+ <item name="wifi.scan">172</item>
+ <item name="dsp.audio">81</item>
+ <item name="dsp.video">152</item>
+ <item name="radio.active">125.5</item>
+ <item name="radio.scanning">2</item>
+ <item name="gps.on">65.5</item>
+ <array name="radio.on">
+ <value>2</value>
+ <value>1</value>
+ </array>
+ <array name="cpu.speeds">
+ <value>300000</value>
+ <value>422400</value>
+ <value>652800</value>
+ <value>729600</value>
+ <value>883200</value>
+ <value>960000</value>
+ <value>1036800</value>
+ <value>1190400</value>
+ <value>1267200</value>
+ <value>1497600</value>
+ <value>1574400</value>
+ <value>1728000</value>
+ <value>1958400</value>
+ <value>2265600</value>
+ <value>2457600 </value>
+ </array>
+ <item name="cpu.idle">4.7</item>
+ <array name="cpu.active">
+ <value>75</value>
+ <value>104</value>
+ <value>132</value>
+ <value>136.5</value>
+ <value>143.9</value>
+ <value>178</value>
+ <value>184</value>
+ <value>190</value>
+ <value>246</value>
+ <value>268</value>
+ <value>298</value>
+ <value>358</value>
+ <value>378</value>
+ <value>420</value>
+ <value>430</value>
+ </array>
+ <item name="battery.capacity">2520</item>
</device>
diff -u -r android_device_oneplus_bacon-cm-12.1/overlay/frameworks/base/core/res/res/xml/storage_list.xml android_device_oneplus_onyx-master/overlay/frameworks/base/core/res/res/xml/storage_list.xml
--- android_device_oneplus_bacon-cm-12.1/overlay/frameworks/base/core/res/res/xml/storage_list.xml 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/overlay/frameworks/base/core/res/res/xml/storage_list.xml 2015-11-21 16:33:29.000000000 +0100
@@ -20,19 +20,12 @@
<!-- See storage config details at http://source.android.com/tech/storage/ -->
<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-
- <!-- internal emulated storage -->
- <storage
- android:storageDescription="@string/storage_internal"
- android:primary="true"
- android:emulated="true"
- android:mtpReserve="100" />
-
- <!-- external USB OTG storage -->
- <storage android:mountPoint="/storage/usbdisk"
- android:storageDescription="@string/storage_usb"
- android:primary="false"
- android:emulated="false"
- android:removable="true" />
-
+ <storage android:mountPoint="/storage/sdcard0" android:storageDescription="@string/storage_internal" android:primary="true" android:removable="false" android:emulated="true" android:mtpReserve="100" />
+ <storage android:mountPoint="/storage/sdcard1" android:storageDescription="@string/storage_sd_card" android:primary="false" android:removable="true" android:emulated="false" android:allowMassStorage="true" />
+ <storage android:mountPoint="/storage/UDiskA" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" android:emulated="false" />
+ <storage android:mountPoint="/storage/UDiskB" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" android:emulated="false" />
+ <storage android:mountPoint="/storage/UDiskC" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" android:emulated="false" />
+ <storage android:mountPoint="/storage/UDiskD" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" android:emulated="false" />
+ <storage android:mountPoint="/storage/UDiskE" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" android:emulated="false" />
+ <storage android:mountPoint="/storage/UDiskF" android:storageDescription="@string/storage_usb" android:primary="false" android:removable="true" android:emulated="false" />
</StorageList>
diff -u -r android_device_oneplus_bacon-cm-12.1/overlay/packages/apps/Settings/res/values/config.xml android_device_oneplus_onyx-master/overlay/packages/apps/Settings/res/values/config.xml
--- android_device_oneplus_bacon-cm-12.1/overlay/packages/apps/Settings/res/values/config.xml 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/overlay/packages/apps/Settings/res/values/config.xml 2015-11-21 16:33:29.000000000 +0100
@@ -27,8 +27,8 @@
<!-- Must be overlaid by device -->
<bool name="config_show_ic_enable" translatable="false">true</bool>
<!-- IC Code -->
- <string name="ic_model" translatable="false">ONE A0001</string>
- <string name="ic_code" translatable="false">12739A-A0001</string>
+ <string name="ic_model" translatable="false">ONE E1003</string>
+ <string name="ic_code" translatable="false">12739A-E1003</string>
<!-- Regulatory Info -->
<!-- Whether to show a preference item for regulatory information in About phone -->
diff -u -r android_device_oneplus_bacon-cm-12.1/proprietary-files-qc.txt android_device_oneplus_onyx-master/proprietary-files-qc.txt
--- android_device_oneplus_bacon-cm-12.1/proprietary-files-qc.txt 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/proprietary-files-qc.txt 2015-11-21 16:33:29.000000000 +0100
@@ -125,7 +125,7 @@
vendor/lib/libqti-perfd-client.so
# Postprocessing
--app/PPPreference/PPPreference.apk
+# -app/PPPreference/PPPreference.apk
bin/mm-pp-daemon
vendor/lib/libdisp-aba.so
-vendor/lib/libmm-abl.so
@@ -152,10 +152,10 @@
vendor/lib/libsystem_health_mon.so
# QuickBoot
--app/QuickBoot/QuickBoot.apk
+# -app/QuickBoot/QuickBoot.apk
# Radio
--app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+-priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
-app/shutdownlistener/shutdownlistener.apk
bin/netmgrd
bin/qmuxd
@@ -201,5 +201,5 @@
etc/firmware/venus.mdt
# WiFi
--lib/libwpa_qmi_eap_proxy.so
-lib/libwcnss_qmi.so
+-lib/libwpa_client.so
+# lib/libwcnss_qmi.so
diff -u -r android_device_oneplus_bacon-cm-12.1/proprietary-files.txt android_device_oneplus_onyx-master/proprietary-files.txt
--- android_device_oneplus_bacon-cm-12.1/proprietary-files.txt 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/proprietary-files.txt 2015-11-21 16:33:29.000000000 +0100
@@ -1,6 +1,6 @@
# Camera
bin/mm-qcamera-daemon
-lib/hw/camera.vendor.bacon.so
+lib/hw/camera.msm8974.so
lib/libmmcamera_interface.so
lib/libmmjpeg_interface.so
lib/libqomx_core.so
@@ -24,10 +24,10 @@
vendor/lib/libmmcamera_imglib.so
vendor/lib/libmmcamera_imx214.so
vendor/lib/libmmcamera_ov5648.so
-vendor/lib/libmmcamera_sony_imx214_eeprom.so
+#vendor/lib/libmmcamera_sony_imx214_eeprom.so
vendor/lib/libmmcamera_tintless_algo.so
vendor/lib/libmmcamera_tintless_bg_pca_algo.so
-vendor/lib/libmmcamera_tuning.so
+#vendor/lib/libmmcamera_tuning.so
vendor/lib/libmmcamera_wavelet_lib.so
vendor/lib/libmmipl.so
vendor/lib/libmmjpeg.so
@@ -47,8 +47,8 @@
vendor/lib/libchromatix_imx214_snapshot.so
vendor/lib/libchromatix_imx214_snapshot_hdr.so
vendor/lib/libchromatix_imx214_video_binning.so
-vendor/lib/libchromatix_imx214_video_cmcc.so
-vendor/lib/libchromatix_imx214_video_hdr.so
+#vendor/lib/libchromatix_imx214_video_cmcc.so
+#vendor/lib/libchromatix_imx214_video_hdr.so
vendor/lib/libchromatix_ov5648_common.so
vendor/lib/libchromatix_ov5648_default_video.so
vendor/lib/libchromatix_ov5648_preview.so
@@ -63,7 +63,7 @@
etc/firmware/cpp_firmware_v1_2_0.fw
# NFC
-etc/firmware/libpn547_fw.so:vendor/firmware/libpn547_fw.so
+# etc/firmware/libpn547_fw.so:vendor/firmware/libpn547_fw.so
# Sensors
etc/sensor_def_qcomdev.conf
diff -u -r android_device_oneplus_bacon-cm-12.1/README.md android_device_oneplus_onyx-master/README.md
--- android_device_oneplus_bacon-cm-12.1/README.md 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/README.md 2015-11-21 16:33:29.000000000 +0100
@@ -1,4 +1 @@
-Device tree for One+
-
-Copyright 2014, The CyanogenMod Project
-
+Device tree for OnePlus X
diff -u -r android_device_oneplus_bacon-cm-12.1/rootdir/Android.mk android_device_oneplus_onyx-master/rootdir/Android.mk
--- android_device_oneplus_bacon-cm-12.1/rootdir/Android.mk 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/rootdir/Android.mk 2015-11-21 16:33:29.000000000 +0100
@@ -10,21 +10,56 @@
LOCAL_SRC_FILES := etc/init.qcom.bt.sh
include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.qcom.syspart_fixup.sh
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := etc/init.qcom.syspart_fixup.sh
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.qcom.wifi.sh
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := etc/init.qcom.wifi.sh
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.qcom.audio.sh
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := etc/init.qcom.audio.sh
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.qcom.efs.sync.sh
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := etc/init.qcom.efs.sync.sh
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.qcom.modem_links.sh
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := etc/init.qcom.modem_links.sh
+include $(BUILD_PREBUILT)
+
# Device init files
include $(CLEAR_VARS)
-LOCAL_MODULE := fstab.bacon
+LOCAL_MODULE := fstab.onyx
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/fstab.bacon
+LOCAL_SRC_FILES := etc/fstab.onyx
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := init.bacon.rc
+LOCAL_MODULE := init.onyx.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/init.bacon.rc
+LOCAL_SRC_FILES := etc/init.onyx.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
@@ -53,7 +88,7 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := ueventd.bacon.rc
+LOCAL_MODULE := ueventd.onyx.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/ueventd.qcom.rc
Seulement dans android_device_oneplus_bacon-cm-12.1/rootdir/etc: fstab.bacon
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: fstab.onyx
Seulement dans android_device_oneplus_bacon-cm-12.1/rootdir/etc: init.bacon.rc
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: init.onyx.rc
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: init.qcom.audio.sh
diff -u -r android_device_oneplus_bacon-cm-12.1/rootdir/etc/init.qcom.bt.sh android_device_oneplus_onyx-master/rootdir/etc/init.qcom.bt.sh
--- android_device_oneplus_bacon-cm-12.1/rootdir/etc/init.qcom.bt.sh 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/rootdir/etc/init.qcom.bt.sh 2015-11-21 16:33:29.000000000 +0100
@@ -103,7 +103,15 @@
setprop ro.qualcomm.bluetooth.map true
setprop ro.qualcomm.bluetooth.nap true
setprop ro.bluetooth.sap true
- setprop ro.bluetooth.dun false
+ case $target in
+ "apq8084")
+ setprop ro.bluetooth.dun true
+ logi "Enabling BT-DUN for APQ8084"
+ ;;
+ *)
+ setprop ro.bluetooth.dun false
+ ;;
+ esac
;;
"msm")
setprop ro.qualcomm.bluetooth.opp true
@@ -112,8 +120,8 @@
setprop ro.qualcomm.bluetooth.pbap true
setprop ro.qualcomm.bluetooth.ftp true
setprop ro.qualcomm.bluetooth.nap true
- setprop ro.bluetooth.sap false
- setprop ro.bluetooth.dun false
+ setprop ro.bluetooth.sap true
+ setprop ro.bluetooth.dun true
case $btsoc in
"ath3k")
setprop ro.qualcomm.bluetooth.map false
@@ -131,8 +139,8 @@
setprop ro.qualcomm.bluetooth.ftp true
setprop ro.qualcomm.bluetooth.map true
setprop ro.qualcomm.bluetooth.nap true
- setprop ro.bluetooth.sap false
- setprop ro.bluetooth.dun false
+ setprop ro.bluetooth.sap true
+ setprop ro.bluetooth.dun true
;;
esac
@@ -152,10 +160,13 @@
setprop ro.qualcomm.bt.hci_transport smd
fi
;;
- "apq8084")
- if ["$btsoc" != "rome"]
+ "apq8084" | "mpq8092" )
+ if [ "$btsoc" != "rome" ]
then
setprop ro.qualcomm.bt.hci_transport smd
+ elif [ "$btsoc" = "rome" ]
+ then
+ setprop ro.bluetooth.hfp.ver 1.6
fi
;;
*)
diff -u -r android_device_oneplus_bacon-cm-12.1/rootdir/etc/init.qcom-common.rc android_device_oneplus_onyx-master/rootdir/etc/init.qcom-common.rc
--- android_device_oneplus_bacon-cm-12.1/rootdir/etc/init.qcom-common.rc 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/rootdir/etc/init.qcom-common.rc 2015-11-21 16:33:29.000000000 +0100
@@ -226,6 +226,10 @@
chown system system /persist
chmod 0771 /persist
+ #Create the symlink to qcn wpa_supplicant folder for ar6000 wpa_supplicant
+ mkdir /data/system 0775 system system
+ #symlink /data/misc/wifi/wpa_supplicant /data/system/wpa_supplicant
+
#Create directories for Location services
mkdir /data/misc/location 0770 gps gps
mkdir /data/misc/location/mq 0770 gps gps
@@ -363,16 +367,16 @@
oneshot
service p2p_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
- -I/system/etc/wifi/p2p_supplicant_overlay.conf \
- -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin \
- -g@android:wpa_wlan0
- # we will start as root and wpa_supplicant will switch to user wifi
- # after setting up the capabilities required for WEXT
- # user wifi
- # group wifi inet keystore
+ -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
+ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+ -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+ -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 \
+ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+# we will start as root and wpa_supplicant will switch to user wifi
+# after setting up the capabilities required for WEXT
+# user wifi
+# group wifi inet keystore
class main
socket wpa_wlan0 dgram 660 wifi wifi
disabled
@@ -381,6 +385,7 @@
service wpa_supplicant /system/bin/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
+ -O/data/misc/wifi/sockets -dd \
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
@@ -391,12 +396,12 @@
disabled
oneshot
-service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL
+service dhcpcd_wlan0 /system/bin/dhcpcd -ABKLG
class late_start
disabled
oneshot
-service dhcpcd_p2p /system/bin/dhcpcd -aABKL
+service dhcpcd_p2p /system/bin/dhcpcd -ABKLG
class late_start
disabled
oneshot
@@ -411,12 +416,25 @@
disabled
oneshot
-service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL
+service ptt_socket_app /system/bin/ptt_socket_app -d
+ class main
+ user root
+ group root
+ disabled
+ oneshot
+
+service ptt_ffbm /system/bin/ptt_socket_app -f -d
+ user root
+ group root
+ disabled
+ oneshot
+
+service dhcpcd_bt-pan /system/bin/dhcpcd -BKLG
class late_start
disabled
oneshot
-service iprenew_eth0 /system/bin/dhcpcd -n
+service iprenew_bt-pan /system/bin/dhcpcd -n
class late_start
disabled
oneshot
@@ -441,14 +459,6 @@
disabled
oneshot
-service dhcpcd_bt-pan /system/bin/dhcpcd -BKLG
- disabled
- oneshot
-
-service iprenew_bt-pan /system/bin/dhcpcd -n
- disabled
- oneshot
-
service loc_launcher /system/bin/loc_launcher
#loc_launcher will start as root and set its uid to gps
class late_start
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: init.qcom.efs.sync.sh
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: init.qcom.fm.sh
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: init.qcom.modem_links.sh
Seulement dans android_device_oneplus_onyx-master/rootdir/etc: init.qcom.wifi.sh
diff -u -r android_device_oneplus_bacon-cm-12.1/rootdir/etc/ueventd.qcom.rc android_device_oneplus_onyx-master/rootdir/etc/ueventd.qcom.rc
--- android_device_oneplus_bacon-cm-12.1/rootdir/etc/ueventd.qcom.rc 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/rootdir/etc/ueventd.qcom.rc 2015-11-21 16:33:29.000000000 +0100
@@ -1,185 +1,101 @@
-# Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of The Linux Foundation nor
-# the names of its contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+subsystem adf
+ devname uevent_devname
+
+/dev/null 0666 root root
+/dev/zero 0666 root root
+/dev/full 0666 root root
+/dev/ptmx 0666 root root
+/dev/tty 0666 root root
+/dev/random 0666 root root
+/dev/urandom 0666 root root
+# Make HW RNG readable by group system to let EntropyMixer read it.
+/dev/hw_random 0440 root system
+/dev/ashmem 0666 root root
+/dev/binder 0666 root root
+
+# Anyone can read the logs, but if they're not in the "logs"
+# group, then they'll only see log entries for their UID.
+/dev/log/* 0666 root log
+
+# the msm hw3d client device node is world writable/readable
+/dev/msm_hw3dc 0666 root root
# the DIAG device node is not world writable/readable.
/dev/diag 0660 system qcom_diag
-/dev/genlock 0666 system system
-/dev/kgsl 0666 system system
-/dev/kgsl-3d0 0666 system system
-/dev/kgsl-2d0 0666 root root
-/dev/kgsl-2d1 0666 root root
-/dev/ion 0664 system system
-/dev/rtc0 0600 system system
-/dev/smd0 0660 system system
-/dev/smd4 0660 system system
-/dev/smd_cxm_qmi 0640 radio radio
-/dev/smd5 0660 system system
-/dev/smd6 0660 system system
-/dev/smd7 0660 bluetooth bluetooth
-
-#permissions for CSVT
-/dev/smd11 0660 radio radio
-
-/dev/radio0 0640 system system
-/dev/rfcomm0 0660 bluetooth bluetooth
-/dev/smdcntl0 0640 radio radio
-/dev/smdcntl1 0640 radio radio
-/dev/smdcntl2 0640 radio radio
-/dev/smdcntl3 0640 radio radio
-/dev/smdcntl4 0640 radio radio
-/dev/smdcntl5 0640 radio radio
-/dev/smdcntl6 0640 radio radio
-/dev/smdcntl7 0640 radio radio
-/dev/smdcntl8 0640 radio radio
-/dev/smdcntl9 0640 radio radio
-/dev/smdcntl10 0640 radio radio
-/dev/smdcntl11 0640 radio radio
-/dev/smdcnt_rev0 0640 radio radio
-/dev/smdcnt_rev1 0640 radio radio
-/dev/smdcnt_rev2 0640 radio radio
-/dev/smdcnt_rev3 0640 radio radio
-/dev/smdcnt_rev4 0640 radio radio
-/dev/smdcnt_rev5 0640 radio radio
-/dev/smdcnt_rev6 0640 radio radio
-/dev/smdcnt_rev7 0640 radio radio
-/dev/smdcnt_rev8 0640 radio radio
-/dev/smuxctl32 0640 radio radio
-/dev/sdioctl0 0640 radio radio
-/dev/sdioctl1 0640 radio radio
-/dev/sdioctl2 0640 radio radio
-/dev/sdioctl3 0640 radio radio
-/dev/sdioctl4 0640 radio radio
-/dev/sdioctl5 0640 radio radio
-/dev/sdioctl6 0640 radio radio
-/dev/sdioctl7 0640 radio radio
-/dev/sdioctl8 0640 radio radio
-/dev/rmnet_mux_ctrl 0640 radio radio
-/dev/hsicctl0 0640 radio radio
-/dev/hsicctl1 0640 radio radio
-/dev/hsicctl2 0640 radio radio
-/dev/hsicctl3 0640 radio radio
-/dev/hsicctl4 0640 radio radio
-/dev/hsicctl5 0640 radio radio
-/dev/hsicctl6 0640 radio radio
-/dev/hsicctl7 0640 radio radio
-/dev/hsicctl8 0640 radio radio
-/dev/hsicctl9 0640 radio radio
-/dev/hsicctl10 0640 radio radio
-/dev/hsicctl11 0640 radio radio
-/dev/hsicctl12 0640 radio radio
-/dev/hsicctl13 0640 radio radio
-/dev/hsicctl14 0640 radio radio
-/dev/hsicctl15 0640 radio radio
-/dev/hsicctl16 0640 radio radio
-/dev/video* 0660 system camera
-/dev/media* 0660 system camera
-/dev/v4l-subdev* 0660 system camera
-/dev/qseecom 0660 system drmrpc
-/dev/pft 0660 system drmrpc
-/dev/gemini0 0660 system camera
-/dev/jpeg0 0660 system camera
-/dev/jpeg1 0660 system camera
-/dev/jpeg2 0660 system camera
-/dev/adsprpc-smd 0660 system media
-/dev/msm_camera/* 0660 system camera
-/dev/gemini/ 0660 system camera
-/dev/mercury0 0660 system camera
-/dev/msm_vidc_reg 0660 system audio
-/dev/msm_vidc_dec 0660 system audio
-/dev/msm_vidc_dec_sec 0660 system audio
-/dev/msm_vidc_enc 0660 system audio
-/dev/msm_rotator 0660 system system
-/dev/hw_random 0660 system system
-
-#permissions for audio
-/dev/msm_qcelp 0660 system audio
-/dev/msm_evrc 0660 system audio
-/dev/msm_wma 0660 system audio
-/dev/msm_wmapro 0660 system audio
-/dev/msm_amrnb 0660 system audio
-/dev/msm_amrwb 0660 system audio
-/dev/msm_amrwbplus 0660 system audio
-/dev/msm_aac 0660 system audio
-/dev/msm_multi_aac 0660 system audio
-/dev/msm_aac_in 0660 system audio
-/dev/msm_qcelp_in 0660 system audio
-/dev/msm_evrc_in 0660 system audio
-/dev/msm_amrnb_in 0640 system audio
-/dev/msm_a2dp_in 0660 system audio
-/dev/msm_ac3 0660 system audio
-/dev/msm_acdb 0660 system audio
-/dev/msm_cad 0660 system audio
-/dev/msm_fm 0660 system audio
-/dev/msm_mvs 0660 system audio
-/dev/msm_pcm_lp_dec 0660 system audio
-/dev/msm_preproc_ctl 0660 system audio
-/dev/msm_rtac 0660 system audio
-/dev/msm_voicememo 0660 system audio
-/dev/smd3 0660 bluetooth net_bt_stack
-/dev/smd2 0660 bluetooth net_bt_stack
-/dev/ttyHSL1 0660 system system
-/dev/mdm 0660 system radio
-/sys/devices/virtual/smdpkt/smdcntl* open_timeout 0664 radio radio
-/dev/sdio_tty_ciq_00 0660 system system
-/dev/tty_sdio_00 0660 system system
-/dev/ttyGS0 0660 system system
-/dev/i2c-5 0660 media media
-
-# DVB devices
-/dev/dvb/adapter0/demux* 0440 media media
-/dev/dvb/adapter0/dvr* 0660 media media
-/dev/dvb/adapter0/video* 0660 media media
-
-# Broadcast devices
-/dev/tsc_mux0 0660 media media
-/dev/tsc_ci0 0660 media media
-
-# sensors
-/sys/devices/i2c-12/12-* pollrate_ms 0664 system system
-/sys/devices/f9925000.i2c/i2c-0/0-* enable 0660 input system
-/sys/devices/f9925000.i2c/i2c-0/0-* poll_delay 0660 input system
-/sys/devices/virtual/optical_sensors/proximity ps_adc 0660 input system
-/sys/devices/virtual/optical_sensors/proximity ps_poll_delay 0660 input system
-/sys/devices/virtual/optical_sensors/lightsensor ls_auto 0660 input system
-/sys/devices/virtual/optical_sensors/lightsensor ls_poll_delay 0660 input system
-/sys/devices/virtual/input/input* poll 0660 input system
-/sys/devices/virtual/input/input* pollrate_ms 0660 input system
-
-# wlan
-/dev/wcnss_wlan 0660 system system
-/dev/wcnss_ctrl 0660 system system
-#nfc permissions
-/dev/nfc-nci 0660 nfc nfc
-
-# UIO devices
-/dev/uio0 0660 system system
-/dev/uio1 0660 system system
-/dev/uio2 0660 system system
+# gpu driver for adreno200 is globally accessible
+/dev/kgsl 0666 root root
+
+# kms driver for drm based gpu
+/dev/dri/* 0666 root graphics
+
+# these should not be world writable
+/dev/diag_arm9 0660 radio radio
+/dev/android_adb 0660 adb adb
+/dev/android_adb_enable 0660 adb adb
+/dev/ttyMSM0 0600 bluetooth bluetooth
+/dev/uhid 0660 system net_bt_stack
+/dev/uinput 0660 system net_bt_stack
+/dev/alarm 0664 system radio
+/dev/rtc0 0640 system system
+/dev/tty0 0660 root system
+/dev/graphics/* 0660 system graphics
+/dev/msm_hw3dm 0660 system graphics
+/dev/input/* 0660 root input
+/dev/eac 0660 root audio
+/dev/cam 0660 root camera
+/dev/pmem 0660 system graphics
+/dev/pmem_adsp* 0660 system audio
+/dev/pmem_camera* 0660 system camera
+/dev/oncrpc/* 0660 root system
+/dev/adsp/* 0660 system audio
+/dev/snd/* 0660 system audio
+/dev/mt9t013 0660 system system
+/dev/msm_camera/* 0660 system system
+/dev/akm8976_daemon 0640 compass system
+/dev/akm8976_aot 0640 compass system
+/dev/akm8973_daemon 0640 compass system
+/dev/akm8973_aot 0640 compass system
+/dev/bma150 0640 compass system
+/dev/cm3602 0640 compass system
+/dev/akm8976_pffd 0640 compass system
+/dev/lightsensor 0640 system system
+/dev/msm_pcm_out* 0660 system audio
+/dev/msm_pcm_in* 0660 system audio
+/dev/msm_pcm_ctl* 0660 system audio
+/dev/msm_snd* 0660 system audio
+/dev/msm_mp3* 0660 system audio
+/dev/audience_a1026* 0660 system audio
+/dev/tpa2018d1* 0660 system audio
+/dev/msm_audpre 0660 system audio
+/dev/msm_audio_ctl 0660 system audio
+/dev/htc-acoustic 0660 system audio
+/dev/vdec 0660 system audio
+/dev/q6venc 0660 system audio
+/dev/snd/dsp 0660 system audio
+/dev/snd/dsp1 0660 system audio
+/dev/snd/mixer 0660 system audio
+/dev/smd0 0640 radio radio
+/dev/qmi 0640 radio radio
+/dev/qmi0 0640 radio radio
+/dev/qmi1 0640 radio radio
+/dev/qmi2 0640 radio radio
+/dev/bus/usb/* 0660 root usb
+/dev/mtp_usb 0660 root mtp
+/dev/usb_accessory 0660 root usb
+/dev/tun 0660 system vpn
+
+# CDMA radio interface MUX
+/dev/ts0710mux* 0640 radio radio
+/dev/ppp 0660 radio vpn
+
+# sysfs properties
+/sys/devices/platform/trusty.* trusty_version 0440 root log
+/sys/devices/virtual/input/input* enable 0660 root input
+/sys/devices/virtual/input/input* poll_delay 0660 root input
+/sys/devices/virtual/usb_composite/* enable 0664 root system
+/sys/devices/system/cpu/cpu* cpufreq/scaling_max_freq 0664 system system
+/sys/devices/system/cpu/cpu* cpufreq/scaling_min_freq 0664 system system
-# NFC
-/dev/pn544 0600 nfc nfc
+# hefaxi@filesystems, 2015/07/22, added for store persistent data blocks
+/dev/block/mmcblk0p26 0600 system system
Seulement dans android_device_oneplus_onyx-master/sepolicy: radio.te
diff -u -r android_device_oneplus_bacon-cm-12.1/sepolicy/system_server.te android_device_oneplus_onyx-master/sepolicy/system_server.te
--- android_device_oneplus_bacon-cm-12.1/sepolicy/system_server.te 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/sepolicy/system_server.te 2015-11-21 16:33:29.000000000 +0100
@@ -7,3 +7,5 @@
# timerfd
allow system_server rtc_device:chr_file rw_file_perms;
+allow system_server sensors_persist_file:file { read getattr open };
+
Seulement dans android_device_oneplus_onyx-master/sepolicy: thermal-engine.te
Seulement dans android_device_oneplus_onyx-master/sepolicy: ueventd.te
diff -u -r android_device_oneplus_bacon-cm-12.1/setup-makefiles.sh android_device_oneplus_onyx-master/setup-makefiles.sh
--- android_device_oneplus_bacon-cm-12.1/setup-makefiles.sh 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/setup-makefiles.sh 2015-11-21 16:33:29.000000000 +0100
@@ -156,7 +156,7 @@
LOCAL_PATH := \$(call my-dir)
-ifneq (\$(filter bacon,\$(TARGET_DEVICE)),)
+ifneq (\$(filter onyx,\$(TARGET_DEVICE)),)
ifeq (\$(QCPATH),)
@@ -181,25 +181,25 @@
LOCAL_CERTIFICATE := platform
include \$(BUILD_PREBUILT)
-include \$(CLEAR_VARS)
-LOCAL_MODULE := PPPreference
-LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/app/PPPreference/PPPreference.apk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := platform
-include \$(BUILD_PREBUILT)
-
-include \$(CLEAR_VARS)
-LOCAL_MODULE := QuickBoot
-LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/app/QuickBoot/QuickBoot.apk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := platform
-include \$(BUILD_PREBUILT)
+#~ include \$(CLEAR_VARS)
+#~ LOCAL_MODULE := PPPreference
+#~ LOCAL_MODULE_OWNER := $VENDOR
+#~ LOCAL_SRC_FILES := proprietary/app/PPPreference/PPPreference.apk
+#~ LOCAL_MODULE_TAGS := optional
+#~ LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
+#~ LOCAL_MODULE_CLASS := APPS
+#~ LOCAL_CERTIFICATE := platform
+#~ include \$(BUILD_PREBUILT)
+
+#~ include \$(CLEAR_VARS)
+#~ LOCAL_MODULE := QuickBoot
+#~ LOCAL_MODULE_OWNER := $VENDOR
+#~ LOCAL_SRC_FILES := proprietary/app/QuickBoot/QuickBoot.apk
+#~ LOCAL_MODULE_TAGS := optional
+#~ LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
+#~ LOCAL_MODULE_CLASS := APPS
+#~ LOCAL_CERTIFICATE := platform
+#~ include \$(BUILD_PREBUILT)
include \$(CLEAR_VARS)
LOCAL_MODULE := shutdownlistener
@@ -354,16 +354,16 @@
LOCAL_MODULE_PATH := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
include \$(BUILD_PREBUILT)
-include \$(CLEAR_VARS)
-LOCAL_MODULE := libwpa_qmi_eap_proxy
-LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/lib/libwpa_qmi_eap_proxy.so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := \$(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_PROPRIETARY_MODULE := true
-include \$(BUILD_PREBUILT)
+#~ include \$(CLEAR_VARS)
+#~ LOCAL_MODULE := libwpa_qmi_eap_proxy
+#~ LOCAL_MODULE_OWNER := $VENDOR
+#~ LOCAL_SRC_FILES := proprietary/lib/libwpa_qmi_eap_proxy.so
+#~ LOCAL_MODULE_TAGS := optional
+#~ LOCAL_MODULE_SUFFIX := .so
+#~ LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+#~ LOCAL_MODULE_PATH := \$(TARGET_OUT_SHARED_LIBRARIES)
+#~ LOCAL_PROPRIETARY_MODULE := true
+#~ include \$(BUILD_PREBUILT)
endif
diff -u -r android_device_oneplus_bacon-cm-12.1/system.prop android_device_oneplus_onyx-master/system.prop
--- android_device_oneplus_bacon-cm-12.1/system.prop 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/system.prop 2015-11-21 16:33:29.000000000 +0100
@@ -3,10 +3,33 @@
#
ro.sf.lcd_density=480
-rild.libpath=/system/vendor/lib/libril-qc-qmi-1.so
-persist.radio.add_power_save=1
-persist.radio.apm_sim_not_pwdn=1
-rol.ril.ext.ecclist=112,911,999,110,122,119,120,000,08,118
+# rild.libpath=/system/vendor/lib/libril-qc-qmi-1.so
+# persist.radio.add_power_save=1
+# persist.radio.apm_sim_not_pwdn=1
+# rol.ril.ext.ecclist=112,911,999,110,122,119,120,000,08,118
+
+# OnePlus X
+
+rild.libpath=/vendor/lib/libril-qc-qmi-1.so
+rild.libargs=-d /dev/smd0
+persist.rild.nitz_plmn=
+persist.rild.nitz_long_ons_0=
+persist.rild.nitz_long_ons_1=
+persist.rild.nitz_long_ons_2=
+persist.rild.nitz_long_ons_3=
+persist.rild.nitz_short_ons_0=
+persist.rild.nitz_short_ons_1=
+persist.rild.nitz_short_ons_2=
+persist.rild.nitz_short_ons_3=
+ril.subscription.types=NV,RUIM
+DEVICE_PROVISIONED=1
+
+ro.use_data_netmgrd=true
+persist.data.netmgrd.qos.enable=true
+ro.data.large_tcp_window_size=true
+
+persist.fuse_sdcard=true
+persist.radio.multisim.config=dsds
# sensors
ro.qc.sdk.camera.facialproc=true
diff -u -r android_device_oneplus_bacon-cm-12.1/vendorsetup.sh android_device_oneplus_onyx-master/vendorsetup.sh
--- android_device_oneplus_bacon-cm-12.1/vendorsetup.sh 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/vendorsetup.sh 2015-11-21 16:33:29.000000000 +0100
@@ -1,3 +1,3 @@
-add_lunch_combo cm_bacon-user
-add_lunch_combo cm_bacon-userdebug
-add_lunch_combo cm_bacon-eng
+add_lunch_combo cm_onyx-user
+add_lunch_combo cm_onyx-userdebug
+add_lunch_combo cm_onyx-eng
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/wifi/WCNSS_cfg.dat et android_device_oneplus_onyx-master/wifi/WCNSS_cfg.dat sont différents
diff -u -r android_device_oneplus_bacon-cm-12.1/wifi/WCNSS_qcom_cfg.ini android_device_oneplus_onyx-master/wifi/WCNSS_qcom_cfg.ini
--- android_device_oneplus_bacon-cm-12.1/wifi/WCNSS_qcom_cfg.ini 2015-10-02 02:00:03.000000000 +0200
+++ android_device_oneplus_onyx-master/wifi/WCNSS_qcom_cfg.ini 2015-11-21 16:33:29.000000000 +0100
@@ -10,8 +10,6 @@
gEnableIdleScan=0
-#qiulei add to show the max linkspeed
-gReportMaxLinkSpeed=1
# Increase sleep duration (seconds) during IMPS
# 0 implies no periodic wake up from IMPS. Periodic wakeup is
@@ -43,8 +41,8 @@
# Each byte of MAC address is represented in Hex format as XX
-Intf0MacAddress=B0AA33888888
-Intf1MacAddress=D4AA33888888
+Intf0MacAddress=000AF58989FF
+Intf1MacAddress=000AF58989FE
Intf2MacAddress=000AF58989FD
Intf3MacAddress=000AF58989FC
@@ -67,9 +65,6 @@
gNumRxAnt=1
-# qiulei, 2014/01/18, Add sleep scan time to reduce sleep current
-#Dynamic Beacon
-gEnableDynamicDTIM=3
# Beacon filtering frequency (unit in beacon intervals)
@@ -168,7 +163,7 @@
#Check if the AP to which we are roaming is better than current AP in terms of RSSI.
#Checking is disabled if set to Zero.Otherwise it will use this value as to how better
#the RSSI of the new/roamable AP should be for roaming
-RoamRssiDiff=3
+RoamRssiDiff=5
# SAP Country code
@@ -252,7 +247,7 @@
#Preferred band (both or 2.4 only or 5 only)
-BandCapability=0
+BandCapability=1
#Beacon Early Termination (1 = enable the BET feature, 0 = disable)
@@ -376,6 +371,14 @@
#max LI value for modulated DTIM
gMaxLIModulatedDTIM=3
+#BTC OPP+SAP/GO configuration
+btcSapActiveWlanLen=90000
+btcSapActiveBtLen=30000
+
+#BT_OPP+STA/Client
+btcActiveWlanLen=120000
+btcActiveBtLen=90000
+
END
# Note: Configuration parser would not read anything past the END marker
Les fichiers binaires android_device_oneplus_bacon-cm-12.1/wifi/WCNSS_qcom_wlan_nv.bin et android_device_oneplus_onyx-master/wifi/WCNSS_qcom_wlan_nv.bin sont différents
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment