Snap for 8259672 from c7cf881bfe
to udc-release
Change-Id: I2db75081afa5c52d2459910996d358c2ce2ff7cb
This commit is contained in:
commit
c93043dd93
48 changed files with 388141 additions and 50411 deletions
|
@ -187,7 +187,7 @@
|
|||
<!-- dev1: audio dev2: haptic -->
|
||||
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
|
||||
<!-- for VOIP output, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
|
||||
<!-- for input -->
|
||||
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
|
@ -286,7 +286,7 @@
|
|||
<external_module>
|
||||
<module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
|
||||
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
|
||||
<module libname="audio_fortemedia_aoc.so"/>
|
||||
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
|
||||
<module libname="liboffloadeffect.so"/>
|
||||
<module libname="audio_amcs_ext.so"/>
|
||||
<module libname="audio_bluenote_aoc.so"/>
|
||||
|
|
|
@ -604,7 +604,7 @@
|
|||
<path name="voice-handset">
|
||||
<ctl name="Boost Peak Current Limit" value="3.50A"/>
|
||||
<ctl name="PCM Source" value="ASP"/>
|
||||
<ctl name="AMP PCM Gain" value="6"/>
|
||||
<ctl name="AMP PCM Gain" value="7"/>
|
||||
<ctl name="Main AMP Enable Switch" value="1"/>
|
||||
</path>
|
||||
|
||||
|
@ -634,6 +634,10 @@
|
|||
<ctl name="AMP PCM Gain" value="17"/>
|
||||
</path>
|
||||
|
||||
<path name="voice-dual-speaker">
|
||||
<path name="speaker" />
|
||||
</path>
|
||||
|
||||
<path name="speaker-safe">
|
||||
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
|
||||
<ctl name="R Main AMP Enable Switch" value="1"/>
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -6,7 +6,6 @@
|
|||
########################################################################################################
|
||||
[HAL_SUPPORTED_FEATURES]
|
||||
CUSTOM_ACTION_258=1
|
||||
# Action 258 parameters: [dev, mode, throttle control state]
|
||||
|
||||
########################################################################################################
|
||||
# This defined the options of supported sample rates.
|
||||
|
@ -20,20 +19,17 @@ SR_COMMON = 48000
|
|||
# This can be configured by Waves or platform vendor.
|
||||
########################################################################################################
|
||||
[HAL_ORIENTATION_SUBTYPES]
|
||||
OST_SPEAKER = 0:12,90:13,180:12,270:0|13
|
||||
OST_SPEAKER = 0:12,90:13,180:12,270:14
|
||||
|
||||
########################################################################################################
|
||||
# This defines available preset configurations.
|
||||
# This should be configured by Waves only unless platform vendor is familiar with MPS structure.
|
||||
########################################################################################################
|
||||
[HAL_SUPPORTED_PRESETS]
|
||||
SPEAKER_MUSIC_THROTTLE= OM:1,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
|
||||
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
|
||||
HEADSET_MUSIC = OM:2,SM:2
|
||||
|
||||
########################################################################################################
|
||||
# This defines available CONTROL configurations. Only define the CONTROL if you need it.
|
||||
|
@ -41,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
|
|||
# This can be configured by Waves or platform vendor.
|
||||
########################################################################################################
|
||||
[HAL_SUPPORTED_CONTROLS]
|
||||
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
|
||||
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
|
||||
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
|
||||
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
|
||||
[COEFS_CONVERTER_SETTING]
|
||||
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
|
||||
|
@ -58,8 +52,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
|||
|
||||
[CUSTOM_ACTION_258]
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_CALL
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
# Action 258 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
|
||||
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||
|
|
Binary file not shown.
|
@ -187,7 +187,7 @@
|
|||
<!-- dev1: audio dev2: haptic -->
|
||||
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
|
||||
<!-- for VOIP output, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
|
||||
<!-- for input -->
|
||||
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
|
@ -282,7 +282,7 @@
|
|||
|
||||
<external_module>
|
||||
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
|
||||
<module libname="audio_fortemedia_aoc.so"/>
|
||||
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
|
||||
<module libname="liboffloadeffect.so"/>
|
||||
<module libname="audio_amcs_ext.so"/>
|
||||
<module libname="audio_bluenote_aoc.so"/>
|
||||
|
|
|
@ -640,6 +640,10 @@
|
|||
<ctl name="R AMP Enable Switch" value="1"/>
|
||||
</path>
|
||||
|
||||
<path name="voice-dual-speaker">
|
||||
<path name="speaker" />
|
||||
</path>
|
||||
|
||||
<path name="speaker-safe">
|
||||
<ctl name="R AMP Enable Switch" value="1"/>
|
||||
</path>
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -187,7 +187,7 @@
|
|||
<!-- dev1: audio dev2: haptic -->
|
||||
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
|
||||
<!-- for VOIP output, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
|
||||
<!-- for input -->
|
||||
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
|
@ -286,7 +286,7 @@
|
|||
<external_module>
|
||||
<module libname="audio_spk_35l41.so" argu="EnableDualControl"/>
|
||||
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
|
||||
<module libname="audio_fortemedia_aoc.so"/>
|
||||
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
|
||||
<module libname="liboffloadeffect.so"/>
|
||||
<module libname="audio_amcs_ext.so"/>
|
||||
<module libname="audio_bluenote_aoc.so"/>
|
||||
|
|
|
@ -604,7 +604,7 @@
|
|||
<path name="voice-handset">
|
||||
<ctl name="Boost Peak Current Limit" value="3.50A"/>
|
||||
<ctl name="PCM Source" value="ASP"/>
|
||||
<ctl name="AMP PCM Gain" value="6"/>
|
||||
<ctl name="AMP PCM Gain" value="7"/>
|
||||
<ctl name="Main AMP Enable Switch" value="1"/>
|
||||
</path>
|
||||
|
||||
|
@ -634,6 +634,10 @@
|
|||
<ctl name="AMP PCM Gain" value="17"/>
|
||||
</path>
|
||||
|
||||
<path name="voice-dual-speaker">
|
||||
<path name="speaker" />
|
||||
</path>
|
||||
|
||||
<path name="speaker-safe">
|
||||
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
|
||||
<ctl name="R Main AMP Enable Switch" value="1"/>
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -6,7 +6,6 @@
|
|||
########################################################################################################
|
||||
[HAL_SUPPORTED_FEATURES]
|
||||
CUSTOM_ACTION_258=1
|
||||
# Action 258 parameters: [dev, mode, throttle control state]
|
||||
|
||||
########################################################################################################
|
||||
# This defined the options of supported sample rates.
|
||||
|
@ -20,20 +19,17 @@ SR_COMMON = 48000
|
|||
# This can be configured by Waves or platform vendor.
|
||||
########################################################################################################
|
||||
[HAL_ORIENTATION_SUBTYPES]
|
||||
OST_SPEAKER = 0:12,90:13,180:12,270:0|13
|
||||
OST_SPEAKER = 0:12,90:13,180:12,270:14
|
||||
|
||||
########################################################################################################
|
||||
# This defines available preset configurations.
|
||||
# This should be configured by Waves only unless platform vendor is familiar with MPS structure.
|
||||
########################################################################################################
|
||||
[HAL_SUPPORTED_PRESETS]
|
||||
SPEAKER_MUSIC_THROTTLE= OM:1,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
|
||||
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
|
||||
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
|
||||
HEADSET_MUSIC = OM:2,SM:2
|
||||
|
||||
########################################################################################################
|
||||
# This defines available CONTROL configurations. Only define the CONTROL if you need it.
|
||||
|
@ -41,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
|
|||
# This can be configured by Waves or platform vendor.
|
||||
########################################################################################################
|
||||
[HAL_SUPPORTED_CONTROLS]
|
||||
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
|
||||
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
|
||||
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
|
||||
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
|
||||
[COEFS_CONVERTER_SETTING]
|
||||
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
|
||||
|
@ -58,8 +52,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
|
|||
|
||||
[CUSTOM_ACTION_258]
|
||||
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_CALL
|
||||
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
|
||||
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL_THROTTLE
|
||||
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
|
||||
# Action 258 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t
|
||||
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
|
||||
|
|
Binary file not shown.
|
@ -187,7 +187,7 @@
|
|||
<!-- dev1: audio dev2: haptic -->
|
||||
<usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
|
||||
<!-- for VOIP output, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4"/>
|
||||
<usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
|
||||
<!-- for input -->
|
||||
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
|
@ -283,7 +283,7 @@
|
|||
<external_module>
|
||||
<module libname="audio_spk_35l41.so"/>
|
||||
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
|
||||
<module libname="audio_fortemedia_aoc.so"/>
|
||||
<module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:1,USB:1 VoIP_Rate=32000"/>
|
||||
<module libname="liboffloadeffect.so"/>
|
||||
<module libname="audio_amcs_ext.so"/>
|
||||
<module libname="audio_bluenote_aoc.so"/>
|
||||
|
|
|
@ -623,6 +623,10 @@
|
|||
<ctl name="R Main AMP Enable Switch" value="1"/>
|
||||
</path>
|
||||
|
||||
<path name="voice-dual-speaker">
|
||||
<path name="speaker" />
|
||||
</path>
|
||||
|
||||
<path name="speaker-safe">
|
||||
<ctl name="R Boost Peak Current Limit" value="3.50A"/>
|
||||
<ctl name="R Main AMP Enable Switch" value="1"/>
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -153,3 +153,7 @@ else
|
|||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
|
||||
# Set zram size
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
vendor.zram.size=3g
|
||||
|
|
|
@ -167,3 +167,7 @@ else
|
|||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
|
||||
# Set zram size
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
vendor.zram.size=3g
|
||||
|
|
|
@ -143,7 +143,12 @@ DEFAULT_ISODEP_ROUTE=0x81
|
|||
# disable 0x00 default value
|
||||
STNFC_CONTROL_CLK=0x01
|
||||
|
||||
################################################################################
|
||||
###############################################################################
|
||||
# Configure the ACTIVE_RW timer
|
||||
# Default 0x00, set 0x01 to enable it
|
||||
STNFC_ACTIVERW_TIMER=0x01
|
||||
|
||||
###############################################################################
|
||||
# Core configuration settings
|
||||
CORE_CONF_PROP={ 20, 02, 0a, 03,
|
||||
a1, 01, 1e,
|
||||
|
|
|
@ -143,7 +143,12 @@ DEFAULT_ISODEP_ROUTE=0x81
|
|||
# disable 0x00 default value
|
||||
STNFC_CONTROL_CLK=0x01
|
||||
|
||||
################################################################################
|
||||
###############################################################################
|
||||
# Configure the ACTIVE_RW timer
|
||||
# Default 0x00, set 0x01 to enable it
|
||||
STNFC_ACTIVERW_TIMER=0x01
|
||||
|
||||
###############################################################################
|
||||
# Core configuration settings
|
||||
CORE_CONF_PROP={ 20, 02, 0a, 03,
|
||||
a1, 01, 1e,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue