diff --git a/audio/tegu/aidl_config/Android.bp b/audio/tegu/aidl_config/Android.bp
new file mode 100644
index 0000000..fa6291f
--- /dev/null
+++ b/audio/tegu/aidl_config/Android.bp
@@ -0,0 +1,63 @@
+// Copyright (C) 2023 The Android Open Source Project
+//
+// 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.
+
+soong_namespace {
+ imports: [
+ "frameworks/av/services/audiopolicy/config",
+ ],
+}
+
+package {
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+prebuilt_etc {
+ name: "audio_policy_volumes.xml",
+ src: "audio_policy_volumes.xml",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "imported_default_volume_tables.xml",
+ src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml",
+ soc_specific: true,
+ filename_from_src: true,
+}
+
+prebuilt_etc {
+ name: "audio_platform_configuration.xml",
+ src: "audio_platform_configuration.xml",
+ soc_specific: true,
+ required: [
+ "audio_policy_volumes.xml",
+ "imported_default_volume_tables.xml",
+ ],
+}
+
+prebuilt_etc {
+ name: "mixer_paths_aidl.xml",
+ src: "mixer_paths_aidl.xml",
+ soc_specific: true,
+}
+
+phony {
+ name: "audio_aidl_configs",
+ soc_specific: true,
+ required: [
+ "audio_platform_configuration.xml",
+ "mixer_paths_aidl.xml",
+ ],
+}
diff --git a/audio/tegu/aidl_config/audio_platform_configuration.xml b/audio/tegu/aidl_config/audio_platform_configuration.xml
new file mode 100644
index 0000000..e314d04
--- /dev/null
+++ b/audio/tegu/aidl_config/audio_platform_configuration.xml
@@ -0,0 +1,323 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.01
+ 0.02
+ 0.04
+ 0.10
+ 0.21
+ 0.47
+ 1.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MIC
+ CAMCORDER
+
+
+ MIC
+ CAMCORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/tegu/aidl_config/audio_policy_volumes.xml b/audio/tegu/aidl_config/audio_policy_volumes.xml
new file mode 100644
index 0000000..0448411
--- /dev/null
+++ b/audio/tegu/aidl_config/audio_policy_volumes.xml
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-4500
+ 29,-3400
+ 57,-2250
+ 71,-1900
+ 86,-1530
+ 100,-1100
+
+
+
+
+
+
+ 1,-4000
+ 29,-2950
+ 43,-2350
+ 57,-1850
+ 71,-1400
+ 86,-700
+ 100,0
+
+
+
+
+
+
+ 1,-9000
+ 4,-6370
+ 8,-6105
+ 12,-5810
+ 16,-5520
+ 20,-5220
+ 24,-4870
+ 28,-4490
+ 32,-4278
+ 36,-4027
+ 40,-3770
+ 44,-3560
+ 48,-3300
+ 52,-3080
+ 56,-2800
+ 60,-2620
+ 64,-2350
+ 68,-2200
+ 72,-2100
+ 76,-1930
+ 80,-1700
+ 84,-1460
+ 88,-1190
+ 92,-850
+ 96,-510
+ 100,0
+
+
+
+
+
+
+ 0,-5600
+ 29,-3520
+ 57,-1500
+ 71,-1150
+ 86,-500
+ 100,0
+
+
+
+
+
+
+ 1,-4500
+ 29,-3800
+ 71,-1850
+ 86,-1000
+ 100,-500
+
+
+
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+ 0,-2400
+ 33,-1600
+ 66,-800
+ 100,0
+
+
+ 0,-4200
+ 33,-2800
+ 66,-1400
+ 100,0
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-4500
+ 29,-3400
+ 57,-2250
+ 71,-1900
+ 86,-1530
+ 100,-1100
+
+
+
+
+
+ 1,-3000
+ 33,-2600
+ 66,-2200
+ 100,-1800
+
+
+ 1,-5700
+ 29,-4230
+ 43,-3300
+ 57,-3100
+ 71,-2500
+ 100,-1400
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/tegu/aidl_config/mixer_paths_aidl.xml b/audio/tegu/aidl_config/mixer_paths_aidl.xml
new file mode 100644
index 0000000..5d8ae42
--- /dev/null
+++ b/audio/tegu/aidl_config/mixer_paths_aidl.xml
@@ -0,0 +1,1399 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk
index 552c217..51822f6 100644
--- a/audio/tegu/audio-tables.mk
+++ b/audio/tegu/audio-tables.mk
@@ -16,6 +16,12 @@
AUDIO_TABLE_FOLDER := tegu
+# Choose AIDL config by build flag.
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+PRODUCT_SOONG_NAMESPACES += device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
+PRODUCT_PACKAGES += audio_aidl_configs
+
+else
# Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \
device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
@@ -31,6 +37,7 @@ PRODUCT_COPY_FILES += \
# Mixer Path Configuration for AudioHAL
PRODUCT_COPY_FILES += \
device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
+endif
# Speaker firmware files
SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/tas2572/fw/
@@ -39,33 +46,32 @@ SPK_FIRMWARE_FULL_PATH := device/google/tegu/audio/$(SPK_FIRMWARE_PATH)
PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
# Audio tuning
-PRODUCT_COPY_FILES += \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
+PRODUCT_SOONG_NAMESPACES += device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning
+PRODUCT_PACKAGES += \
+ recording.gatf \
+ smartfeature.gstf \
+ BLUETOOTH.dat \
+ HANDSFREE.dat \
+ HANDSET.dat \
+ HEADSET.dat \
+ mcps.dat \
+ waves_config.ini \
+ waves_preset.mps \
+ compens_spk_l.conf \
+ compens_spk_r.conf
+
+# userdebug and eng specific
+PRODUCT_PACKAGES_DEBUG += \
+ BLUETOOTH.mods \
+ HANDSFREE.mods \
+ HANDSET.mods \
+ HEADSET.mods \
+ template.xml \
+ tuning_constraints_combination.xml \
+ test_config.ini \
+ test_preset.mps
-# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
-
-#Bluenote files
-PRODUCT_COPY_FILES += \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
-
-PRODUCT_COPY_FILES += \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
- device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
-
# Mixer Path Configuration for Audio Speaker Calibration Tool pixel_ti_cal
PRODUCT_COPY_FILES += \
device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tas2572/ti_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ti_cal_mixer_paths.xml
diff --git a/audio/tegu/tuning/Android.bp b/audio/tegu/tuning/Android.bp
new file mode 100644
index 0000000..b51aaad
--- /dev/null
+++ b/audio/tegu/tuning/Android.bp
@@ -0,0 +1,145 @@
+//
+// Copyright (C) 2023 The Android Open-Source Project
+//
+// 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.
+
+soong_namespace {}
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_tegu_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_tegu_license"],
+}
+
+prebuilt_defaults {
+ name: "aoc_defaults",
+ soc_specific: true,
+ sub_dir: "aoc",
+}
+
+prebuilt_etc {
+ name: "recording.gatf",
+ src: "bluenote/recording.gatf",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "smartfeature.gstf",
+ src: "bluenote/smartfeature.gstf",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "template.xml",
+ src: "bluenote/template.xml",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "tuning_constraints_combination.xml",
+ src: "bluenote/tuning_constraints_combination.xml",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "compens_spk_l.conf",
+ src: "compensation/compens_spk_l.conf",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "compens_spk_r.conf",
+ src: "compensation/compens_spk_r.conf",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "BLUETOOTH.dat",
+ src: "fortemedia/BLUETOOTH.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "BLUETOOTH.mods",
+ src: "fortemedia/BLUETOOTH.mods",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "HANDSFREE.dat",
+ src: "fortemedia/HANDSFREE.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "HANDSFREE.mods",
+ src: "fortemedia/HANDSFREE.mods",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "HANDSET.dat",
+ src: "fortemedia/HANDSET.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "HANDSET.mods",
+ src: "fortemedia/HANDSET.mods",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "HEADSET.dat",
+ src: "fortemedia/HEADSET.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "HEADSET.mods",
+ src: "fortemedia/HEADSET.mods",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "mcps.dat",
+ src: "fortemedia/mcps.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "waves_config.ini",
+ src: "waves/waves_config.ini",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "waves_preset.mps",
+ src: "waves/waves_preset.mps",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "test_config.ini",
+ src: "waves/tests/test_config.ini",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "test_preset.mps",
+ src: "waves/tests/test_preset.mps",
+ soc_specific: true,
+}
diff --git a/audio/tegu/tuning/bluenote/smartfeature.gstf b/audio/tegu/tuning/bluenote/smartfeature.gstf
new file mode 100644
index 0000000..0e6faa8
Binary files /dev/null and b/audio/tegu/tuning/bluenote/smartfeature.gstf differ
diff --git a/audio/tegu/tuning/compensation/compens_spk_l.conf b/audio/tegu/tuning/compensation/compens_spk_l.conf
new file mode 100644
index 0000000..b6ea70a
--- /dev/null
+++ b/audio/tegu/tuning/compensation/compens_spk_l.conf
@@ -0,0 +1,257 @@
+-0.072269365191460,0.000000000000000
+0.193778246641159,0.368281036615372
+0.868867278099060,-0.354938775300980
+-0.539658010005951,-0.948875546455383
+-0.536498844623566,0.770117402076721
+0.926073849201202,0.031808696687222
+-0.336765319108963,-0.876071333885193
+-0.626556813716888,0.662503242492676
+0.958873093128204,0.249626636505127
+-0.217076018452644,-1.011628270149231
+-0.689596652984619,0.686288118362427
+0.957182049751282,0.134054690599442
+-0.423170626163483,-0.872087001800537
+-0.466049611568451,0.828021526336670
+0.946930408477783,-0.108800664544106
+-0.672224640846252,-0.648024916648865
+0.023443724960089,0.949971675872803
+0.647083640098572,-0.714819431304932
+-0.927986085414886,0.168865367770195
+0.876984715461731,0.420978873968124
+-0.459007889032364,-0.801865220069885
+0.027588851749897,0.919678688049316
+0.452022284269333,-0.798424363136292
+-0.720619082450867,0.506623864173889
+0.903857469558716,-0.121092572808266
+-0.813188910484314,-0.267890751361847
+0.654919981956482,0.578975200653076
+-0.324688464403152,-0.762335538864136
+0.045074075460434,0.837580025196075
+0.333478778600693,-0.756533861160278
+-0.528827905654907,0.571550071239471
+0.752070248126984,-0.302336871623993
+-0.705419898033142,-0.010656282305717
+0.674687266349792,0.234008565545082
+-0.484748899936676,-0.453684300184250
+0.311870157718658,0.569677412509918
+-0.040917232632637,-0.614878833293915
+-0.142920836806297,0.556069970130920
+0.347570836544037,-0.426098167896271
+-0.399490952491760,0.270619392395020
+0.489634364843369,-0.099600575864315
+-0.416376531124115,-0.073405101895332
+0.383471965789795,0.209524869918823
+-0.210899502038956,-0.306978166103363
+0.122405201196671,0.330719649791718
+0.047135144472122,-0.318668216466904
+-0.102212637662888,0.256988137960434
+0.221159204840660,-0.175094649195671
+-0.196717485785484,0.058909960091114
+0.215451851487160,0.028049550950527
+-0.111279845237732,-0.107271827757359
+0.073399662971497,0.131816297769547
+0.050756171345711,-0.137192130088806
+-0.087871439754963,0.092105306684971
+0.183105215430260,-0.022354602813721
+-0.153384223580360,-0.077423691749573
+0.167937561869621,0.162336856126785
+-0.063599459826946,-0.249156385660172
+0.007697351276875,0.295051068067551
+0.147529870271683,-0.315811693668365
+-0.228121668100357,0.280678451061249
+0.379844486713409,-0.211661323904991
+-0.413950413465500,0.086816243827343
+0.493282914161682,0.030646786093712
+-0.458445787429810,-0.199775993824005
+0.430013239383698,0.331840157508850
+-0.302028775215149,-0.476965516805649
+0.174668550491333,0.547772884368896
+-0.004761725664139,-0.607816219329834
+-0.180938959121704,0.597172915935516
+0.345920741558075,-0.524061977863312
+-0.507329642772675,0.429439157247543
+0.612690925598145,-0.231271147727966
+-0.668752789497375,0.082351960241795
+0.666610836982727,0.174902394413948
+-0.585810363292694,-0.300250053405762
+0.496667981147766,0.540516018867493
+-0.285151422023773,-0.595798134803772
+0.143025785684586,0.740128040313721
+0.142425626516342,-0.692724466323853
+-0.289476096630096,0.695205450057983
+0.560721993446350,-0.524713397026062
+-0.633641123771667,0.395385146141052
+0.807843565940857,-0.140448212623596
+-0.755289912223816,-0.056390412151814
+0.793603181838989,0.332274287939072
+-0.587980031967163,-0.512085556983948
+0.502608478069305,0.706935703754425
+-0.201333552598953,-0.795925974845886
+0.041940294206142,0.862556636333466
+0.282242268323898,-0.806203961372375
+-0.421166449785233,0.737370908260345
+0.693975687026978,-0.546693682670593
+-0.725124835968018,0.377898901700974
+0.898330569267273,-0.126730933785439
+-0.799543261528015,-0.086274132132530
+0.852627158164978,0.336831897497177
+-0.617220997810364,-0.523368120193481
+0.581643879413605,0.701422810554504
+-0.238512545824051,-0.835969388484955
+0.122311621904373,0.877753794193268
+0.266851156949997,-0.907707333564758
+-0.419305026531219,0.759218692779541
+0.716885566711426,-0.631000936031342
+-0.782902479171753,0.369845002889633
+0.944233119487762,-0.145959764719009
+-0.861795186996460,-0.162580445408821
+0.852517366409302,0.385075062513351
+-0.626287579536438,-0.637479364871979
+0.482591390609741,0.773003101348877
+-0.165863901376724,-0.889550983905792
+-0.024521410465240,0.888848841190338
+0.358515709638596,-0.852318286895752
+-0.510460317134857,0.697838664054871
+0.764546453952789,-0.532740592956543
+-0.805716574192047,0.281161725521088
+0.937749147415161,-0.054524913430214
+-0.842432498931885,-0.237420022487640
+0.821752071380615,0.462488234043121
+-0.574910402297974,-0.707970738410950
+0.422970235347748,0.835992157459259
+-0.078558266162872,-0.958804607391357
+-0.145156279206276,0.928885102272034
+0.497512966394424,-0.866850495338440
+-0.668266057968140,0.667457997798920
+0.927734196186066,-0.454902321100235
+-0.948837637901306,0.130093187093735
+1.020938396453857,0.133898913860321
+-0.872293710708618,-0.452092945575714
+0.771157979965210,0.682232797145844
+-0.446887969970703,-0.884999871253967
+0.252549827098846,0.941986680030823
+0.110732525587082,-0.971167623996735
+-0.274248570203781,0.848152637481689
+0.557240247726440,-0.736870169639587
+-0.587886631488800,0.511010527610779
+0.739130914211273,-0.383534491062164
+-0.656540155410767,0.172792643308640
+0.756582379341125,-0.121655955910683
+-0.679900646209717,-0.091838508844376
+0.735111951828003,0.144996970891953
+-0.633835732936859,-0.371244251728058
+0.625728189945221,0.433474093675613
+-0.458291918039322,-0.668550848960876
+0.331758946180344,0.690254330635071
+-0.099335640668869,-0.831231772899628
+-0.080662719905376,0.741652071475983
+0.292408943176270,-0.752806186676025
+-0.438772767782211,0.572648465633392
+0.585054159164429,-0.485328763723373
+-0.643179178237915,0.242143049836159
+0.678111851215363,-0.116616763174534
+-0.634976148605347,-0.116004049777985
+0.576740026473999,0.217281237244606
+-0.461340904235840,-0.395272254943848
+0.342927247285843,0.444061428308487
+-0.179778933525085,-0.542061030864716
+0.044556498527527,0.507059276103973
+0.108933314681053,-0.525123715400696
+-0.226991415023804,0.425963550806046
+0.346770972013474,-0.368589371442795
+-0.399613618850708,0.217002227902412
+0.450514674186707,-0.134883239865303
+-0.441192120313644,-0.020579993724823
+0.437128305435181,0.099909394979477
+-0.371827930212021,-0.246631458401680
+0.302678197622299,0.299075007438660
+-0.193986833095551,-0.388224661350250
+0.106806308031082,0.390461802482605
+0.018124654889107,-0.430174648761749
+-0.111622795462608,0.371271967887878
+0.213204741477966,-0.348137944936752
+-0.269701153039932,0.249267548322678
+0.332161903381348,-0.196627080440521
+-0.351314514875412,0.078487396240234
+0.368231862783432,-0.003422349691391
+-0.327907979488373,-0.114143162965775
+0.298184484243393,0.169198364019394
+-0.221419006586075,-0.264329642057419
+0.151781961321831,0.292441666126251
+-0.041129648685455,-0.339982390403748
+-0.042036592960358,0.312223255634308
+0.148857235908508,-0.304376065731049
+-0.215889900922775,0.226230233907700
+0.293815016746521,-0.170364856719971
+-0.317666471004486,0.052327305078506
+0.337868273258209,0.029620587825775
+-0.299815595149994,-0.152924731373787
+0.255468934774399,0.222989052534103
+-0.161533623933792,-0.309109181165695
+0.077303342521191,0.332609325647354
+0.046540617942810,-0.360218524932861
+-0.140016540884972,0.312936782836914
+0.244530752301216,-0.270615994930267
+-0.300246149301529,0.165419280529022
+0.344508826732635,-0.076706245541573
+-0.328170806169510,-0.040290296077728
+0.314000934362411,0.118311099708080
+-0.248942911624908,-0.217484980821609
+0.185420274734497,0.270462125539780
+-0.075335934758186,-0.323978215456009
+-0.013924270868301,0.316003799438477
+0.126271948218346,-0.304757654666901
+-0.200495779514313,0.236447662115097
+0.277718126773834,-0.169077008962631
+-0.301144778728485,0.061912991106510
+0.317421793937683,0.029666833579540
+-0.273113399744034,-0.136135905981064
+0.228597149252892,0.204748600721359
+-0.136332347989082,-0.270248591899872
+0.059490367770195,0.287515372037888
+0.045518696308136,-0.293196350336075
+-0.116053730249405,0.255073547363281
+0.200445055961609,-0.207274198532104
+-0.231791749596596,0.126999735832214
+0.268285691738129,-0.052297517657280
+-0.245284169912338,-0.037975631654263
+0.228378370404243,0.104101344943047
+-0.158816933631897,-0.169068753719330
+0.106145992875099,0.196089163422585
+-0.019923791289330,-0.210723161697388
+-0.028708055615425,0.191695690155029
+0.099083721637726,-0.168003708124161
+-0.122924000024796,0.121107056736946
+0.163228869438171,-0.081523284316063
+-0.165791213512421,0.036985829472542
+0.206560850143433,0.016926586627960
+-0.174962788820267,-0.100552469491959
+0.149675011634827,0.151625275611877
+-0.077316701412201,-0.200612217187881
+0.025927335023880,0.215444296598434
+0.060081720352173,-0.219937711954117
+-0.109665870666504,0.190604493021965
+0.180375486612320,-0.153784215450287
+-0.203553229570389,0.090901464223862
+0.237992852926254,-0.029819101095200
+-0.221001833677292,-0.043335407972336
+0.213594794273376,0.104135125875473
+-0.157443940639496,-0.162221536040306
+0.117477089166641,0.199436157941818
+-0.036516275256872,-0.222803443670273
+-0.014564603567123,0.221278458833694
+0.096506208181381,-0.204338118433952
+-0.135424897074699,0.163441509008408
+0.193889141082764,-0.113487511873245
+-0.201456934213638,0.048123568296432
+0.222118705511093,0.016312241554260
+-0.189925327897072,-0.083714008331299
+0.171154439449310,0.138969540596008
+-0.104845225811005,-0.184344187378883
+0.060307502746582,0.210031479597092
+0.022387325763702,-0.218627750873566
+-0.071292802691460,0.204526185989380
+0.145830929279327,-0.173641473054886
+-0.175775557756424,0.124937325716019
+0.221215724945068,-0.065770953893661
+-0.215288057923317,0.000000000000000,
diff --git a/audio/tegu/tuning/compensation/compens_spk_r.conf b/audio/tegu/tuning/compensation/compens_spk_r.conf
new file mode 100644
index 0000000..da56f01
--- /dev/null
+++ b/audio/tegu/tuning/compensation/compens_spk_r.conf
@@ -0,0 +1,257 @@
+-0.033183112740517,0.000000000000000
+0.236137866973877,0.314803600311279
+0.783791899681091,-0.531435966491699
+-0.789665699005127,-0.818833708763123
+-0.325692415237427,0.889201045036316
+0.833375453948975,-0.284032762050629
+-0.693958640098572,-0.644340872764587
+-0.262879848480225,0.903950095176697
+0.929639756679535,-0.285778522491455
+-0.761575102806091,-0.660447239875793
+-0.101507261395454,0.915484189987183
+0.727668285369873,-0.494555890560150
+-0.846919417381287,-0.321129977703094
+0.208472102880478,0.851944804191589
+0.532833218574524,-0.717258572578430
+-0.927529454231262,0.031378686428070
+0.632502675056458,0.644104063510895
+0.003652989864349,-0.929720222949982
+-0.674304485321045,0.618179202079773
+0.867426633834839,-0.034113358706236
+-0.726322054862976,-0.549459099769592
+0.226263761520386,0.846422970294952
+0.220103263854980,-0.887163341045380
+-0.730970740318298,0.644716501235962
+0.892644524574280,-0.223932176828384
+-0.978179991245270,-0.211347505450249
+0.684635698795319,0.621218800544739
+-0.453999608755112,-0.772415518760681
+0.048729285597801,0.939782917499542
+0.261091947555542,-0.783145725727081
+-0.551311910152435,0.701618611812592
+0.774161577224731,-0.329360723495483
+-0.776746451854706,0.055663943290710
+0.738435268402100,0.291336327791214
+-0.494611144065857,-0.510362386703491
+0.273734152317047,0.651669025421143
+0.049677357077599,-0.680127501487732
+-0.291642963886261,0.564721584320068
+0.484247714281082,-0.390254378318787
+-0.572398245334625,0.158475905656815
+0.585638046264648,0.074984878301620
+-0.487444281578064,-0.301900774240494
+0.328059345483780,0.449291169643402
+-0.113063976168633,-0.536572813987732
+-0.093691848218441,0.500479996204376
+0.262326747179031,-0.431678354740143
+-0.403733283281326,0.279235303401947
+0.467710912227631,-0.105493955314159
+-0.458423972129822,-0.105702273547649
+0.357932507991791,0.255816578865051
+-0.227390527725220,-0.386270463466644
+0.040292277932167,0.422878742218018
+0.122125826776028,-0.422284513711929
+-0.308845877647400,0.324266046285629
+0.402635693550110,-0.180245667695999
+-0.465071290731430,0.000280268490314
+0.432571262121201,0.178332060575485
+-0.356273531913757,-0.349389016628265
+0.207886785268784,0.469489276409149
+-0.023483753204346,-0.560665845870972
+-0.204614102840424,0.530541419982910
+0.379301011562347,-0.458184957504272
+-0.542827308177948,0.294503271579742
+0.630014538764954,-0.128236532211304
+-0.678507983684540,-0.126102030277252
+0.609577178955078,0.314260721206665
+-0.521161675453186,-0.561353206634521
+0.291118770837784,0.669568955898285
+-0.126099646091461,-0.799128115177155
+-0.182065010070801,0.777974367141724
+0.338461726903915,-0.756868481636047
+-0.648219525814056,0.612812876701355
+0.725909233093262,-0.431684106588364
+-0.936142504215240,0.193516299128532
+0.853758811950684,0.076608501374722
+-0.929004311561584,-0.304091215133667
+0.676572442054749,0.595061540603638
+-0.601290106773376,-0.679642260074615
+0.296516597270966,0.896384119987488
+-0.130648642778397,-0.836418628692627
+-0.157700762152672,0.940177500247955
+0.346665948629379,-0.756135940551758
+-0.582156062126160,0.744972229003906
+0.731027483940125,-0.434474915266037
+-0.838878870010376,0.344979494810104
+0.931189000606537,0.047661714255810
+-0.828362822532654,-0.226805016398430
+0.757065296173096,0.557216048240662
+-0.489622086286545,-0.685180068016052
+0.296925604343414,0.862056016921997
+0.046520218253136,-0.847821712493896
+-0.252331912517548,0.825108885765076
+0.543145716190338,-0.668931245803833
+-0.675144076347351,0.499531894922256
+0.843872427940369,-0.242693588137627
+-0.831509709358215,0.000023305416107
+0.848254621028900,0.261209130287170
+-0.694528579711914,-0.496734201908112
+0.562373042106628,0.679530382156372
+-0.319974720478058,-0.819660305976868
+0.096735805273056,0.887575805187225
+0.185551166534424,-0.873726725578308
+-0.393608063459396,0.793304324150085
+0.632790625095367,-0.654381394386292
+-0.766669213771820,0.435561448335648
+0.857429385185242,-0.212946832180023
+-0.883355736732483,-0.024809837341309
+0.849068999290466,0.303393185138702
+-0.683863699436188,-0.510859608650208
+0.536528170108795,0.682101786136627
+-0.281567633152008,-0.802915453910828
+0.053834050893784,0.832908153533936
+0.206495344638824,-0.800509929656982
+-0.413084775209427,0.703127205371857
+0.626312196254730,-0.523099303245544
+-0.695864915847778,0.309728592634201
+0.789387762546539,-0.106239289045334
+-0.753516972064972,-0.160739004611969
+0.675242245197296,0.364117741584778
+-0.507410764694214,-0.553077816963196
+0.332633197307587,0.667699456214905
+-0.081065773963928,-0.736244559288025
+-0.116884782910347,0.702731013298035
+0.361277461051941,-0.645707607269287
+-0.516061127185822,0.459392160177231
+0.645795226097107,-0.290921419858932
+-0.674496531486511,0.035487800836563
+0.654944896697998,0.157412171363831
+-0.542098164558411,-0.388733416795731
+0.396991133689880,0.516857981681824
+-0.173531860113144,-0.656215310096741
+-0.047407537698746,0.631756544113159
+0.268529057502747,-0.623450398445129
+-0.460361361503601,0.461005210876465
+0.607472777366638,-0.335963964462280
+-0.704910218715668,0.064152598381042
+0.696381151676178,0.126136988401413
+-0.642524242401123,-0.405973315238953
+0.473128288984299,0.544645547866821
+-0.317003428936005,-0.734093189239502
+0.037384092807770,0.764821648597717
+0.161168009042740,-0.784315943717957
+-0.426171481609344,0.666442751884460
+0.560265779495239,-0.547246634960175
+-0.734021723270416,0.325130373239517
+0.731398582458496,-0.137354612350464
+-0.798768579959869,-0.088634461164474
+0.678692281246185,0.302320241928101
+-0.610718190670013,-0.482934594154358
+0.388042330741882,0.628428637981415
+-0.241484880447388,-0.707326412200928
+-0.042077422142029,0.754093348979950
+0.226419627666473,-0.677434444427490
+-0.476847469806671,0.579603672027588
+0.591070055961609,-0.349317908287048
+-0.689279198646545,0.153265953063965
+0.659173846244812,0.118505299091339
+-0.582823693752289,-0.310444146394730
+0.405685544013977,0.505145430564880
+-0.212037712335587,-0.581502497196198
+-0.027159869670868,0.618188261985779
+0.216821312904358,-0.529746830463409
+-0.387674450874329,0.425991237163544
+0.477306008338928,-0.236604303121567
+-0.513128936290741,0.073284387588501
+0.465985655784607,0.108233690261841
+-0.393583834171295,-0.220342427492142
+0.270610511302948,0.325308561325073
+-0.158556073904037,-0.345806121826172
+0.032640784978867,0.367555767297745
+0.067760080099106,-0.311206221580505
+-0.148086130619049,0.264244556427002
+0.189487725496292,-0.174047678709030
+-0.214655637741089,0.114625841379166
+0.207104504108429,-0.026809781789780
+-0.187251001596451,-0.016395717859268
+0.150070801377296,0.075313746929169
+-0.113131225109100,-0.088634401559830
+0.071251645684242,0.120073765516281
+-0.030345231294632,-0.111028730869293
+-0.007843881845474,0.115160524845123
+0.035729497671127,-0.086260482668877
+-0.058361321687698,0.077599354088306
+0.072475731372833,-0.041614130139351
+-0.080432176589966,0.026684343814850
+0.078817784786224,0.011030942201614
+-0.070392578840256,-0.023585826158524
+0.055857807397842,0.053807377815247
+-0.035392232239246,-0.058283150196075
+0.010367900133133,0.074353694915771
+0.014477431774139,-0.061132282018661
+-0.036511868238449,0.059421047568321
+0.054275810718536,-0.030546836555004
+-0.062430709600449,0.014439642429352
+0.061168730258942,0.022310078144073
+-0.045890614390373,-0.037570610642433
+0.027736820280552,0.060999169945717
+-0.003021478652954,-0.065440535545349
+-0.028274349868298,0.073955342173576
+0.057657197117805,-0.052588686347008
+-0.078671842813492,0.037829332053661
+0.093840271234512,-0.001439251005650
+-0.098125696182251,-0.026881128549576
+0.088938936591148,0.073889821767807
+-0.059850446879864,-0.100902169942856
+0.021950915455818,0.128390073776245
+0.024104706943035,-0.129525646567345
+-0.072807356715202,0.127899825572968
+0.121801853179932,-0.092127881944180
+-0.154342055320740,0.048706717789173
+0.165984779596329,0.016613557934761
+-0.156384229660034,-0.067113384604454
+0.133482545614243,0.130918383598328
+-0.081110224127769,-0.175196602940559
+0.013281166553497,0.207506760954857
+0.063485801219940,-0.199859231710434
+-0.130853444337845,0.180226296186447
+0.197816416621208,-0.125613659620285
+-0.237815588712692,0.052808806300163
+0.248337209224701,0.040657967329025
+-0.220355704426765,-0.121268838644028
+0.170153379440308,0.195853173732758
+-0.092393323779106,-0.241440951824188
+0.002476662397385,0.265994817018509
+0.099148690700531,-0.237070798873901
+-0.156317085027695,0.174204394221306
+0.185251787304878,-0.117848336696625
+-0.210331201553345,0.065326988697052
+0.221427187323570,0.004832088947296
+-0.207387238740921,-0.069572806358337
+0.175945103168488,0.133854687213898
+-0.121884405612946,-0.178864315152168
+0.060345053672791,0.209297508001328
+0.011324137449265,-0.214991837739944
+-0.078797280788422,0.200728714466095
+0.139998704195023,-0.161455094814301
+-0.183037281036377,0.108912691473961
+0.209574729204178,-0.040769528597593
+-0.209250092506409,-0.028836816549301
+0.188659369945526,0.097877204418182
+-0.143676444888115,-0.152847364544868
+0.085843533277512,0.193216025829315
+-0.014559954404831,-0.208937436342239
+-0.054546505212784,0.202603608369827
+0.121027082204819,-0.171435505151749
+-0.170181661844254,0.121390879154205
+0.202597662806511,-0.056326359510422
+-0.208827108144760,-0.014649748802185
+0.193250238895416,0.084964640438557
+-0.152753069996834,-0.144816011190414
+0.096542119979858,0.189118474721909
+-0.026280909776688,-0.210306704044342
+-0.044082731008530,0.208203434944153
+0.112927079200745,-0.181859642267227
+-0.166117131710052,0.134083658456802
+0.202564746141434,-0.071259371936321
+-0.213850453495979,0.000000000000000,
diff --git a/audio/tegu/tuning/waves/waves_config.ini b/audio/tegu/tuning/waves/waves_config.ini
index 36e092a..b5acfb8 100644
--- a/audio/tegu/tuning/waves/waves_config.ini
+++ b/audio/tegu/tuning/waves/waves_config.ini
@@ -5,7 +5,7 @@
# Putting any value other than 1 would be equivalent to not supported.
########################################################################################################
[HAL_SUPPORTED_FEATURES]
-CUSTOM_ACTION_258=1
+CUSTOM_ACTION_260=1
########################################################################################################
# This defined the options of supported sample rates.
@@ -19,20 +19,22 @@ 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:0|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
+SPEAKER_SAFE_MUSIC_THROTTLE_LITE = OM:9,SM:3
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
+SPEAKER_SAFE_MUSIC = OM:10,SM:2
+SPEAKER_SAFE_MUSIC_LITE = OM:9,SM:2
+SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER
+# _RESERVED OM and SM are temporary and will be updated with tuning file.
########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -40,9 +42,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|SPEAKER_SAFE_MUSIC_THROTTLE_LITE|SPEAKER_SAFE_MUSIC_LITE
[COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@@ -55,10 +55,17 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatSampleSize=4
#AudioFormatIncrement=8
-[CUSTOM_ACTION_258]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:4,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:4,PRESET:SPEAKER_SAFE_CALL_THROTTLE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:4,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+[CUSTOM_ACTION_260]
+CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
+# - audio_devices_t : current active device
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
+# - sound_usage_t: 0 - Music, 1 - Movie
\ No newline at end of file
diff --git a/device-tegu.mk b/device-tegu.mk
index 539970c..9bece77 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -33,6 +33,10 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/tegu/tegu/overlay
+ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+USE_AUDIO_HAL_AIDL := true
+endif
+
include device/google/tegu/audio/tegu/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk