summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--configs/Volume.dbbin10240 -> 0 bytes
-rw-r--r--configs/audio_policy.conf82
-rw-r--r--configs/default_gain.conf1540
-rw-r--r--configs/tiny_hw.xml247
-rw-r--r--configs/tinyucm.conf393
-rw-r--r--p3110.mk5
-rw-r--r--proprietary-common-files.txt28
-rw-r--r--recovery.fstab22
-rw-r--r--system.prop1
10 files changed, 345 insertions, 1975 deletions
diff --git a/Android.mk b/Android.mk
index 8aface1..65dc21a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),p3110)
-COMMON_P31XX_DIRS := liblights
+COMMON_P31XX_DIRS := audio liblights
include $(foreach common_dirs,$(COMMON_P31XX_DIRS),device/samsung/p3100/$(common_dirs)/Android.mk)
endif
diff --git a/configs/Volume.db b/configs/Volume.db
deleted file mode 100644
index b0727c5..0000000
--- a/configs/Volume.db
+++ /dev/null
Binary files differ
diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf
new file mode 100644
index 0000000..aaab65c
--- /dev/null
+++ b/configs/audio_policy.conf
@@ -0,0 +1,82 @@
+# Global configuration section: lists input and output devices always present on the device
+# as well as the output device selected by default.
+# Devices are designated by a string that corresponds to the enum in audio.h
+
+global_configuration {
+ attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
+ default_output_device AUDIO_DEVICE_OUT_SPEAKER
+ attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
+}
+
+# audio hardware module section: contains descriptors for all audio hw modules present on the
+# device. Each hw module node is named after the corresponding hw module library base name.
+# For instance, "primary" corresponds to audio.primary.<device>.so.
+# The "primary" module is mandatory and must include at least one output with
+# AUDIO_OUTPUT_FLAG_PRIMARY flag.
+# Each module descriptor contains one or more output profile descriptors and zero or more
+# input profile descriptors. Each profile lists all the parameters supported by a given output
+# or input stream category.
+# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding
+# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n".
+
+audio_hw_modules {
+ primary {
+ outputs {
+ primary {
+ sampling_rates 44100
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO
+ flags AUDIO_OUTPUT_FLAG_PRIMARY
+ }
+ deep_buffer {
+ sampling_rates 44100
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE
+ flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
+ }
+ hdmi {
+ sampling_rates 44100
+ channel_masks dynamic
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_AUX_DIGITAL
+ flags AUDIO_OUTPUT_FLAG_DIRECT
+ }
+ }
+ inputs {
+ primary {
+ sampling_rates 8000|11025|16000|22050|24000|32000|44100
+ channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET
+ }
+ }
+ }
+ a2dp {
+ outputs {
+ a2dp {
+ sampling_rates 44100
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_ALL_A2DP
+ }
+ }
+ }
+ usb {
+ outputs {
+ usb_accessory {
+ sampling_rates 44100
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_USB_ACCESSORY
+ }
+ usb_device {
+ sampling_rates 44100
+ channel_masks AUDIO_CHANNEL_OUT_STEREO
+ formats AUDIO_FORMAT_PCM_16_BIT
+ devices AUDIO_DEVICE_OUT_USB_DEVICE
+ }
+ }
+ }
+}
diff --git a/configs/default_gain.conf b/configs/default_gain.conf
deleted file mode 100644
index ddba7b8..0000000
--- a/configs/default_gain.conf
+++ /dev/null
@@ -1,1540 +0,0 @@
-#Output Modifier Stage
-#Normal, Incall, Ringtone, Incommunication
-
-#Modifier: Normal
-
-Modifier "Normal" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 5 },
- { "Speaker Volume", 62 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Normal" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 50 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Normal" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 50 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Normal" {
- SupportedDevice {
- "SCO Headset Out"
- }
- Enable {
- }
- Disable {
- }
-}
-
-Modifier "Normal" {
- SupportedDevice {
- "SCO Carkit"
- }
- Enable {
- }
- Disable {
- }
-}
-
-Modifier "Normal" {
- SupportedDevice {
- "SCO"
- }
- Enable {
- }
- Disable {
- }
-}
-
-Modifier "Normal" {
- SupportedDevice {
- "Analogue Dock Out"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
-}
-
-#Modifier: Ringtone
-Modifier "Ringtone" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 5 },
- { "Speaker Volume", 62 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Ringtone" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Ringtone" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Ringtone" {
- SupportedDevice {
- "SCO"
- }
- Enable {
- }
- Disable {
- }
-}
-
-Modifier "Ringtone" {
- SupportedDevice {
- "Analogue Dock Out"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
-}
-
-Modifier "Dual Normal" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 5 },
- { "Speaker Volume", 62 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Dual Normal" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
-}
-
-Modifier "Dual Normal" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
-}
-
-Modifier "Dual Ringtone" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 5 },
- { "Speaker Volume", 62 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Dual Ringtone" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
-}
-
-Modifier "Dual Ringtone" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 4 },
- { "Speaker Volume", 60 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 60 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 60 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "SCO Headset Out"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "SCO Carkit"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "SCO"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "Analogue Dock Out"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
-}
-
-Modifier "Voipout" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 4 },
- { "Speaker Volume", 61 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Voipout" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 88 },
- { "Headphone Volume", 57 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Voipout" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 88 },
- { "Headphone Volume", 57 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Voipout" {
- SupportedDevice {
- "SCO"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "Voipout" {
- SupportedDevice {
- "Analogue Dock Out"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
-}
-
-Modifier "SecVoipout" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 4 },
- { "Speaker Volume", 61 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 57 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "SecVoipout" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 88 },
- { "Headphone Volume", 57 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "SecVoipout" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 88 },
- { "Headphone Volume", 57 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "SecVoipout" {
- SupportedDevice {
- "SCO"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "SecVoipout" {
- SupportedDevice {
- "Analogue Dock Out"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "LINEOUT1 Volume", 1 },
- }
-}
-
-#Modifier : Loopback
-Modifier "Loopback" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 6 },
- { "Speaker Volume", 45 },
- }
- Disable {
- { "AIF2DAC Volume", 96 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 0 },
- { "SPKR DAC1 Volume", 0 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 45 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Loopback" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 50 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-Modifier "Loopback" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 50 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-
-#Modifier : Loop
-Modifier "Loop" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 1 },
- { "SPKR DAC1 Volume", 1 },
- { "Speaker Mixer Volume", 3 },
- { "Speaker Boost Volume", 6 },
- { "Speaker Volume", 52 },
- }
- Disable {
- { "AIF2DAC Volume", 96 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "SPKL DAC1 Volume", 0 },
- { "SPKR DAC1 Volume", 0 },
- { "Speaker Mixer Volume", 0 },
- { "Speaker Volume", 45 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Loop" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 40 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 30 },
- }
-}
-
-Modifier "Loop" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 40 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 45 },
- }
-}
-
-#INPUT Modifier Stage
-#Voice, Camcorder, Recognition, Communication,
-
-Modifier "Voice" {
- SupportedDevice {
- "Builtin Mic"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 30 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 120 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voice" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1R Volume", 18 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 118 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voice" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
-}
-
-Modifier "Camcorder" {
- SupportedDevice {
- "Builtin Mic"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 30 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 100 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Camcorder" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1R Volume", 30 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 118 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Camcorder" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
-}
-
-Modifier "Recognition" {
- SupportedDevice {
- "Builtin Mic"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 26 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 108 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Recognition" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1R Volume", 18 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 118 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Recognition" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
-}
-
-Modifier "Communication" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 25 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 109 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Communication" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 24 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Communication" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1R Volume", 25 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 109 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Communication" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voipin" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 25 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 109 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voipin" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 24 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voipin" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1R Volume", 25 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 109 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voipin" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "SecVoipin" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 25 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 109 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "SecVoipin" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN2R Volume", 24 },
- { "MIXINR IN2R Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "SecVoipin" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1R Volume", 25 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 109 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "SecVoipin" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-#LoopbackIn-Capture Modifier
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "IN2R Volume", 3 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 3 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headset Out"
- }
- Enable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
-// { "Sidetone HPF Mux", 3 },
-// { "Sidetone HPF Switch", 1 },
- { "IN1R Volume", 8 },
- { "MIXINR IN1R Volume", 1 },
- { "MIXINR IN1RP Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
-// { "Sidetone HPF Mux", 0 },
-// { "Sidetone HPF Switch", 0 },
- { "IN1R Volume", 8 },
- { "MIXINR IN1R Volume", 0 },
- { "MIXINR IN1RP Volume", 0 },
- { "DAC1 Right Sidetone Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-#LoopIn-Capture Modifier
-Modifier "LoopIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "LoopIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "IN2R Volume", 15 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 3 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "LoopIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headset Out"
- }
- Enable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 8 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "LoopIn" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
-// { "Sidetone HPF Mux", 3 },
-// { "Sidetone HPF Switch", 1 },
- { "IN1R Volume", 2 },
- { "MIXINR IN1R Volume", 1 },
- { "MIXINR IN1RP Volume", 1 },
- { "DAC1 Right Sidetone Volume", 12 },
- { "AIF1ADC1 Volume", 96 },
- }
- Disable {
-// { "Sidetone HPF Mux", 0 },
-// { "Sidetone HPF Switch", 0 },
- { "IN1R Volume", 3 },
- { "MIXINR IN1R Volume", 0 },
- { "MIXINR IN1RP Volume", 0 },
- { "DAC1 Right Sidetone Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-#Special Modifier for voicecall recording, not gain
-Modifier "MicRec" {
- Enable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
-// { "AIF1ADC1R Mixer AIF2 Switch", 0 },
-// { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
- Disable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
-}
-
-Modifier "Downlink" {
- Enable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 0 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 0 },
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
- Disable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
-}
-
-Modifier "Uplink" {
- Enable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
- Disable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
-}
-
-Modifier "VoicecallRec" {
- Enable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
- Disable {
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
-}
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
new file mode 100644
index 0000000..b520630
--- /dev/null
+++ b/configs/tiny_hw.xml
@@ -0,0 +1,247 @@
+<!-- TinyHAL configuration file for Samsung Galaxy Tab 2 -->
+<tinyhal>
+<!--
+We are able to have most of our routing static so do that
+-->
+<path>
+ <!-- general -->
+ <ctl name="IN1L ZC Switch" val="0"/>
+ <ctl name="IN1R ZC Switch" val="0"/>
+ <ctl name="IN2L ZC Switch" val="0"/>
+ <ctl name="IN2R ZC Switch" val="0"/>
+ <ctl name="Output ZC Switch" val="0"/>
+ <ctl name="Speaker ZC Switch" val="0"/>
+ <ctl name="Headphone ZC Switch" val="0"/>
+
+ <!-- AIF1->DAC1 -->
+ <ctl name="DAC1L Mixer AIF1.1 Switch" val="1"/>
+ <ctl name="DAC1R Mixer AIF1.1 Switch" val="1"/>
+ <ctl name="DAC1 Switch" val="1"/>
+
+ <!-- ADC->AIF2 -->
+ <ctl name="AIF2DAC2L Mixer Left Sidetone Switch" val="1"/>
+ <ctl name="AIF2DAC2L Mixer Right Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer Left Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer Right Sidetone Switch" val="1"/>
+ <ctl name="DAC2 Left Sidetone Volume" val="12"/>
+ <ctl name="DAC2 Right Sidetone Volume" val="12"/>
+ <ctl name="DAC2 Switch" val="1"/>
+
+ <!-- DAC1->HP -->
+ <ctl name="Left Headphone Mux" val="DAC"/>
+ <ctl name="Right Headphone Mux" val="DAC"/>
+
+ <!-- DAC1->SPKL/R->SPKL/R Boost->SPK -->
+ <ctl name="SPKL DAC1 Switch" val="1"/>
+ <ctl name="SPKR DAC1 Switch" val="1"/>
+ <ctl name="SPKL Boost SPKL Switch" val="1"/>
+ <ctl name="SPKL Boost SPKR Switch" val="0"/>
+ <ctl name="SPKR Boost SPKL Switch" val="0"/>
+ <ctl name="SPKR Boost SPKR Switch" val="1"/>
+ <ctl name="Speaker Mixer Volume" val="3"/>
+
+ <!-- DAC->Output mixer->Earpiece -->
+ <ctl name="Left Output Mixer DAC Switch" val="1"/>
+ <ctl name="Right Output Mixer DAC Switch" val="1"/>
+ <ctl name="Earpiece Mixer Left Output Switch" val="1"/>
+ <ctl name="Earpiece Mixer Right Output Switch" val="1"/>
+ <ctl name="Earpiece Switch" val="1"/>
+ <ctl name="LINEOUT1N Mixer Right Output Switch" val="1"/>
+ <ctl name="LINEOUT1P Mixer Left Output Switch" val="1"/>
+
+ <!-- Main Mic->IN1LP/N->Input Mixer with +30dB at mixer -->
+ <ctl name="IN1L PGA IN1LP Switch" val="1"/>
+ <ctl name="IN1L PGA IN1LN Switch" val="1"/>
+ <ctl name="MIXINL IN1L Volume" val="1"/>
+ <ctl name="IN1L Switch" val="1"/>
+
+ <!-- Sub Mic->IN2RP/N->Input Mixer with +30dB at mixer -->
+ <ctl name="IN2R PGA IN2RP Switch" val="1"/>
+ <ctl name="IN2R PGA IN2RN Switch" val="1"/>
+ <ctl name="MIXINR IN2R Volume" val="1"/>
+ <ctl name="IN2R Switch" val="1"/>
+
+ <!-- Ear Mic->IN1RP/N->Input Mixer with +30dB at mixer -->
+ <ctl name="IN1R PGA IN1RP Switch" val="1"/>
+ <ctl name="IN1R PGA IN1RN Switch" val="1"/>
+ <ctl name="MIXINR IN1R Volume" val="1"/>
+ <ctl name="IN1R Switch" val="1"/>
+
+ <!-- Input mixer->ADC->AIF1 -->
+ <ctl name="AIF1ADC1L Mixer ADC/DMIC Switch" val="1"/>
+ <ctl name="AIF1ADC1R Mixer ADC/DMIC Switch" val="1"/>
+ <ctl name="ADCL Mux" val="ADC"/>
+
+ <!-- Work around core issue -->
+ <ctl name="ADCL Mux" val="DMIC"/>
+ <ctl name="ADCL Mux" val="ADC"/>
+ <ctl name="ADCR Mux" val="DMIC"/>
+ <ctl name="ADCR Mux" val="ADC"/>
+
+ <!-- Default all outputs off -->
+ <ctl name="HP Switch" val="0"/>
+ <ctl name="SPK Switch" val="0"/>
+ <ctl name="RCV Switch" val="0"/>
+ <ctl name="LINEOUT Switch" val="0"/>
+
+ <!-- Default all inputs off -->
+ <ctl name="Main Mic Switch" val="0"/>
+ <ctl name="Headset Mic Switch" val="0"/>
+</path>
+<device name="earpiece">
+ <path name="on">
+ <ctl name="RCV Switch" val="1"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="Left Output Mixer DAC Volume" val="7"/>
+ <ctl name="Right Output Mixer DAC Volume" val="7"/>
+ <ctl name="Output Volume" val="57"/>
+ <ctl name="Earpiece Volume" val="1"/>
+ </path>
+ <path name="off">
+ <ctl name="RCV Switch" val="0"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="Left Output Mixer DAC Volume" val="7"/>
+ <ctl name="Right Output Mixer DAC Volume" val="7"/>
+ <ctl name="Output Volume" val="57"/>
+ <ctl name="Earpiece Volume" val="1"/>
+ </path>
+</device>
+<device name="speaker">
+ <path name="on">
+ <ctl name="SPK Switch" val="1"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="SPKL DAC1 Volume" val="1"/>
+ <ctl name="SPKR DAC1 Volume" val="1"/>
+ <ctl name="Speaker Mixer Volume" val="3"/>
+ <ctl name="Speaker Boost Volume" val="6"/>
+ <ctl name="Speaker Volume" val="59"/>
+ </path>
+ <path name="off">
+ <ctl name="SPK Switch" val="0"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="SPKL DAC1 Volume" val="1"/>
+ <ctl name="SPKR DAC1 Volume" val="1"/>
+ <ctl name="Speaker Mixer Volume" val="0"/>
+ <ctl name="Speaker Volume" val="57"/>
+ <ctl name="Speaker Boost Volume" val="0"/>
+ </path>
+</device>
+<device name="headphone">
+ <path name="on">
+ <ctl name="HP Switch" val="1"/>
+ <ctl name="Headphone ZC Switch" val="0"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="Headphone Volume" val="50"/>
+ </path>
+ <path name="off">
+ <ctl name="HP Switch" val="0"/>
+ <ctl name="Headphone ZC Switch" val="0"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="Headphone Volume" val="45"/>
+ </path>
+</device>
+<device name="sco-out">
+ <path name="on">
+ <ctl name="AIF3ADC Mux" val="1"/>
+ <ctl name="AIF2DAC2L Mixer AIF1.1 Switch" val="1"/>
+ <ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="1"/>
+ <ctl name="AIF2ADCL Source" val="Left"/>
+ <ctl name="AIF2ADCR Source" val="Left"/>
+ </path>
+ <path name="off">
+ <ctl name="AIF3ADC Mux" val="0"/>
+ <ctl name="AIF2DAC2L Mixer AIF1.1 Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="0"/>
+ </path>
+</device>
+<device name="analog-dock">
+ <path name="on">
+ <ctl name="LINEOUT1N Switch" val="1"/>
+ <ctl name="LINEOUT1P Switch" val="1"/>
+ <ctl name="LINEOUT Switch" val="1"/>
+ <ctl name="AIF1DAC1 Volume" val="96"/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96"/>
+ <ctl name="Left Output Mixer DAC Volume" val="7"/>
+ <ctl name="Right Output Mixer DAC Volume" val="7"/>
+ <ctl name="Output Volume" val="56"/>
+ <ctl name="LINEOUT1 Volume" val="1"/>
+ </path>
+ <path name="off">
+ <ctl name="LINEOUT1N Switch" val="0"/>
+ <ctl name="LINEOUT1P Switch" val="0"/>
+ <ctl name="LINEOUT Switch" val="0"/>
+ <ctl name="AIF1DAC1 Volume" val="96 "/>
+ <ctl name="AIF1 Boost Volume" val="0"/>
+ <ctl name="DAC1 Volume" val="96 "/>
+ <ctl name="Left Output Mixer DAC Volume" val="7"/>
+ <ctl name="Right Output Mixer DAC Volume" val="7"/>
+ <ctl name="Output Volume" val="57 "/>
+ <ctl name="LINEOUT1 Volume" val="1"/>
+ </path>
+</device>
+<device name="builtin-mic">
+ <path name="on">
+ <ctl name="Main Mic Switch" val="1"/>
+ <ctl name="AIF1ADCL Source" val="Left"/>
+ <ctl name="AIF1ADCR Source" val="Left"/>
+ <ctl name="AIF2ADCL Source" val="Left"/>
+ <ctl name="AIF2ADCR Source" val="Left"/>
+ <ctl name="MIXINL IN1L Switch" val="1"/>
+ <ctl name="AIF1ADC1 HPF Mode" val="1"/>
+ <ctl name="AIF1ADC1 HPF Switch" val="1"/>
+ <ctl name="AIF2 Mode" val="Master"/>
+ <ctl name="AIF2DAC Mux" val="AIF3DACDAT"/>
+ </path>
+ <path name="off">
+ <ctl name="Main Mic Switch" val="0"/>
+ <ctl name="MIXINL IN1L Switch" val="0"/>
+ <ctl name="AIF1ADC1 HPF Mode" val="0"/>
+ <ctl name="AIF1ADC1 HPF Switch" val="0"/>
+ <ctl name="AIF2 Mode" val="Slave"/>
+ <ctl name="AIF2DAC Mux" val="AIF2DACDAT"/>
+ </path>
+</device>
+<device name="headset-in">
+ <path name="on">
+ <ctl name="Headset Mic Switch" val="1"/>
+ <ctl name="AIF1ADCL Source" val="Right"/>
+ <ctl name="AIF1ADCR Source" val="Right"/>
+ <ctl name="AIF2ADCL Source" val="Right"/>
+ <ctl name="AIF2ADCR Source" val="Right"/>
+ <ctl name="MIXINR IN1R Switch" val="1"/>
+ </path>
+ <path name="off">
+ <ctl name="Headset Mic Switch" val="0"/>
+ <ctl name="MIXINR IN1R Switch" val="0"/>
+ </path>
+</device>
+<device name="sco-in">
+ <path name="on">
+ <ctl name="AIF2ADC Mux" val="1"/>
+ <ctl name="AIF1ADCL Source" val="Left"/>
+ <ctl name="AIF1ADCR Source" val="Left"/>
+ <ctl name="AIF2ADCL Source" val="Left"/>
+ <ctl name="AIF2ADCR Source" val="Left"/>
+ <ctl name="AIF1ADC1R Mixer AIF2 Switch" val="1"/>
+ <ctl name="AIF1ADC1L Mixer AIF2 Switch" val="1"/>
+ </path>
+ <path name="off">
+ <ctl name="AIF2ADC Mux" val="0"/>
+ <ctl name="AIF1ADC1R Mixer AIF2 Switch" val="0"/>
+ <ctl name="AIF1ADC1L Mixer AIF2 Switch" val="0"/>
+ </path>
+</device>
+</tinyhal>
diff --git a/configs/tinyucm.conf b/configs/tinyucm.conf
deleted file mode 100644
index a74ae02..0000000
--- a/configs/tinyucm.conf
+++ /dev/null
@@ -1,393 +0,0 @@
-// Controls that can be set once at system startup. As the WM8994/WM1811
-// outputs don't conflict with each other we set up most of our routing
-// statically at system startup.
-
-//NOTICE
-//default gain & tinyucm file are in libaudio folder.
-//If you want to have vendor specific configuration files, put the files in device/*product*/
-//Use tinyucm.conf and default_gain.conf in target device
-
-// We need to do symmetric rates so fix the hardware at 44.1kHz and
-// resample.
-InputRate 44100
-OutputRate 44100
-PlaybackLink 0
-CaptureLink 0
-BasebandLink 1
-BluetoothLink 2
-
-//Modifier File
-ModifierFile "default_gain.conf"
-
-INOUT_MAP {
- { "Speaker", "Builtin Mic" },
- { "Headset Out", "Headset In" },
- { "Headphone", "Builtin Mic" },
- { "SCO Headset Out", "SCO Headset In" },
- { "SCO", "SCO Headset In" },
-}
-
-INPUT_CHANNEL_MAP {
- { "Builtin Mic", "Right" },
- { "Headset In", "Right" },
- { "SCO Headset In", "Left" },
-}
-
-Core {
-//general
- { "IN1L ZC Switch", 0 },
- { "IN1R ZC Switch", 0 },
- { "IN2L ZC Switch", 0 },
- { "IN2R ZC Switch", 0 },
- { "Output ZC Switch", 0 },
- { "Speaker ZC Switch", 0 },
- { "Headphone ZC Switch", 0 },
-
-// AIF1->DAC1
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- { "DAC1 Switch", 1 },
-
-// AIF2->DAC1
-// { "DAC1L Mixer AIF2 Switch", 1 },
-// { "DAC1R Mixer AIF2 Switch", 1 },
-
-// ADC->AIF2
- { "AIF2DAC2L Mixer Left Sidetone Switch", 1 },
- { "AIF2DAC2L Mixer Right Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Right Sidetone Switch", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Switch", 1 },
-
-// DAC1->HP
- { "Left Headphone Mux", "DAC" },
- { "Right Headphone Mux", "DAC" },
-
-// DAC1->SPKL/R->SPKL/R Boost->SPK
- { "SPKL DAC1 Switch", 1 },
- { "SPKR DAC1 Switch", 1 },
- { "SPKL Boost SPKL Switch", 1 },
- { "SPKL Boost SPKR Switch", 0 },
- { "SPKR Boost SPKL Switch", 0 },
- { "SPKR Boost SPKR Switch", 1 },
- { "Speaker Mixer Volume", 3 },
-
-// DAC->Output mixer->Earpiece
- { "Left Output Mixer DAC Switch", 1 },
- { "Right Output Mixer DAC Switch", 1 },
- { "Earpiece Mixer Left Output Switch", 1 },
- { "Earpiece Mixer Right Output Switch", 1 },
- { "Earpiece Switch", 1 },
- { "LINEOUT1N Mixer Right Output Switch", 1 },
- { "LINEOUT1P Mixer Left Output Switch", 1 },
-
-// Main Mic->IN1LP/N->Input Mixer with +30dB at mixer
- { "IN1L PGA IN1LP Switch", 1 },
- { "IN1L PGA IN1LN Switch", 1 },
- { "MIXINL IN1L Volume", 1 },
- { "IN1L Switch", 1 },
-
-// Sub Mic->IN2RP/N->Input Mixer with +30dB at mixer
- { "IN2R PGA IN2RP Switch", 1 },
- { "IN2R PGA IN2RN Switch", 1 },
- { "MIXINR IN2R Volume", 1 },
- { "IN2R Switch", 1 },
-
-// Ear Mic->IN1RP/N->Input Mixer with +30dB at mixer
- { "IN1R PGA IN1RP Switch", 1 },
- { "IN1R PGA IN1RN Switch", 1 },
- { "MIXINR IN1R Volume", 1 },
- { "IN1R Switch", 1 },
-
-// Input mixer->ADC->AIF1
- { "AIF1ADC1L Mixer ADC/DMIC Switch", 1 },
- { "AIF1ADC1R Mixer ADC/DMIC Switch", 1 },
- { "ADCL Mux", "ADC" },
-
-// HPF on to take out some bounce
-// { "AIF1ADC1 HPF Switch", 1 },
-// { "Sidetone HPF Switch", 1 },
-
-// Work around core issue
- { "ADCL Mux", "DMIC" },
- { "ADCL Mux", "ADC" },
- { "ADCR Mux", "DMIC" },
- { "ADCR Mux", "ADC" },
-
-// Default all outputs off
- { "HP Switch", 0 },
- { "SPK Switch", 0 },
- { "RCV Switch", 0 },
- { "LINEOUT Switch", 0 },
-
-// Default all inputs off
- { "Main Mic Switch", 0 },
- { "Sub Mic Switch", 0 },
- { "Headset Mic Switch", 0 },
-}
-
-// Default configuration for a specific output
-// Should really add aliasing; headset and headphone are the same thing
-// and we should refcount appropriately (ditto for speaker/earpiece on
-// some low end devices)
-
-Device "Speaker" {
- Enable {
- { "SPK Switch", 1 },
- }
- Disable {
- { "SPK Switch", 0 },
- }
-}
-
-Device "Headset Out" {
- Enable {
- { "HP Switch", 1 },
- }
- Disable {
- { "HP Switch", 0 },
- }
- SharedDevice "Headphone"
-}
-
-Device "Headphone" {
- Enable {
- { "HP Switch", 1 },
- }
- Disable {
- { "HP Switch", 0 },
- }
- SharedDevice "Headset Out"
-}
-
-Device "SCO Headset Out" {
- Enable {
- { "AIF3ADC Mux", 1 },
- { "AIF2DAC2L Mixer AIF1.1 Switch", 1 },
- { "AIF2DAC2R Mixer AIF1.1 Switch", 1 },
- { "AIF2ADCL Source", "Left" },
- { "AIF2ADCR Source", "Left" },
- }
- Disable {
- { "AIF3ADC Mux", 0 },
- { "AIF2DAC2L Mixer AIF1.1 Switch", 0 },
- { "AIF2DAC2R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Device "SCO" {
- Enable {
- { "AIF3ADC Mux", 1 },
- { "AIF2DAC2L Mixer AIF1.1 Switch", 1 },
- { "AIF2DAC2R Mixer AIF1.1 Switch", 1 },
- { "AIF2ADCL Source", "Left" },
- { "AIF2ADCR Source", "Left" },
- }
- Disable {
- { "AIF3ADC Mux", 0 },
- { "AIF2DAC2L Mixer AIF1.1 Switch", 0 },
- { "AIF2DAC2R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Device "SCO Carkit" {
- Enable {
- { "AIF3ADC Mux", 1 },
- { "AIF2DAC2L Mixer AIF1.1 Switch", 1 },
- { "AIF2DAC2R Mixer AIF1.1 Switch", 1 },
- { "AIF2ADCL Source", "Left" },
- { "AIF2ADCR Source", "Left" },
- }
- Disable {
- { "AIF3ADC Mux", 0 },
- { "AIF2DAC2L Mixer AIF1.1 Switch", 0 },
- { "AIF2DAC2R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Device "Analogue Dock Out" {
- Enable {
- { "LINEOUT1N Switch", 1 },
- { "LINEOUT1P Switch", 1 },
- { "LINEOUT Switch", 1 },
- }
- Disable {
- { "LINEOUT1N Switch", 0 },
- { "LINEOUT1P Switch", 0 },
- { "LINEOUT Switch", 0 },
- }
-}
-
-Device "Builtin Mic" {
- Enable {
- { "Sub Mic Switch", 1 },
- { "AIF1ADCL Source", "Right" },
- { "AIF1ADCR Source", "Right" },
- { "AIF2ADCL Source", "Right" },
- { "AIF2ADCR Source", "Right" },
- { "MIXINR IN2R Switch", 1 },
- }
- Disable {
- { "Sub Mic Switch", 0 },
- { "MIXINR IN2R Switch", 0 },
- }
-}
-
-Device "Headset In" {
- Enable {
- { "Headset Mic Switch", 1 },
- { "AIF1ADCL Source", "Right" },
- { "AIF1ADCR Source", "Right" },
- { "AIF2ADCL Source", "Right" },
- { "AIF2ADCR Source", "Right" },
- { "MIXINR IN1R Switch", 1 },
- }
- Disable {
- { "Headset Mic Switch", 0 },
- { "MIXINR IN1R Switch", 0 },
- }
-}
-
-Device "SCO Headset In" {
- Enable {
- { "AIF2ADC Mux", 1 },
- { "AIF1ADCL Source", "Left" },
- { "AIF1ADCR Source", "Left" },
- { "AIF2ADCL Source", "Left" },
- { "AIF2ADCR Source", "Left" },
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
- Disable {
- { "AIF2ADC Mux", 0 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
-}
-
-#Verb Stage
-#Currently just using normal and voicecall
-#Normal, Voicecall
-Verb "Normal" {
- Enable {
- { "HP Output Mode", 0 },
- { "AIF2 Mode", 1 },
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- { "AIF2DAC Mux", "AIF3DACDAT" },
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- }
- Disable {
- { "HP Output Mode", 0 },
-// { "DAC1L Mixer AIF1.1 Switch", 0 },
-// { "DAC1R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Verb "Ringtone" {
- Enable {
- { "HP Output Mode", 0 },
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- }
- Disable {
- { "HP Output Mode", 0 },
-// { "DAC1L Mixer AIF1.1 Switch", 0 },
-// { "DAC1R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Verb "Communication" {
- Enable {
- { "HP Output Mode", 0 },
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- }
- Disable {
- { "HP Output Mode", 0 },
- { "DAC1L Mixer AIF1.1 Switch", 0 },
- { "DAC1R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Verb "Voicecall" {
- Enable {
- { "HP Output Mode", 0 },
- { "AIF2 Mode", 0 },
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- { "DAC1L Mixer AIF2 Switch", 1 },
- { "DAC1R Mixer AIF2 Switch", 1 },
-//left:0, right:1
- { "AIF2DACL Source", 0 },
- { "AIF2DACR Source", 0 },
- { "AIF2DAC Mux", "AIF2DACDAT" },
- }
- Disable {
- { "HP Output Mode", 0 },
- { "AIF2 Mode", 0 },
-// { "DAC1L Mixer AIF1.1 Switch", 0 },
-// { "DAC1R Mixer AIF1.1 Switch", 0 },
- { "DAC1L Mixer AIF2 Switch", 0 },
- { "DAC1R Mixer AIF2 Switch", 0 },
- { "AIF2DACL Source", 0 },
- { "AIF2DACR Source", 1 },
- { "AIF2DAC Mux", "AIF3DACDAT" },
- }
-}
-
-Verb "Loopback" {
- Enable {
- { "HP Output Mode", 0 },
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- { "DAC1L Mixer Right Sidetone Switch", 1 },
- { "DAC1R Mixer Right Sidetone Switch", 1 },
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- }
- Disable {
- { "HP Output Mode", 0 },
-// { "DAC1L Mixer AIF1.1 Switch", 0 },
-// { "DAC1R Mixer AIF1.1 Switch", 0 },
- { "DAC1L Mixer Right Sidetone Switch", 0 },
- { "DAC1R Mixer Right Sidetone Switch", 0 },
- }
-}
-
-ChannelSource "Left" {
- Enable {
- { "AIF1ADCL Source", "Left" },
- { "AIF1ADCR Source", "Left" },
- }
- Disable {
- { "AIF1ADCL Source", "Left" },
- { "AIF1ADCR Source", "Right" },
- }
-}
-
-ChannelSource "Right" {
- Enable {
- { "AIF1ADCL Source", "Right" },
- { "AIF1ADCR Source", "Right" },
- }
- Disable {
- { "AIF1ADCL Source", "Left" },
- { "AIF1ADCR Source", "Right" },
- }
-}
-
-ChannelSource "Stereo" {
- Enable {
- { "AIF1ADCL Source", "Left" },
- { "AIF1ADCR Source", "Right" },
- }
- Disable {
- { "AIF1ADCL Source", "Left" },
- { "AIF1ADCR Source", "Right" },
- }
-}
-
diff --git a/p3110.mk b/p3110.mk
index 08d8504..148c812 100644
--- a/p3110.mk
+++ b/p3110.mk
@@ -22,9 +22,8 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
# Audio
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/default_gain.conf:system/etc/default_gain.conf \
- $(LOCAL_PATH)/configs/tinyucm.conf:system/etc/tinyucm.conf \
- $(LOCAL_PATH)/configs/Volume.db:system/etc/Volume.db
+ $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/espressowifi \
+ $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
# Use the non-open-source parts, if they're present
$(call inherit-product, vendor/samsung/p31xx/p3110-vendor.mk)
diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt
index 1c092d4..be59f74 100644
--- a/proprietary-common-files.txt
+++ b/proprietary-common-files.txt
@@ -1,26 +1,12 @@
system/bin/geomagneticd
system/bin/gpsd
system/bin/orientationd
-system/etc/audio/LVVEFS_Rx_Configuration.txt
-system/etc/audio/LVVEFS_Tx_Configuration.txt
-system/etc/audio/Rx_ControlParams_BLUETOOTH_HEADSET.txt
-system/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt
-system/etc/audio/Rx_ControlParams_SPEAKER_WIDEBAND.txt
-system/etc/audio/Rx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt
-system/etc/audio/Rx_ControlParams_WIRED_HEADSET_WIDEBAND.txt
-system/etc/audio/Tx_ControlParams_BLUETOOTH_HEADSET.txt
-system/etc/audio/Tx_ControlParams_EARPIECE_WIDEBAND.txt
-system/etc/audio/Tx_ControlParams_SPEAKER_WIDEBAND.txt
-system/etc/audio/Tx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt
-system/etc/audio/Tx_ControlParams_WIRED_HEADSET_WIDEBAND.txt
system/etc/wifi/bcmdhd_apsta.bin
system/etc/wifi/bcmdhd_mfg.bin
system/etc/wifi/bcmdhd_p2p.bin
system/etc/wifi/bcmdhd_sta.bin
system/etc/wifi/nvram_mfg.txt
system/etc/wifi/nvram_net.txt
-system/lib/hw/audio.primary.piranha.so
-system/lib/hw/audio_policy.piranha.so
system/lib/hw/camera.omap4.so
system/lib/hw/gps.omap4.so
system/lib/hw/sensors.omap4.so
@@ -33,27 +19,15 @@ system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so
system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so
system/lib/libOMX_Core.so
system/lib/libQmageDecoder.so
-system/lib/lib_SamsungRec_V01003.so
-system/lib/lib_Samsung_Resampler.so
-system/lib/lib_Samsung_SB_AM_for_ICS_v03002.so
-system/lib/lib_SoundAlive_for_ICS_V01012.so
-system/lib/libaudiopolicy_sec.so
-system/lib/libcontrolcsc.so
system/lib/libdomx.so
system/lib/libion.so
-system/lib/liblibSoundAlive_VSP_ver305.so
-system/lib/liblvvefs.so
system/lib/libmm_osal.so
system/lib/libril.so
-system/lib/libsamsungRecord.so
-system/lib/libsamsungSoundbooster.so
system/lib/libsec-ril.so
system/lib/libsecnativefeature.so
system/lib/libsecril-client.so
-system/lib/libsoundalive.so
-system/lib/libtinyalsa.so
system/lib/libtiutils.so
-system/vendor/bin/pvrsrvinit
+system/vendor/bin/pvrsrvctl
system/vendor/firmware/BCM4330.hcd
system/vendor/firmware/ducati-m3.bin
system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so
diff --git a/recovery.fstab b/recovery.fstab
index 673990a..54666b9 100644
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -1,14 +1,14 @@
# mount point fstype device
-/system ext4 /dev/block/mmcblk0p9
-/cache ext4 /dev/block/mmcblk0p7
-/data ext4 /dev/block/mmcblk0p10 length=-16384
-/efs ext4 /dev/block/mmcblk0p1
-/misc emmc misc
-/boot emmc /dev/block/mmcblk0p5
-/recovery emmc /dev/block/mmcblk0p6
-/bootloader emmc /dev/block/mmcblk0p2
-/preload ext4 /dev/block/mmcblk0p11
+/system ext4 /dev/block/mmcblk0p9
+/cache ext4 /dev/block/mmcblk0p7
+/data ext4 /dev/block/mmcblk0p10 length=-16384
+/efs ext4 /dev/block/mmcblk0p1
+/misc emmc misc
+/boot emmc /dev/block/mmcblk0p5
+/recovery emmc /dev/block/mmcblk0p6
+/bootloader emmc /dev/block/mmcblk0p2
+/preload ext4 /dev/block/mmcblk0p11
-/emmc datamedia /dev/null
-/sdcard vfat /dev/block/mmcblk1p1
+/sdcard datamedia /dev/null
+/external_sd vfat /dev/block/mmcblk1p1
diff --git a/system.prop b/system.prop
index c13b75b..caf1d16 100644
--- a/system.prop
+++ b/system.prop
@@ -4,3 +4,4 @@
rild.libpath=/vendor/lib/libsec-ril.so
rild.libargs=-d /dev/ttys0
telephony.lteOnCdmaDevice=0
+ro.sf.lcd_density=170