summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2013-01-26 23:22:33 +0100
committerPaul Kocialkowski <contact@paulk.fr>2013-01-26 23:22:33 +0100
commit0188235d082f81a9b94eec8c3b415320292ec143 (patch)
tree25b4fcf9f0cc6a445fd2cbc74301971e61f86d79
parent020b98d5c9a33f1adec94b034ce3fa0feed87cf1 (diff)
downloaddevice_samsung_p3100-replicant-4.0-audio.zip
device_samsung_p3100-replicant-4.0-audio.tar.gz
device_samsung_p3100-replicant-4.0-audio.tar.bz2
Audio: Import configuration from CyanogenMod 10.1replicant-4.0-audio
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat
-rw-r--r--audio/audio.diff2829
-rw-r--r--configs/Volume.dbbin10240 -> 0 bytes
-rw-r--r--configs/default_gain.conf2243
-rw-r--r--configs/tiny_hw.xml247
-rw-r--r--configs/tinyucm.conf448
-rw-r--r--p3100.mk4
6 files changed, 3077 insertions, 2694 deletions
diff --git a/audio/audio.diff b/audio/audio.diff
new file mode 100644
index 0000000..7b22c73
--- /dev/null
+++ b/audio/audio.diff
@@ -0,0 +1,2829 @@
+diff --git a/audio_hw.c b/audio_hw.c
+index af63d51..b0093c7 100644
+--- a/audio_hw.c
++++ b/audio_hw.c
+@@ -40,16 +40,13 @@
+
+ #include "ril_interface.h"
+
+-
+ /* Mixer control names */
+ #define MIXER_DL2_LEFT_EQUALIZER "DL2 Left Equalizer"
+ #define MIXER_DL2_RIGHT_EQUALIZER "DL2 Right Equalizer"
+ #define MIXER_DL1_MEDIA_PLAYBACK_VOLUME "DL1 Media Playback Volume"
+ #define MIXER_DL1_VOICE_PLAYBACK_VOLUME "DL1 Voice Playback Volume"
+-#define MIXER_DL1_TONES_PLAYBACK_VOLUME "DL1 Tones Playback Volume"
+ #define MIXER_DL2_MEDIA_PLAYBACK_VOLUME "DL2 Media Playback Volume"
+ #define MIXER_DL2_VOICE_PLAYBACK_VOLUME "DL2 Voice Playback Volume"
+-#define MIXER_DL2_TONES_PLAYBACK_VOLUME "DL2 Tones Playback Volume"
+ #define MIXER_SDT_DL_VOLUME "SDT DL Volume"
+ #define MIXER_SDT_UL_VOLUME "SDT UL Volume"
+
+@@ -61,10 +58,8 @@
+ #define MIXER_DL1_EQUALIZER "DL1 Equalizer"
+ #define MIXER_DL1_MIXER_MULTIMEDIA "DL1 Mixer Multimedia"
+ #define MIXER_DL1_MIXER_VOICE "DL1 Mixer Voice"
+-#define MIXER_DL1_MIXER_TONES "DL1 Mixer Tones"
+ #define MIXER_DL2_MIXER_MULTIMEDIA "DL2 Mixer Multimedia"
+ #define MIXER_DL2_MIXER_VOICE "DL2 Mixer Voice"
+-#define MIXER_DL2_MIXER_TONES "DL2 Mixer Tones"
+ #define MIXER_SIDETONE_MIXER_PLAYBACK "Sidetone Mixer Playback"
+ #define MIXER_SIDETONE_MIXER_CAPTURE "Sidetone Mixer Capture"
+ #define MIXER_DL2_MONO_MIXER "DL2 Mono Mixer"
+@@ -104,9 +99,6 @@
+ #define MIXER_FLAT_RESPONSE "Flat response"
+ #define MIXER_4KHZ_LPF_0DB "4Khz LPF 0dB"
+
+-/* HDMI mixer controls */
+-#define MIXER_MAXIMUM_LPCM_CHANNELS "Maximum LPCM channels"
+-
+
+ /* ALSA cards for OMAP4 */
+ #define CARD_OMAP4_ABE 0
+@@ -124,105 +116,34 @@
+ #define PORT_SPDIF 9
+ #define PORT_HDMI 0
+
+-/* User serviceable */
+-/* #define to use mmap no-irq mode for playback, #undef for non-mmap irq mode */
+-#undef PLAYBACK_MMAP // was #define
+-/* short period (aka low latency) in milliseconds */
+-#define SHORT_PERIOD_MS 3 // was 22
+-/* deep buffer short period (screen on) in milliseconds */
+-#define DEEP_BUFFER_SHORT_PERIOD_MS 22
+-/* deep buffer long period (screen off) in milliseconds */
+-#define DEEP_BUFFER_LONG_PERIOD_MS 308
+-
+-/* Constraint imposed by ABE: for playback, all period sizes must be multiples of 24 frames
+- * = 500 us at 48 kHz. It seems to be either 48 or 96 for capture, or maybe it is because the
+- * limitation is actually a min number of bytes which translates to a different amount of frames
+- * according to the number of channels.
+- */
++/* constraint imposed by ABE: all period sizes must be multiples of 24 */
+ #define ABE_BASE_FRAME_COUNT 24
+-
+-/* Derived from MM_FULL_POWER_SAMPLING_RATE=48000 and ABE_BASE_FRAME_COUNT=24 */
+-#define MULTIPLIER_FACTOR 2
+-
+ /* number of base blocks in a short period (low latency) */
+-#define SHORT_PERIOD_MULTIPLIER (SHORT_PERIOD_MS * MULTIPLIER_FACTOR)
++#define SHORT_PERIOD_MULTIPLIER 44 /* 22 ms */
+ /* number of frames per short period (low latency) */
+ #define SHORT_PERIOD_SIZE (ABE_BASE_FRAME_COUNT * SHORT_PERIOD_MULTIPLIER)
+-
+-/* number of base blocks in a short deep buffer period (screen on) */
+-#define DEEP_BUFFER_SHORT_PERIOD_MULTIPLIER (DEEP_BUFFER_SHORT_PERIOD_MS * MULTIPLIER_FACTOR)
+-/* number of frames per short deep buffer period (screen on) */
+-#define DEEP_BUFFER_SHORT_PERIOD_SIZE (ABE_BASE_FRAME_COUNT * DEEP_BUFFER_SHORT_PERIOD_MULTIPLIER)
+-/* number of periods for deep buffer playback (screen on) */
+-#define PLAYBACK_DEEP_BUFFER_SHORT_PERIOD_COUNT 4
+-
+-/* number of short deep buffer periods in a long period */
+-#define DEEP_BUFFER_LONG_PERIOD_MULTIPLIER \
+- (DEEP_BUFFER_LONG_PERIOD_MS / DEEP_BUFFER_SHORT_PERIOD_MS)
+-/* number of frames per long deep buffer period (screen off) */
+-#define DEEP_BUFFER_LONG_PERIOD_SIZE \
+- (DEEP_BUFFER_SHORT_PERIOD_SIZE * DEEP_BUFFER_LONG_PERIOD_MULTIPLIER)
+-/* number of periods for deep buffer playback (screen off) */
+-#define PLAYBACK_DEEP_BUFFER_LONG_PERIOD_COUNT 2
+-
+-/* number of frames per period for HDMI multichannel output */
+-#define HDMI_MULTI_PERIOD_SIZE 1024
+-/* number of periods for HDMI multichannel output */
+-#define HDMI_MULTI_PERIOD_COUNT 4
+-/* default number of channels for HDMI multichannel output */
+-#define HDMI_MULTI_DEFAULT_CHANNEL_COUNT 6
+-
+-/* Number of pseudo periods for low latency playback.
+- * These are called "pseudo" periods in that they are not known as periods by ALSA.
+- * Formerly, ALSA was configured in MMAP mode with 2 large periods, and this
+- * number was set to 4 (2 didn't work).
+- * The short periods size and count were only known by the audio HAL.
+- * Now for low latency, we are using non-MMAP mode and can set this to 2.
+- */
+-#ifdef PLAYBACK_MMAP
++/* number of short periods in a long period (low power) */
++#define LONG_PERIOD_MULTIPLIER 14 /* 308 ms */
++/* number of frames per long period (low power) */
++#define LONG_PERIOD_SIZE (SHORT_PERIOD_SIZE * LONG_PERIOD_MULTIPLIER)
++/* number of periods for low power playback */
++#define PLAYBACK_LONG_PERIOD_COUNT 2
++/* number of pseudo periods for low latency playback */
+ #define PLAYBACK_SHORT_PERIOD_COUNT 4
+-/* If sample rate converter is required, then use triple-buffering to
+- * help mask the variance in cycle times. Otherwise use double-buffering.
+- */
+-#elif DEFAULT_OUT_SAMPLING_RATE != MM_FULL_POWER_SAMPLING_RATE
+-#define PLAYBACK_SHORT_PERIOD_COUNT 3
+-#else
+-#define PLAYBACK_SHORT_PERIOD_COUNT 2
+-#endif
+-
+-/* write function */
+-#ifdef PLAYBACK_MMAP
+-#define PCM_WRITE pcm_mmap_write
+-#else
+-#define PCM_WRITE pcm_write
+-#endif
+-
+-/* User serviceable */
+-#define CAPTURE_PERIOD_MS 22
+-
+-/* Number of frames per period for capture. This cannot be reduced below 96.
+- * Possibly related to the following rule in sound/soc/omap/omap-pcm.c:
+- * ret = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 384);
+- * (where 96 * 4 = 384)
+- * The only constraints I can find are periods_min = 2, period_bytes_min = 32.
+- * If you define RULES_DEBUG in sound/core/pcm_native.c, you can see which rule
+- * caused capture to fail.
+- * Decoupling playback and capture period size may have impacts on echo canceler behavior:
+- * to be verified. Currently 96 = 4 x 24 but it could be changed without noticing
+- * if we use separate defines.
+- */
+-#define CAPTURE_PERIOD_SIZE (ABE_BASE_FRAME_COUNT * CAPTURE_PERIOD_MS * MULTIPLIER_FACTOR)
+ /* number of periods for capture */
+ #define CAPTURE_PERIOD_COUNT 2
+ /* minimum sleep time in out_write() when write threshold is not reached */
+ #define MIN_WRITE_SLEEP_US 5000
+
+-#define DEFAULT_OUT_SAMPLING_RATE 44100 // 48000 is possible but interacts poorly with HDMI
++#define RESAMPLER_BUFFER_FRAMES (SHORT_PERIOD_SIZE * 2)
++#define RESAMPLER_BUFFER_SIZE (4 * RESAMPLER_BUFFER_FRAMES)
++
++#define DEFAULT_OUT_SAMPLING_RATE 44100
+
+ /* sampling rate when using MM low power port */
+ #define MM_LOW_POWER_SAMPLING_RATE 44100
+ /* sampling rate when using MM full power port */
+-#define MM_FULL_POWER_SAMPLING_RATE 48000 // affects MULTIPLIER_FACTOR
++#define MM_FULL_POWER_SAMPLING_RATE 48000
+ /* sampling rate when using VX port for narrow band */
+ #define VX_NB_SAMPLING_RATE 8000
+ /* sampling rate when using VX port for wide band */
+@@ -294,8 +215,6 @@
+ #define PRODUCT_DEVICE_TORO "toro"
+ #define PRODUCT_NAME_YAKJU "yakju"
+
+-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+-
+ enum tty_modes {
+ TTY_MODE_OFF,
+ TTY_MODE_VCO,
+@@ -303,47 +222,20 @@ enum tty_modes {
+ TTY_MODE_FULL
+ };
+
+-/* deep buffer */
+ struct pcm_config pcm_config_mm = {
+ .channels = 2,
+ .rate = MM_FULL_POWER_SAMPLING_RATE,
+- .period_size = DEEP_BUFFER_LONG_PERIOD_SIZE,
+- .period_count = PLAYBACK_DEEP_BUFFER_LONG_PERIOD_COUNT,
+- .format = PCM_FORMAT_S16_LE,
+- .start_threshold = DEEP_BUFFER_SHORT_PERIOD_SIZE * 2,
+- .avail_min = DEEP_BUFFER_LONG_PERIOD_SIZE,
+-};
+-
+-/* low latency */
+-struct pcm_config pcm_config_tones = {
+- .channels = 2,
+- .rate = MM_FULL_POWER_SAMPLING_RATE,
+- .period_size = SHORT_PERIOD_SIZE,
+- .period_count = PLAYBACK_SHORT_PERIOD_COUNT,
+- .format = PCM_FORMAT_S16_LE,
+-#ifdef PLAYBACK_MMAP
+- .start_threshold = SHORT_PERIOD_SIZE,
+- .avail_min = SHORT_PERIOD_SIZE,
+-#else
+- .start_threshold = 0,
+- .avail_min = 0,
+-#endif
+-};
+-
+-struct pcm_config pcm_config_hdmi_multi = {
+- .channels = HDMI_MULTI_DEFAULT_CHANNEL_COUNT, /* changed when the stream is opened */
+- .rate = MM_FULL_POWER_SAMPLING_RATE, /* changed when the stream is opened */
+- .period_size = HDMI_MULTI_PERIOD_SIZE,
+- .period_count = HDMI_MULTI_PERIOD_COUNT,
++ .period_size = LONG_PERIOD_SIZE,
++ .period_count = PLAYBACK_LONG_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+- .start_threshold = 0,
+- .avail_min = 0,
++ .start_threshold = SHORT_PERIOD_SIZE * 2,
++ .avail_min = LONG_PERIOD_SIZE,
+ };
+
+ struct pcm_config pcm_config_mm_ul = {
+ .channels = 2,
+ .rate = MM_FULL_POWER_SAMPLING_RATE,
+- .period_size = CAPTURE_PERIOD_SIZE,
++ .period_size = SHORT_PERIOD_SIZE,
+ .period_count = CAPTURE_PERIOD_COUNT,
+ .format = PCM_FORMAT_S16_LE,
+ };
+@@ -393,14 +285,6 @@ struct route_setting defaults[] = {
+ .intval = MIXER_ABE_GAIN_0DB,
+ },
+ {
+- .ctl_name = MIXER_DL1_TONES_PLAYBACK_VOLUME,
+- .intval = MIXER_ABE_GAIN_0DB,
+- },
+- {
+- .ctl_name = MIXER_DL2_TONES_PLAYBACK_VOLUME,
+- .intval = MIXER_ABE_GAIN_0DB,
+- },
+- {
+ .ctl_name = MIXER_SDT_DL_VOLUME,
+ .intval = MIXER_ABE_GAIN_0DB,
+ },
+@@ -516,38 +400,6 @@ struct route_setting mm_ul2_amic_right[] = {
+ },
+ };
+
+-/* dual mic configuration with main mic on main channel and sub mic on aux channel.
+- * Used for handset mode (near talk) */
+-struct route_setting mm_ul2_amic_dual_main_sub[] = {
+- {
+- .ctl_name = MIXER_MUX_UL10,
+- .strval = MIXER_AMIC0,
+- },
+- {
+- .ctl_name = MIXER_MUX_UL11,
+- .strval = MIXER_AMIC1,
+- },
+- {
+- .ctl_name = NULL,
+- },
+-};
+-
+-/* dual mic configuration with sub mic on main channel and main mic on aux channel.
+- * Used for speakerphone mode (far talk) */
+-struct route_setting mm_ul2_amic_dual_sub_main[] = {
+- {
+- .ctl_name = MIXER_MUX_UL10,
+- .strval = MIXER_AMIC1,
+- },
+- {
+- .ctl_name = MIXER_MUX_UL11,
+- .strval = MIXER_AMIC0,
+- },
+- {
+- .ctl_name = NULL,
+- },
+-};
+-
+ /* VX UL front-end paths */
+ struct route_setting vx_ul_amic_left[] = {
+ {
+@@ -606,17 +458,12 @@ struct route_setting vx_ul_bt[] = {
+ struct mixer_ctls
+ {
+ struct mixer_ctl *dl1_eq;
+- struct mixer_ctl *mm_dl1_volume;
+- struct mixer_ctl *tones_dl1_volume;
+ struct mixer_ctl *mm_dl2_volume;
+ struct mixer_ctl *vx_dl2_volume;
+- struct mixer_ctl *tones_dl2_volume;
+ struct mixer_ctl *mm_dl1;
+ struct mixer_ctl *mm_dl2;
+ struct mixer_ctl *vx_dl1;
+ struct mixer_ctl *vx_dl2;
+- struct mixer_ctl *tones_dl1;
+- struct mixer_ctl *tones_dl2;
+ struct mixer_ctl *earpiece_enable;
+ struct mixer_ctl *dl2_mono;
+ struct mixer_ctl *dl1_headset;
+@@ -631,36 +478,27 @@ struct mixer_ctls
+ struct mixer_ctl *earpiece_volume;
+ };
+
+-enum output_type {
+- OUTPUT_DEEP_BUF, // deep PCM buffers output stream
+- OUTPUT_LOW_LATENCY, // low latency output stream
+- OUTPUT_HDMI,
+- OUTPUT_TOTAL
+-};
+-
+-
+ struct tuna_audio_device {
+ struct audio_hw_device hw_device;
+
+ pthread_mutex_t lock; /* see note below on mutex acquisition order */
+ struct mixer *mixer;
+ struct mixer_ctls mixer_ctls;
+- audio_mode_t mode;
+- int out_device;
+- int in_device;
++ int mode;
++ int devices;
+ struct pcm *pcm_modem_dl;
+ struct pcm *pcm_modem_ul;
+ int in_call;
+ float voice_volume;
+ struct tuna_stream_in *active_input;
+- struct tuna_stream_out *outputs[OUTPUT_TOTAL];
++ struct tuna_stream_out *active_output;
+ bool mic_mute;
+ int tty_mode;
+ struct echo_reference_itfe *echo_reference;
+ bool bluetooth_nrec;
+ bool device_is_toro;
+ int wb_amr;
+- bool screen_off;
++ bool low_power;
+
+ /* RIL */
+ struct ril_handle ril;
+@@ -681,36 +519,15 @@ struct tuna_stream_out {
+ struct pcm *pcm[PCM_TOTAL];
+ struct resampler_itfe *resampler;
+ char *buffer;
+- size_t buffer_frames;
+ int standby;
+ struct echo_reference_itfe *echo_reference;
+- int write_threshold;
+- bool use_long_periods;
+- audio_channel_mask_t channel_mask;
+- audio_channel_mask_t sup_channel_masks[3];
+-
+- /* FIXME: workaround for HDMI multi channel channel swap on first playback after opening
+- * the output stream: force reopening the pcm driver after writing a few periods. */
+- int restart_periods_cnt;
+-
+ struct tuna_audio_device *dev;
++ int write_threshold;
++ bool low_power;
+ };
+
+ #define MAX_PREPROCESSORS 3 /* maximum one AGC + one NS + one AEC per input stream */
+
+-struct effect_info_s {
+- effect_handle_t effect_itfe;
+- size_t num_channel_configs;
+- channel_config_t* channel_configs;
+-};
+-
+-#define NUM_IN_AUX_CNL_CONFIGS 2
+-channel_config_t in_aux_cnl_configs[NUM_IN_AUX_CNL_CONFIGS] = {
+- { AUDIO_CHANNEL_IN_FRONT , AUDIO_CHANNEL_IN_BACK},
+- { AUDIO_CHANNEL_IN_STEREO , AUDIO_CHANNEL_IN_RIGHT}
+-};
+-
+-
+ struct tuna_stream_in {
+ struct audio_stream_in stream;
+
+@@ -720,51 +537,26 @@ struct tuna_stream_in {
+ int device;
+ struct resampler_itfe *resampler;
+ struct resampler_buffer_provider buf_provider;
++ int16_t *buffer;
++ size_t frames_in;
+ unsigned int requested_rate;
+ int standby;
+ int source;
+ struct echo_reference_itfe *echo_reference;
+ bool need_echo_reference;
+-
+- int16_t *read_buf;
+- size_t read_buf_size;
+- size_t read_buf_frames;
+-
+- int16_t *proc_buf_in;
+- int16_t *proc_buf_out;
++ effect_handle_t preprocessors[MAX_PREPROCESSORS];
++ int num_preprocessors;
++ int16_t *proc_buf;
+ size_t proc_buf_size;
+- size_t proc_buf_frames;
+-
++ size_t proc_frames_in;
+ int16_t *ref_buf;
+ size_t ref_buf_size;
+- size_t ref_buf_frames;
+-
++ size_t ref_frames_in;
+ int read_status;
+
+- int num_preprocessors;
+- struct effect_info_s preprocessors[MAX_PREPROCESSORS];
+-
+- bool aux_channels_changed;
+- uint32_t main_channels;
+- uint32_t aux_channels;
+ struct tuna_audio_device *dev;
+ };
+
+-
+-#define STRING_TO_ENUM(string) { #string, string }
+-
+-struct string_to_enum {
+- const char *name;
+- uint32_t value;
+-};
+-
+-const struct string_to_enum out_channels_name_to_enum_table[] = {
+- STRING_TO_ENUM(AUDIO_CHANNEL_OUT_STEREO),
+- STRING_TO_ENUM(AUDIO_CHANNEL_OUT_5POINT1),
+- STRING_TO_ENUM(AUDIO_CHANNEL_OUT_7POINT1),
+-};
+-
+-
+ /**
+ * NOTE: when multiple mutexes have to be acquired, always respect the following order:
+ * hw device > in stream > out stream
+@@ -776,7 +568,6 @@ static void select_input_device(struct tuna_audio_device *adev);
+ static int adev_set_voice_volume(struct audio_hw_device *dev, float volume);
+ static int do_input_standby(struct tuna_stream_in *in);
+ static int do_output_standby(struct tuna_stream_out *out);
+-static void in_update_aux_channels(struct tuna_stream_in *in, effect_handle_t effect);
+
+ /* Returns true on devices that are toro, false otherwise */
+ static int is_device_toro(void)
+@@ -826,7 +617,7 @@ static int set_route_by_array(struct mixer *mixer, struct route_setting *route,
+
+ static int start_call(struct tuna_audio_device *adev)
+ {
+- ALOGE("Opening modem PCMs");
++ LOGE("Opening modem PCMs");
+
+ pcm_config_vx.rate = adev->wb_amr ? VX_WB_SAMPLING_RATE : VX_NB_SAMPLING_RATE;
+
+@@ -834,7 +625,7 @@ static int start_call(struct tuna_audio_device *adev)
+ if (adev->pcm_modem_dl == NULL) {
+ adev->pcm_modem_dl = pcm_open(0, PORT_MODEM, PCM_OUT, &pcm_config_vx);
+ if (!pcm_is_ready(adev->pcm_modem_dl)) {
+- ALOGE("cannot open PCM modem DL stream: %s", pcm_get_error(adev->pcm_modem_dl));
++ LOGE("cannot open PCM modem DL stream: %s", pcm_get_error(adev->pcm_modem_dl));
+ goto err_open_dl;
+ }
+ }
+@@ -842,7 +633,7 @@ static int start_call(struct tuna_audio_device *adev)
+ if (adev->pcm_modem_ul == NULL) {
+ adev->pcm_modem_ul = pcm_open(0, PORT_MODEM, PCM_IN, &pcm_config_vx);
+ if (!pcm_is_ready(adev->pcm_modem_ul)) {
+- ALOGE("cannot open PCM modem UL stream: %s", pcm_get_error(adev->pcm_modem_ul));
++ LOGE("cannot open PCM modem UL stream: %s", pcm_get_error(adev->pcm_modem_ul));
+ goto err_open_ul;
+ }
+ }
+@@ -864,7 +655,7 @@ err_open_dl:
+
+ static void end_call(struct tuna_audio_device *adev)
+ {
+- ALOGE("Closing modem PCMs");
++ LOGE("Closing modem PCMs");
+
+ pcm_stop(adev->pcm_modem_dl);
+ pcm_stop(adev->pcm_modem_ul);
+@@ -877,7 +668,7 @@ static void end_call(struct tuna_audio_device *adev)
+ static void set_eq_filter(struct tuna_audio_device *adev)
+ {
+ /* DL1_EQ can't be used for bt */
+- int dl1_eq_applicable = adev->out_device & (AUDIO_DEVICE_OUT_WIRED_HEADSET |
++ int dl1_eq_applicable = adev->devices & (AUDIO_DEVICE_OUT_WIRED_HEADSET |
+ AUDIO_DEVICE_OUT_WIRED_HEADPHONE | AUDIO_DEVICE_OUT_EARPIECE);
+
+ /* 4Khz LPF is used only in NB-AMR voicecall */
+@@ -910,7 +701,7 @@ static void set_incall_device(struct tuna_audio_device *adev)
+ {
+ int device_type;
+
+- switch(adev->out_device) {
++ switch(adev->devices & AUDIO_DEVICE_OUT_ALL) {
+ case AUDIO_DEVICE_OUT_EARPIECE:
+ device_type = SOUND_AUDIO_PATH_HANDSET;
+ break;
+@@ -950,7 +741,7 @@ static void set_input_volumes(struct tuna_audio_device *adev, int main_mic_on,
+
+ if (adev->mode == AUDIO_MODE_IN_CALL) {
+ int sub_mic_volume = is_device_toro() ? VOICE_CALL_SUB_MIC_VOLUME_TORO :
+- VOICE_CALL_SUB_MIC_VOLUME_MAGURO;
++ VOICE_CALL_SUB_MIC_VOLUME_MAGURO;
+ /* special case: don't look at input source for IN_CALL state */
+ volume = DB_TO_ABE_GAIN(main_mic_on ? VOICE_CALL_MAIN_MIC_VOLUME :
+ (headset_mic_on ? VOICE_CALL_HEADSET_MIC_VOLUME :
+@@ -999,21 +790,12 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume)
+ int headset_volume;
+ int earpiece_volume;
+ bool toro = adev->device_is_toro;
+- int headphone_on = adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
+- int speaker_on = adev->out_device & AUDIO_DEVICE_OUT_SPEAKER;
++ int headphone_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
++ int speaker_on = adev->devices & AUDIO_DEVICE_OUT_SPEAKER;
+ int speaker_volume_overrange = MIXER_ABE_GAIN_0DB;
+ int speaker_max_db =
+ DB_FROM_SPEAKER_VOLUME(mixer_ctl_get_range_max(adev->mixer_ctls.speaker_volume));
+- int normal_speaker_volume = toro ? NORMAL_SPEAKER_VOLUME_TORO :
+- NORMAL_SPEAKER_VOLUME_MAGURO;
+- int normal_headphone_volume = toro ? NORMAL_HEADPHONE_VOLUME_TORO :
+- NORMAL_HEADPHONE_VOLUME_MAGURO;
+- int normal_headset_volume = toro ? NORMAL_HEADSET_VOLUME_TORO :
+- NORMAL_HEADSET_VOLUME_MAGURO;
+- int normal_earpiece_volume = toro ? NORMAL_EARPIECE_VOLUME_TORO :
+- NORMAL_EARPIECE_VOLUME_MAGURO;
+- int dl1_volume_correction = 0;
+- int dl2_volume_correction = 0;
++ struct mixer_ctl *mixer_ctl_overrange = adev->mixer_ctls.mm_dl2_volume;
+
+ if (adev->mode == AUDIO_MODE_IN_CALL) {
+ /* Voice call */
+@@ -1023,6 +805,7 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume)
+ VOICE_CALL_HEADSET_VOLUME_MAGURO;
+ earpiece_volume = toro ? VOICE_CALL_EARPIECE_VOLUME_TORO :
+ VOICE_CALL_EARPIECE_VOLUME_MAGURO;
++ mixer_ctl_overrange = adev->mixer_ctls.vx_dl2_volume;
+ } else if (adev->mode == AUDIO_MODE_IN_COMMUNICATION) {
+ /* VoIP */
+ speaker_volume = toro ? VOIP_SPEAKER_VOLUME_TORO :
+@@ -1033,32 +816,22 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume)
+ VOIP_EARPIECE_VOLUME_MAGURO;
+ } else {
+ /* Media */
+- speaker_volume = normal_speaker_volume;
++ speaker_volume = toro ? NORMAL_SPEAKER_VOLUME_TORO :
++ NORMAL_SPEAKER_VOLUME_MAGURO;
+ if (headphone_on)
+- headset_volume = normal_headphone_volume;
++ headset_volume = toro ? NORMAL_HEADPHONE_VOLUME_TORO :
++ NORMAL_HEADPHONE_VOLUME_MAGURO;
+ else
+- headset_volume = normal_headset_volume;
+- earpiece_volume = normal_earpiece_volume;
++ headset_volume = toro ? NORMAL_HEADSET_VOLUME_TORO :
++ NORMAL_HEADSET_VOLUME_MAGURO;
++ earpiece_volume = toro ? NORMAL_EARPIECE_VOLUME_TORO :
++ NORMAL_EARPIECE_VOLUME_MAGURO;
+ }
+-
+ if (tty_volume)
+ headset_volume = HEADPHONE_VOLUME_TTY;
+ else if (adev->mode == AUDIO_MODE_RINGTONE)
+ headset_volume += RINGTONE_HEADSET_VOLUME_OFFSET;
+
+- /* apply correction on digital volume to keep the overall volume consistent if the
+- * analog volume is not driven by media use case
+- */
+- if (headphone_on)
+- dl1_volume_correction = normal_headphone_volume - headset_volume;
+- else if (adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET)
+- dl1_volume_correction = normal_headset_volume - headset_volume;
+- else
+- dl1_volume_correction = normal_earpiece_volume - earpiece_volume;
+-
+- if (speaker_on)
+- dl2_volume_correction = normal_speaker_volume - speaker_volume;
+-
+ /* If we have run out of range in the codec (analog) speaker volume,
+ we have to apply the remainder of the dB increase to the DL2
+ media/voice mixer volume, which is a digital gain */
+@@ -1073,35 +846,10 @@ static void set_output_volumes(struct tuna_audio_device *adev, bool tty_volume)
+ mixer_ctl_set_value(adev->mixer_ctls.headset_volume, channel,
+ DB_TO_HEADSET_VOLUME(headset_volume));
+ }
+-
+- if (!speaker_on)
+- speaker_volume_overrange = MIXER_ABE_GAIN_0DB;
+-
+- if (adev->mode == AUDIO_MODE_IN_CALL) {
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl1_volume, 0,
+- MIXER_ABE_GAIN_0DB + dl1_volume_correction);
+- mixer_ctl_set_value(adev->mixer_ctls.vx_dl2_volume, 0,
+- speaker_volume_overrange);
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl2_volume, 0,
+- speaker_volume_overrange + dl2_volume_correction);
+- } else if ((adev->mode == AUDIO_MODE_IN_COMMUNICATION) ||
+- (adev->mode == AUDIO_MODE_RINGTONE)) {
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl1_volume, 0,
+- MIXER_ABE_GAIN_0DB);
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl2_volume, 0,
+- speaker_volume_overrange);
+- } else {
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl1_volume, 0,
+- MIXER_ABE_GAIN_0DB + dl1_volume_correction);
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl2_volume, 0,
+- speaker_volume_overrange + dl2_volume_correction);
+- }
+-
+- mixer_ctl_set_value(adev->mixer_ctls.mm_dl1_volume, 0,
+- MIXER_ABE_GAIN_0DB + dl1_volume_correction);
+- mixer_ctl_set_value(adev->mixer_ctls.mm_dl2_volume, 0,
+- speaker_volume_overrange + dl2_volume_correction);
+-
++ if (speaker_on)
++ mixer_ctl_set_value(mixer_ctl_overrange, 0, speaker_volume_overrange);
++ else
++ mixer_ctl_set_value(mixer_ctl_overrange, 0, MIXER_ABE_GAIN_0DB);
+ mixer_ctl_set_value(adev->mixer_ctls.earpiece_volume, 0,
+ DB_TO_EARPIECE_VOLUME(earpiece_volume));
+ }
+@@ -1111,11 +859,8 @@ static void force_all_standby(struct tuna_audio_device *adev)
+ struct tuna_stream_in *in;
+ struct tuna_stream_out *out;
+
+- /* only needed for low latency output streams as other streams are not used
+- * for voice use cases */
+- if (adev->outputs[OUTPUT_LOW_LATENCY] != NULL &&
+- !adev->outputs[OUTPUT_LOW_LATENCY]->standby) {
+- out = adev->outputs[OUTPUT_LOW_LATENCY];
++ if (adev->active_output) {
++ out = adev->active_output;
+ pthread_mutex_lock(&out->lock);
+ do_output_standby(out);
+ pthread_mutex_unlock(&out->lock);
+@@ -1132,7 +877,7 @@ static void force_all_standby(struct tuna_audio_device *adev)
+ static void select_mode(struct tuna_audio_device *adev)
+ {
+ if (adev->mode == AUDIO_MODE_IN_CALL) {
+- ALOGE("Entering IN_CALL state, in_call=%d", adev->in_call);
++ LOGE("Entering IN_CALL state, in_call=%d", adev->in_call);
+ if (!adev->in_call) {
+ force_all_standby(adev);
+ /* force earpiece route for in call state if speaker is the
+@@ -1141,22 +886,23 @@ static void select_mode(struct tuna_audio_device *adev)
+ after the ringtone is played, but doesn't cause a route
+ change if a headset or bt device is already connected. If
+ speaker is not the only thing active, just remove it from
+- the route. We'll assume it'll never be used initially during
++ the route. We'll assume it'll never be used initally during
+ a call. This works because we're sure that the audio policy
+ manager will update the output device after the audio mode
+ change, even if the device selection did not change. */
+- if (adev->out_device == AUDIO_DEVICE_OUT_SPEAKER) {
+- adev->out_device = AUDIO_DEVICE_OUT_EARPIECE;
+- adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN;
+- } else
+- adev->out_device &= ~AUDIO_DEVICE_OUT_SPEAKER;
++ if ((adev->devices & AUDIO_DEVICE_OUT_ALL) == AUDIO_DEVICE_OUT_SPEAKER)
++ adev->devices = AUDIO_DEVICE_OUT_EARPIECE |
++ AUDIO_DEVICE_IN_BUILTIN_MIC;
++ else
++ adev->devices &= ~AUDIO_DEVICE_OUT_SPEAKER;
+ select_output_device(adev);
+ start_call(adev);
+- ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, adev->voice_volume);
++ ril_set_call_clock_sync(&adev->ril, SOUND_CLOCK_START);
++ adev_set_voice_volume(&adev->hw_device, adev->voice_volume);
+ adev->in_call = 1;
+ }
+ } else {
+- ALOGE("Leaving IN_CALL state, in_call=%d, mode=%d",
++ LOGE("Leaving IN_CALL state, in_call=%d, mode=%d",
+ adev->in_call, adev->mode);
+ if (adev->in_call) {
+ adev->in_call = 0;
+@@ -1189,11 +935,11 @@ static void select_output_device(struct tuna_audio_device *adev)
+ channel, 0);
+ }
+
+- headset_on = adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET;
+- headphone_on = adev->out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
+- speaker_on = adev->out_device & AUDIO_DEVICE_OUT_SPEAKER;
+- earpiece_on = adev->out_device & AUDIO_DEVICE_OUT_EARPIECE;
+- bt_on = adev->out_device & AUDIO_DEVICE_OUT_ALL_SCO;
++ headset_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET;
++ headphone_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
++ speaker_on = adev->devices & AUDIO_DEVICE_OUT_SPEAKER;
++ earpiece_on = adev->devices & AUDIO_DEVICE_OUT_EARPIECE;
++ bt_on = adev->devices & AUDIO_DEVICE_OUT_ALL_SCO;
+
+ /* force rx path according to TTY mode when in call */
+ if (adev->mode == AUDIO_MODE_IN_CALL && !bt_on) {
+@@ -1218,7 +964,7 @@ static void select_output_device(struct tuna_audio_device *adev)
+ default:
+ /* force speaker on when in call and HDMI or S/PDIF is selected
+ * as voice DL audio cannot be routed there by ABE */
+- if (adev->out_device &
++ if (adev->devices &
+ (AUDIO_DEVICE_OUT_AUX_DIGITAL |
+ AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET))
+ speaker_on = 1;
+@@ -1230,11 +976,9 @@ static void select_output_device(struct tuna_audio_device *adev)
+
+ /* Select front end */
+ mixer_ctl_set_value(adev->mixer_ctls.mm_dl2, 0, speaker_on);
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl2, 0, speaker_on);
+ mixer_ctl_set_value(adev->mixer_ctls.vx_dl2, 0,
+ speaker_on && (adev->mode == AUDIO_MODE_IN_CALL));
+ mixer_ctl_set_value(adev->mixer_ctls.mm_dl1, 0, dl1_on);
+- mixer_ctl_set_value(adev->mixer_ctls.tones_dl1, 0, dl1_on);
+ mixer_ctl_set_value(adev->mixer_ctls.vx_dl1, 0,
+ dl1_on && (adev->mode == AUDIO_MODE_IN_CALL));
+ /* Select back end */
+@@ -1318,18 +1062,18 @@ static void select_input_device(struct tuna_audio_device *adev)
+ int headset_on = 0;
+ int main_mic_on = 0;
+ int sub_mic_on = 0;
+- int bt_on = adev->in_device & AUDIO_DEVICE_IN_ALL_SCO;
++ int bt_on = adev->devices & AUDIO_DEVICE_IN_ALL_SCO;
+
+ if (!bt_on) {
+ if ((adev->mode != AUDIO_MODE_IN_CALL) && (adev->active_input != 0)) {
+ /* sub mic is used for camcorder or VoIP on speaker phone */
+ sub_mic_on = (adev->active_input->source == AUDIO_SOURCE_CAMCORDER) ||
+- ((adev->out_device & AUDIO_DEVICE_OUT_SPEAKER) &&
++ ((adev->devices & AUDIO_DEVICE_OUT_SPEAKER) &&
+ (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION));
+ }
+ if (!sub_mic_on) {
+- headset_on = adev->in_device & AUDIO_DEVICE_IN_WIRED_HEADSET;
+- main_mic_on = adev->in_device & AUDIO_DEVICE_IN_BUILTIN_MIC;
++ headset_on = adev->devices & AUDIO_DEVICE_IN_WIRED_HEADSET;
++ main_mic_on = adev->devices & AUDIO_DEVICE_IN_BUILTIN_MIC;
+ }
+ }
+
+@@ -1340,32 +1084,12 @@ static void select_input_device(struct tuna_audio_device *adev)
+ set_route_by_array(adev->mixer, mm_ul2_bt, 1);
+ else {
+ /* Select front end */
+-
+-
+- if ((adev->active_input != 0) && (adev->active_input->aux_channels)) {
+- ALOGV("select input device(): multi-mic configuration main mic %s sub mic %s",
+- main_mic_on ? "ON" : "OFF", sub_mic_on ? "ON" : "OFF");
+- if (main_mic_on) {
+- set_route_by_array(adev->mixer, mm_ul2_amic_dual_main_sub, 1);
+- sub_mic_on = 1;
+- }
+- else if (sub_mic_on) {
+- set_route_by_array(adev->mixer, mm_ul2_amic_dual_sub_main, 1);
+- main_mic_on = 1;
+- }
+- else {
+- set_route_by_array(adev->mixer, mm_ul2_amic_dual_main_sub, 0);
+- }
+- } else {
+- ALOGV("select input device(): single mic configuration");
+- if (main_mic_on || headset_on)
+- set_route_by_array(adev->mixer, mm_ul2_amic_left, 1);
+- else if (sub_mic_on)
+- set_route_by_array(adev->mixer, mm_ul2_amic_right, 1);
+- else
+- set_route_by_array(adev->mixer, mm_ul2_amic_left, 0);
+- }
+-
++ if (main_mic_on || headset_on)
++ set_route_by_array(adev->mixer, mm_ul2_amic_left, 1);
++ else if (sub_mic_on)
++ set_route_by_array(adev->mixer, mm_ul2_amic_right, 1);
++ else
++ set_route_by_array(adev->mixer, mm_ul2_amic_left, 0);
+
+ /* Select back end */
+ mixer_ctl_set_enum_by_string(adev->mixer_ctls.right_capture,
+@@ -1379,55 +1103,52 @@ static void select_input_device(struct tuna_audio_device *adev)
+ }
+
+ /* must be called with hw device and output stream mutexes locked */
+-static int start_output_stream_low_latency(struct tuna_stream_out *out)
++static int start_output_stream(struct tuna_stream_out *out)
+ {
+ struct tuna_audio_device *adev = out->dev;
+-#ifdef PLAYBACK_MMAP
+ unsigned int flags = PCM_OUT | PCM_MMAP | PCM_NOIRQ;
+-#else
+- unsigned int flags = PCM_OUT;
+-#endif
+ int i;
+ bool success = true;
+
++ adev->active_output = out;
++
+ if (adev->mode != AUDIO_MODE_IN_CALL) {
++ /* FIXME: only works if only one output can be active at a time */
+ select_output_device(adev);
+ }
+
+ /* default to low power: will be corrected in out_write if necessary before first write to
+ * tinyalsa.
+ */
++ out->write_threshold = PLAYBACK_LONG_PERIOD_COUNT * LONG_PERIOD_SIZE;
++ out->low_power = 1;
+
+- if (adev->out_device & ~(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET | AUDIO_DEVICE_OUT_AUX_DIGITAL)) {
++ if (adev->devices & (AUDIO_DEVICE_OUT_ALL &
++ ~(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET | AUDIO_DEVICE_OUT_AUX_DIGITAL))) {
+ /* Something not a dock in use */
+- out->config[PCM_NORMAL] = pcm_config_tones;
++ out->config[PCM_NORMAL] = pcm_config_mm;
+ out->config[PCM_NORMAL].rate = MM_FULL_POWER_SAMPLING_RATE;
+- out->pcm[PCM_NORMAL] = pcm_open(CARD_TUNA_DEFAULT, PORT_TONES,
+- flags, &out->config[PCM_NORMAL]);
++ out->pcm[PCM_NORMAL] = pcm_open(CARD_TUNA_DEFAULT, PORT_MM, flags, &out->config[PCM_NORMAL]);
+ }
+
+- if (adev->out_device & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) {
++ if (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) {
+ /* SPDIF output in use */
+- out->config[PCM_SPDIF] = pcm_config_tones;
++ out->config[PCM_SPDIF] = pcm_config_mm;
+ out->config[PCM_SPDIF].rate = MM_FULL_POWER_SAMPLING_RATE;
+- out->pcm[PCM_SPDIF] = pcm_open(CARD_TUNA_DEFAULT, PORT_SPDIF,
+- flags, &out->config[PCM_SPDIF]);
++ out->pcm[PCM_SPDIF] = pcm_open(CARD_TUNA_DEFAULT, PORT_SPDIF, flags, &out->config[PCM_SPDIF]);
+ }
+
+- /* priority is given to multichannel HDMI output */
+- if ((adev->out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL) &&
+- (adev->outputs[OUTPUT_HDMI] == NULL || adev->outputs[OUTPUT_HDMI]->standby)) {
++ if(adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) {
+ /* HDMI output in use */
+- out->config[PCM_HDMI] = pcm_config_tones;
++ out->config[PCM_HDMI] = pcm_config_mm;
+ out->config[PCM_HDMI].rate = MM_LOW_POWER_SAMPLING_RATE;
+- out->pcm[PCM_HDMI] = pcm_open(CARD_OMAP4_HDMI, PORT_HDMI,
+- flags, &out->config[PCM_HDMI]);
++ out->pcm[PCM_HDMI] = pcm_open(CARD_OMAP4_HDMI, PORT_HDMI, flags, &out->config[PCM_HDMI]);
+ }
+
+ /* Close any PCMs that could not be opened properly and return an error */
+ for (i = 0; i < PCM_TOTAL; i++) {
+ if (out->pcm[i] && !pcm_is_ready(out->pcm[i])) {
+- ALOGE("cannot open pcm_out driver %d: %s", i, pcm_get_error(out->pcm[i]));
++ LOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm[i]));
+ pcm_close(out->pcm[i]);
+ out->pcm[i] = NULL;
+ success = false;
+@@ -1435,10 +1156,6 @@ static int start_output_stream_low_latency(struct tuna_stream_out *out)
+ }
+
+ if (success) {
+- out->buffer_frames = pcm_config_tones.period_size * 2;
+- if (out->buffer == NULL)
+- out->buffer = malloc(out->buffer_frames * audio_stream_frame_size(&out->stream.common));
+-
+ if (adev->echo_reference != NULL)
+ out->echo_reference = adev->echo_reference;
+ out->resampler->reset(out->resampler);
+@@ -1446,63 +1163,11 @@ static int start_output_stream_low_latency(struct tuna_stream_out *out)
+ return 0;
+ }
+
++ adev->active_output = NULL;
+ return -ENOMEM;
+ }
+
+-/* must be called with hw device and output stream mutexes locked */
+-static int start_output_stream_deep_buffer(struct tuna_stream_out *out)
+-{
+- struct tuna_audio_device *adev = out->dev;
+-
+- if (adev->mode != AUDIO_MODE_IN_CALL) {
+- select_output_device(adev);
+- }
+-
+- out->write_threshold = PLAYBACK_DEEP_BUFFER_LONG_PERIOD_COUNT * DEEP_BUFFER_LONG_PERIOD_SIZE;
+- out->use_long_periods = true;
+-
+- out->config[PCM_NORMAL] = pcm_config_mm;
+- out->config[PCM_NORMAL].rate = MM_FULL_POWER_SAMPLING_RATE;
+- out->pcm[PCM_NORMAL] = pcm_open(CARD_TUNA_DEFAULT, PORT_MM,
+- PCM_OUT | PCM_MMAP | PCM_NOIRQ, &out->config[PCM_NORMAL]);
+- if (out->pcm[PCM_NORMAL] && !pcm_is_ready(out->pcm[PCM_NORMAL])) {
+- ALOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm[PCM_NORMAL]));
+- pcm_close(out->pcm[PCM_NORMAL]);
+- out->pcm[PCM_NORMAL] = NULL;
+- return -ENOMEM;
+- }
+- out->buffer_frames = DEEP_BUFFER_SHORT_PERIOD_SIZE * 2;
+- if (out->buffer == NULL)
+- out->buffer = malloc(out->buffer_frames * audio_stream_frame_size(&out->stream.common));
+-
+- return 0;
+-}
+-
+-static int start_output_stream_hdmi(struct tuna_stream_out *out)
+-{
+- struct tuna_audio_device *adev = out->dev;
+-
+- /* force standby on low latency output stream to close HDMI driver in case it was in use */
+- if (adev->outputs[OUTPUT_LOW_LATENCY] != NULL &&
+- !adev->outputs[OUTPUT_LOW_LATENCY]->standby) {
+- struct tuna_stream_out *ll_out = adev->outputs[OUTPUT_LOW_LATENCY];
+- pthread_mutex_lock(&ll_out->lock);
+- do_output_standby(ll_out);
+- pthread_mutex_unlock(&ll_out->lock);
+- }
+-
+- out->pcm[PCM_HDMI] = pcm_open(CARD_OMAP4_HDMI, PORT_HDMI, PCM_OUT, &out->config[PCM_HDMI]);
+-
+- if (out->pcm[PCM_HDMI] && !pcm_is_ready(out->pcm[PCM_HDMI])) {
+- ALOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm[PCM_HDMI]));
+- pcm_close(out->pcm[PCM_HDMI]);
+- out->pcm[PCM_HDMI] = NULL;
+- return -ENOMEM;
+- }
+- return 0;
+-}
+-
+-static int check_input_parameters(uint32_t sample_rate, audio_format_t format, int channel_count)
++static int check_input_parameters(uint32_t sample_rate, int format, int channel_count)
+ {
+ if (format != AUDIO_FORMAT_PCM_16_BIT)
+ return -EINVAL;
+@@ -1527,7 +1192,7 @@ static int check_input_parameters(uint32_t sample_rate, audio_format_t format, i
+ return 0;
+ }
+
+-static size_t get_input_buffer_size(uint32_t sample_rate, audio_format_t format, int channel_count)
++static size_t get_input_buffer_size(uint32_t sample_rate, int format, int channel_count)
+ {
+ size_t size;
+ size_t device_rate;
+@@ -1569,11 +1234,8 @@ static void put_echo_reference(struct tuna_audio_device *adev,
+ {
+ if (adev->echo_reference != NULL &&
+ reference == adev->echo_reference) {
+- /* echo reference is taken from the low latency output stream used
+- * for voice use cases */
+- if (adev->outputs[OUTPUT_LOW_LATENCY] != NULL &&
+- !adev->outputs[OUTPUT_LOW_LATENCY]->standby)
+- remove_echo_reference(adev->outputs[OUTPUT_LOW_LATENCY], reference);
++ if (adev->active_output != NULL)
++ remove_echo_reference(adev->active_output, reference);
+ release_echo_reference(reference);
+ adev->echo_reference = NULL;
+ }
+@@ -1585,12 +1247,8 @@ static struct echo_reference_itfe *get_echo_reference(struct tuna_audio_device *
+ uint32_t sampling_rate)
+ {
+ put_echo_reference(adev, adev->echo_reference);
+- /* echo reference is taken from the low latency output stream used
+- * for voice use cases */
+- if (adev->outputs[OUTPUT_LOW_LATENCY] != NULL &&
+- !adev->outputs[OUTPUT_LOW_LATENCY]->standby) {
+- struct audio_stream *stream =
+- &adev->outputs[OUTPUT_LOW_LATENCY]->stream.common;
++ if (adev->active_output != NULL) {
++ struct audio_stream *stream = &adev->active_output->stream.common;
+ uint32_t wr_channel_count = popcount(stream->get_channels(stream));
+ uint32_t wr_sampling_rate = stream->get_sample_rate(stream);
+
+@@ -1602,8 +1260,7 @@ static struct echo_reference_itfe *get_echo_reference(struct tuna_audio_device *
+ wr_sampling_rate,
+ &adev->echo_reference);
+ if (status == 0)
+- add_echo_reference(adev->outputs[OUTPUT_LOW_LATENCY],
+- adev->echo_reference);
++ add_echo_reference(adev->active_output, adev->echo_reference);
+ }
+ return adev->echo_reference;
+ }
+@@ -1625,7 +1282,7 @@ static int get_playback_delay(struct tuna_stream_out *out,
+ buffer->time_stamp.tv_sec = 0;
+ buffer->time_stamp.tv_nsec = 0;
+ buffer->delay_ns = 0;
+- ALOGV("get_playback_delay(): pcm_get_htimestamp error,"
++ LOGV("get_playback_delay(): pcm_get_htimestamp error,"
+ "setting playbackTimestamp to 0");
+ return status;
+ }
+@@ -1646,32 +1303,12 @@ static uint32_t out_get_sample_rate(const struct audio_stream *stream)
+ return DEFAULT_OUT_SAMPLING_RATE;
+ }
+
+-static uint32_t out_get_sample_rate_hdmi(const struct audio_stream *stream)
+-{
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+-
+- return out->config[PCM_HDMI].rate;
+-}
+-
+ static int out_set_sample_rate(struct audio_stream *stream, uint32_t rate)
+ {
+ return 0;
+ }
+
+-static size_t out_get_buffer_size_low_latency(const struct audio_stream *stream)
+-{
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+-
+- /* take resampling into account and return the closest majoring
+- multiple of 16 frames, as audioflinger expects audio buffers to
+- be a multiple of 16 frames. Note: we use the default rate here
+- from pcm_config_tones.rate. */
+- size_t size = (SHORT_PERIOD_SIZE * DEFAULT_OUT_SAMPLING_RATE) / pcm_config_tones.rate;
+- size = ((size + 15) / 16) * 16;
+- return size * audio_stream_frame_size((struct audio_stream *)stream);
+-}
+-
+-static size_t out_get_buffer_size_deep_buffer(const struct audio_stream *stream)
++static size_t out_get_buffer_size(const struct audio_stream *stream)
+ {
+ struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+
+@@ -1679,30 +1316,22 @@ static size_t out_get_buffer_size_deep_buffer(const struct audio_stream *stream)
+ multiple of 16 frames, as audioflinger expects audio buffers to
+ be a multiple of 16 frames. Note: we use the default rate here
+ from pcm_config_mm.rate. */
+- size_t size = (DEEP_BUFFER_SHORT_PERIOD_SIZE * DEFAULT_OUT_SAMPLING_RATE) /
+- pcm_config_mm.rate;
++ size_t size = (SHORT_PERIOD_SIZE * DEFAULT_OUT_SAMPLING_RATE) / pcm_config_mm.rate;
+ size = ((size + 15) / 16) * 16;
+ return size * audio_stream_frame_size((struct audio_stream *)stream);
+ }
+
+-static size_t out_get_buffer_size_hdmi(const struct audio_stream *stream)
++static uint32_t out_get_channels(const struct audio_stream *stream)
+ {
+- return HDMI_MULTI_PERIOD_SIZE * audio_stream_frame_size((struct audio_stream *)stream);
++ return AUDIO_CHANNEL_OUT_STEREO;
+ }
+
+-static audio_channel_mask_t out_get_channels(const struct audio_stream *stream)
+-{
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+-
+- return out->channel_mask;
+-}
+-
+-static audio_format_t out_get_format(const struct audio_stream *stream)
++static int out_get_format(const struct audio_stream *stream)
+ {
+ return AUDIO_FORMAT_PCM_16_BIT;
+ }
+
+-static int out_set_format(struct audio_stream *stream, audio_format_t format)
++static int out_set_format(struct audio_stream *stream, int format)
+ {
+ return 0;
+ }
+@@ -1712,11 +1341,8 @@ static int do_output_standby(struct tuna_stream_out *out)
+ {
+ struct tuna_audio_device *adev = out->dev;
+ int i;
+- bool all_outputs_in_standby = true;
+
+ if (!out->standby) {
+- out->standby = 1;
+-
+ for (i = 0; i < PCM_TOTAL; i++) {
+ if (out->pcm[i]) {
+ pcm_close(out->pcm[i]);
+@@ -1724,36 +1350,23 @@ static int do_output_standby(struct tuna_stream_out *out)
+ }
+ }
+
+- for (i = 0; i < OUTPUT_TOTAL; i++) {
+- if (adev->outputs[i] != NULL && !adev->outputs[i]->standby) {
+- all_outputs_in_standby = false;
+- break;
+- }
+- }
++ adev->active_output = 0;
++
+ /* if in call, don't turn off the output stage. This will
+ be done when the call is ended */
+- if (all_outputs_in_standby && adev->mode != AUDIO_MODE_IN_CALL) {
++ if (adev->mode != AUDIO_MODE_IN_CALL) {
++ /* FIXME: only works if only one output can be active at a time */
+ set_route_by_array(adev->mixer, hs_output, 0);
+ set_route_by_array(adev->mixer, hf_output, 0);
+ }
+
+- /* force standby on low latency output stream so that it can reuse HDMI driver if
+- * necessary when restarted */
+- if (out == adev->outputs[OUTPUT_HDMI]) {
+- if (adev->outputs[OUTPUT_LOW_LATENCY] != NULL &&
+- !adev->outputs[OUTPUT_LOW_LATENCY]->standby) {
+- struct tuna_stream_out *ll_out = adev->outputs[OUTPUT_LOW_LATENCY];
+- pthread_mutex_lock(&ll_out->lock);
+- do_output_standby(ll_out);
+- pthread_mutex_unlock(&ll_out->lock);
+- }
+- }
+-
+ /* stop writing to echo reference */
+ if (out->echo_reference != NULL) {
+ out->echo_reference->write(out->echo_reference, NULL);
+ out->echo_reference = NULL;
+ }
++
++ out->standby = 1;
+ }
+ return 0;
+ }
+@@ -1794,11 +1407,8 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
+ val = atoi(value);
+ pthread_mutex_lock(&adev->lock);
+ pthread_mutex_lock(&out->lock);
+- if ((adev->out_device != val) && (val != 0)) {
+- /* this is needed only when changing device on low latency output
+- * as other output streams are not used for voice use cases nor
+- * handle duplication to HDMI or SPDIF */
+- if (out == adev->outputs[OUTPUT_LOW_LATENCY] && !out->standby) {
++ if (((adev->devices & AUDIO_DEVICE_OUT_ALL) != val) && (val != 0)) {
++ if (out == adev->active_output) {
+ /* a change in output device may change the microphone selection */
+ if (adev->active_input &&
+ adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION) {
+@@ -1806,34 +1416,29 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
+ }
+ /* force standby if moving to/from HDMI/SPDIF or if the output
+ * device changes when in HDMI/SPDIF mode */
+- /* FIXME also force standby when in call as some audio path switches do not work
+- * while in call and an output stream is active (e.g BT SCO => earpiece) */
+
+ /* FIXME workaround for audio being dropped when switching path without forcing standby
+ * (several hundred ms of audio can be lost: e.g beginning of a ringtone. We must understand
+ * the root cause in audio HAL, driver or ABE.
+ if (((val & AUDIO_DEVICE_OUT_AUX_DIGITAL) ^
+- (adev->out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL)) ||
++ (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)) ||
+ ((val & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) ^
+- (adev->out_device & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) ||
+- (adev->out_device & (AUDIO_DEVICE_OUT_AUX_DIGITAL |
++ (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) ||
++ (adev->devices & (AUDIO_DEVICE_OUT_AUX_DIGITAL |
+ AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)))
+ */
+ if (((val & AUDIO_DEVICE_OUT_AUX_DIGITAL) ^
+- (adev->out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL)) ||
++ (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)) ||
+ ((val & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) ^
+- (adev->out_device & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) ||
+- (adev->out_device & (AUDIO_DEVICE_OUT_AUX_DIGITAL |
++ (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) ||
++ (adev->devices & (AUDIO_DEVICE_OUT_AUX_DIGITAL |
+ AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) ||
+- ((val & AUDIO_DEVICE_OUT_SPEAKER) ^
+- (adev->out_device & AUDIO_DEVICE_OUT_SPEAKER)) ||
+- (adev->mode == AUDIO_MODE_IN_CALL))
++ (val == AUDIO_DEVICE_OUT_SPEAKER))
+ do_output_standby(out);
+ }
+- if (out != adev->outputs[OUTPUT_HDMI]) {
+- adev->out_device = val;
+- select_output_device(adev);
+- }
++ adev->devices &= ~AUDIO_DEVICE_OUT_ALL;
++ adev->devices |= val;
++ select_output_device(adev);
+ }
+ pthread_mutex_unlock(&out->lock);
+ if (force_input_standby) {
+@@ -1851,65 +1456,15 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
+
+ static char * out_get_parameters(const struct audio_stream *stream, const char *keys)
+ {
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+-
+- struct str_parms *query = str_parms_create_str(keys);
+- char *str;
+- char value[256];
+- struct str_parms *reply = str_parms_create();
+- size_t i, j;
+- int ret;
+- bool first = true;
+-
+- ret = str_parms_get_str(query, AUDIO_PARAMETER_STREAM_SUP_CHANNELS, value, sizeof(value));
+- if (ret >= 0) {
+- value[0] = '\0';
+- i = 0;
+- while (out->sup_channel_masks[i] != 0) {
+- for (j = 0; j < ARRAY_SIZE(out_channels_name_to_enum_table); j++) {
+- if (out_channels_name_to_enum_table[j].value == out->sup_channel_masks[i]) {
+- if (!first) {
+- strcat(value, "|");
+- }
+- strcat(value, out_channels_name_to_enum_table[j].name);
+- first = false;
+- break;
+- }
+- }
+- i++;
+- }
+- str_parms_add_str(reply, AUDIO_PARAMETER_STREAM_SUP_CHANNELS, value);
+- str = str_parms_to_str(reply);
+- } else {
+- str = strdup(keys);
+- }
+- str_parms_destroy(query);
+- str_parms_destroy(reply);
+- return str;
+-}
+-
+-static uint32_t out_get_latency_low_latency(const struct audio_stream_out *stream)
+-{
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+-
+- /* Note: we use the default rate here from pcm_config_mm.rate */
+- return (SHORT_PERIOD_SIZE * PLAYBACK_SHORT_PERIOD_COUNT * 1000) / pcm_config_tones.rate;
++ return strdup("");
+ }
+
+-static uint32_t out_get_latency_deep_buffer(const struct audio_stream_out *stream)
++static uint32_t out_get_latency(const struct audio_stream_out *stream)
+ {
+ struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+
+ /* Note: we use the default rate here from pcm_config_mm.rate */
+- return (DEEP_BUFFER_LONG_PERIOD_SIZE * PLAYBACK_DEEP_BUFFER_LONG_PERIOD_COUNT * 1000) /
+- pcm_config_mm.rate;
+-}
+-
+-static uint32_t out_get_latency_hdmi(const struct audio_stream_out *stream)
+-{
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+-
+- return (HDMI_MULTI_PERIOD_SIZE * HDMI_MULTI_PERIOD_COUNT * 1000) / out->config[PCM_HDMI].rate;
++ return (SHORT_PERIOD_SIZE * PLAYBACK_SHORT_PERIOD_COUNT * 1000) / pcm_config_mm.rate;
+ }
+
+ static int out_set_volume(struct audio_stream_out *stream, float left,
+@@ -1918,7 +1473,7 @@ static int out_set_volume(struct audio_stream_out *stream, float left,
+ return -ENOSYS;
+ }
+
+-static ssize_t out_write_low_latency(struct audio_stream_out *stream, const void* buffer,
++static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
+ size_t bytes)
+ {
+ int ret;
+@@ -1926,10 +1481,17 @@ static ssize_t out_write_low_latency(struct audio_stream_out *stream, const void
+ struct tuna_audio_device *adev = out->dev;
+ size_t frame_size = audio_stream_frame_size(&out->stream.common);
+ size_t in_frames = bytes / frame_size;
+- size_t out_frames = in_frames;
++ size_t out_frames = RESAMPLER_BUFFER_SIZE / frame_size;
+ bool force_input_standby = false;
+ struct tuna_stream_in *in;
++ bool low_power;
++ int kernel_frames;
++ void *buf;
++ /* If we're in out_write, we will find at least one pcm active */
++ int primary_pcm = -1;
+ int i;
++ bool use_resampler = false;
++ int period_size = 0;
+
+ /* acquiring hw device mutex systematically is useful if a low priority thread is waiting
+ * on the output stream mutex - e.g. executing select_mode() while holding the hw device
+@@ -1938,7 +1500,7 @@ static ssize_t out_write_low_latency(struct audio_stream_out *stream, const void
+ pthread_mutex_lock(&adev->lock);
+ pthread_mutex_lock(&out->lock);
+ if (out->standby) {
+- ret = start_output_stream_low_latency(out);
++ ret = start_output_stream(out);
+ if (ret != 0) {
+ pthread_mutex_unlock(&adev->lock);
+ goto exit;
+@@ -1949,135 +1511,61 @@ static ssize_t out_write_low_latency(struct audio_stream_out *stream, const void
+ adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION)
+ force_input_standby = true;
+ }
++ low_power = adev->low_power && !adev->active_input;
+ pthread_mutex_unlock(&adev->lock);
+
+- for (i = 0; i < PCM_TOTAL; i++) {
+- /* only use resampler if required */
+- if (out->pcm[i] && (out->config[i].rate != DEFAULT_OUT_SAMPLING_RATE)) {
+- out_frames = out->buffer_frames;
+- out->resampler->resample_from_input(out->resampler,
+- (int16_t *)buffer,
+- &in_frames,
+- (int16_t *)out->buffer,
+- &out_frames);
+- break;
+- }
+- }
+-
+- if (out->echo_reference != NULL) {
+- struct echo_reference_buffer b;
+- b.raw = (void *)buffer;
+- b.frame_count = in_frames;
++ if (low_power != out->low_power) {
++ if (low_power) {
++ out->write_threshold = LONG_PERIOD_SIZE * PLAYBACK_LONG_PERIOD_COUNT;
++ period_size = LONG_PERIOD_SIZE;
++ } else {
++ out->write_threshold = SHORT_PERIOD_SIZE * PLAYBACK_SHORT_PERIOD_COUNT;
++ period_size = SHORT_PERIOD_SIZE;
+
+- get_playback_delay(out, out_frames, &b);
+- out->echo_reference->write(out->echo_reference, &b);
++ }
++ out->low_power = low_power;
+ }
+
+- /* Write to all active PCMs */
+ for (i = 0; i < PCM_TOTAL; i++) {
+ if (out->pcm[i]) {
+- if (out->config[i].rate == DEFAULT_OUT_SAMPLING_RATE) {
+- /* PCM uses native sample rate */
+- ret = PCM_WRITE(out->pcm[i], (void *)buffer, bytes);
+- } else {
+- /* PCM needs resampler */
+- ret = PCM_WRITE(out->pcm[i], (void *)out->buffer, out_frames * frame_size);
+- }
+- if (ret)
+- break;
+- }
+- }
+-
+-exit:
+- pthread_mutex_unlock(&out->lock);
+-
+- if (ret != 0) {
+- usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) /
+- out_get_sample_rate(&stream->common));
+- }
+-
+- if (force_input_standby) {
+- pthread_mutex_lock(&adev->lock);
+- if (adev->active_input) {
+- in = adev->active_input;
+- pthread_mutex_lock(&in->lock);
+- do_input_standby(in);
+- pthread_mutex_unlock(&in->lock);
+- }
+- pthread_mutex_unlock(&adev->lock);
+- }
+-
+- return bytes;
+-}
+-
+-static ssize_t out_write_deep_buffer(struct audio_stream_out *stream, const void* buffer,
+- size_t bytes)
+-{
+- int ret;
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+- struct tuna_audio_device *adev = out->dev;
+- size_t frame_size = audio_stream_frame_size(&out->stream.common);
+- size_t in_frames = bytes / frame_size;
+- size_t out_frames;
+- bool use_long_periods;
+- int kernel_frames;
+- void *buf;
+-
+- /* acquiring hw device mutex systematically is useful if a low priority thread is waiting
+- * on the output stream mutex - e.g. executing select_mode() while holding the hw device
+- * mutex
+- */
+- pthread_mutex_lock(&adev->lock);
+- pthread_mutex_lock(&out->lock);
+- if (out->standby) {
+- ret = start_output_stream_deep_buffer(out);
+- if (ret != 0) {
+- pthread_mutex_unlock(&adev->lock);
+- goto exit;
+- }
+- out->standby = 0;
+- }
+- use_long_periods = adev->screen_off && !adev->active_input;
+- pthread_mutex_unlock(&adev->lock);
++ /* Make the first active PCM act as primary */
++ if (primary_pcm < 0)
++ primary_pcm = i;
+
+- if (use_long_periods != out->use_long_periods) {
+- size_t period_size;
+- size_t period_count;
++ if (period_size)
++ pcm_set_avail_min(out->pcm[i], period_size);
+
+- if (use_long_periods) {
+- period_size = DEEP_BUFFER_LONG_PERIOD_SIZE;
+- period_count = PLAYBACK_DEEP_BUFFER_LONG_PERIOD_COUNT;
+- } else {
+- period_size = DEEP_BUFFER_SHORT_PERIOD_SIZE;
+- period_count = PLAYBACK_DEEP_BUFFER_SHORT_PERIOD_COUNT;
++ if (out->config[i].rate != DEFAULT_OUT_SAMPLING_RATE)
++ use_resampler = true;
+ }
+- out->write_threshold = period_size * period_count;
+- pcm_set_avail_min(out->pcm[PCM_NORMAL], period_size);
+- out->use_long_periods = use_long_periods;
+ }
+
+ /* only use resampler if required */
+- if (out->config[PCM_NORMAL].rate != DEFAULT_OUT_SAMPLING_RATE) {
+- out_frames = out->buffer_frames;
++ if (use_resampler)
+ out->resampler->resample_from_input(out->resampler,
+ (int16_t *)buffer,
+ &in_frames,
+ (int16_t *)out->buffer,
+ &out_frames);
+- buf = (void *)out->buffer;
+- } else {
++ else
+ out_frames = in_frames;
+- buf = (void *)buffer;
++
++ if (out->echo_reference != NULL) {
++ struct echo_reference_buffer b;
++ b.raw = (void *)buffer;
++ b.frame_count = in_frames;
++
++ get_playback_delay(out, out_frames, &b);
++ out->echo_reference->write(out->echo_reference, &b);
+ }
+
+ /* do not allow more than out->write_threshold frames in kernel pcm driver buffer */
+ do {
+ struct timespec time_stamp;
+
+- if (pcm_get_htimestamp(out->pcm[PCM_NORMAL],
+- (unsigned int *)&kernel_frames, &time_stamp) < 0)
++ if (pcm_get_htimestamp(out->pcm[primary_pcm], (unsigned int *)&kernel_frames, &time_stamp) < 0)
+ break;
+- kernel_frames = pcm_get_buffer_size(out->pcm[PCM_NORMAL]) - kernel_frames;
++ kernel_frames = pcm_get_buffer_size(out->pcm[primary_pcm]) - kernel_frames;
+
+ if (kernel_frames > out->write_threshold) {
+ unsigned long time = (unsigned long)
+@@ -2089,7 +1577,20 @@ static ssize_t out_write_deep_buffer(struct audio_stream_out *stream, const void
+ }
+ } while (kernel_frames > out->write_threshold);
+
+- ret = pcm_mmap_write(out->pcm[PCM_NORMAL], buf, out_frames * frame_size);
++ /* Write to all active PCMs */
++ for (i = 0; i < PCM_TOTAL; i++) {
++ if (out->pcm[i]) {
++ if (out->config[i].rate == DEFAULT_OUT_SAMPLING_RATE) {
++ /* PCM uses native sample rate */
++ ret = pcm_mmap_write(out->pcm[i], (void *)buffer, bytes);
++ } else {
++ /* PCM needs resampler */
++ ret = pcm_mmap_write(out->pcm[i], (void *)out->buffer, out_frames * frame_size);
++ }
++ if (ret)
++ break;
++ }
++ }
+
+ exit:
+ pthread_mutex_unlock(&out->lock);
+@@ -2099,50 +1600,16 @@ exit:
+ out_get_sample_rate(&stream->common));
+ }
+
+- return bytes;
+-}
+-
+-static ssize_t out_write_hdmi(struct audio_stream_out *stream, const void* buffer,
+- size_t bytes)
+-{
+- int ret;
+- struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+- struct tuna_audio_device *adev = out->dev;
+- size_t frame_size = audio_stream_frame_size(&out->stream.common);
+- size_t in_frames = bytes / frame_size;
+-
+- /* acquiring hw device mutex systematically is useful if a low priority thread is waiting
+- * on the output stream mutex - e.g. executing select_mode() while holding the hw device
+- * mutex
+- */
+- pthread_mutex_lock(&adev->lock);
+- pthread_mutex_lock(&out->lock);
+- if (out->standby) {
+- ret = start_output_stream_hdmi(out);
+- if (ret != 0) {
+- pthread_mutex_unlock(&adev->lock);
+- goto exit;
++ if (force_input_standby) {
++ pthread_mutex_lock(&adev->lock);
++ if (adev->active_input) {
++ in = adev->active_input;
++ pthread_mutex_lock(&in->lock);
++ do_input_standby(in);
++ pthread_mutex_unlock(&in->lock);
+ }
+- out->standby = 0;
+- }
+- pthread_mutex_unlock(&adev->lock);
+-
+- ret = pcm_write(out->pcm[PCM_HDMI],
+- buffer,
+- pcm_frames_to_bytes(out->pcm[PCM_HDMI], in_frames));
+-
+-exit:
+- pthread_mutex_unlock(&out->lock);
+-
+- if (ret != 0) {
+- usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) /
+- out_get_sample_rate_hdmi(&stream->common));
++ pthread_mutex_unlock(&adev->lock);
+ }
+- /* FIXME: workaround for HDMI multi channel channel swap on first playback after opening
+- * the output stream: force reopening the pcm driver after writing a few periods. */
+- if ((out->restart_periods_cnt > 0) &&
+- (--out->restart_periods_cnt == 0))
+- out_standby(&stream->common);
+
+ return bytes;
+ }
+@@ -2174,54 +1641,30 @@ static int start_input_stream(struct tuna_stream_in *in)
+ adev->active_input = in;
+
+ if (adev->mode != AUDIO_MODE_IN_CALL) {
+- adev->in_device = in->device;
++ adev->devices &= ~AUDIO_DEVICE_IN_ALL;
++ adev->devices |= in->device;
+ select_input_device(adev);
+ }
+
+- if (in->aux_channels_changed)
+- {
+- in->aux_channels_changed = false;
+- in->config.channels = popcount(in->main_channels | in->aux_channels);
+-
+- if (in->resampler) {
+- /* release and recreate the resampler with the new number of channel of the input */
+- release_resampler(in->resampler);
+- in->resampler = NULL;
+- ret = create_resampler(in->config.rate,
+- in->requested_rate,
+- in->config.channels,
+- RESAMPLER_QUALITY_DEFAULT,
+- &in->buf_provider,
+- &in->resampler);
+- }
+- ALOGV("start_input_stream(): New channel configuration, "
+- "main_channels = [%04x], aux_channels = [%04x], config.channels = %d",
+- in->main_channels, in->aux_channels, in->config.channels);
+- }
+-
+ if (in->need_echo_reference && in->echo_reference == NULL)
+ in->echo_reference = get_echo_reference(adev,
+ AUDIO_FORMAT_PCM_16_BIT,
+- popcount(in->main_channels),
++ in->config.channels,
+ in->requested_rate);
+
+ /* this assumes routing is done previously */
+ in->pcm = pcm_open(0, PORT_MM2_UL, PCM_IN, &in->config);
+ if (!pcm_is_ready(in->pcm)) {
+- ALOGE("cannot open pcm_in driver: %s", pcm_get_error(in->pcm));
++ LOGE("cannot open pcm_in driver: %s", pcm_get_error(in->pcm));
+ pcm_close(in->pcm);
+ adev->active_input = NULL;
+ return -ENOMEM;
+ }
+
+- /* force read and proc buf reallocation case of frame size or channel count change */
+- in->read_buf_frames = 0;
+- in->read_buf_size = 0;
+- in->proc_buf_frames = 0;
+- in->proc_buf_size = 0;
+ /* if no supported sample rate is available, use the resampler */
+ if (in->resampler) {
+ in->resampler->reset(in->resampler);
++ in->frames_in = 0;
+ }
+ return 0;
+ }
+@@ -2244,22 +1687,26 @@ static size_t in_get_buffer_size(const struct audio_stream *stream)
+
+ return get_input_buffer_size(in->requested_rate,
+ AUDIO_FORMAT_PCM_16_BIT,
+- popcount(in->main_channels));
++ in->config.channels);
+ }
+
+-static audio_channel_mask_t in_get_channels(const struct audio_stream *stream)
++static uint32_t in_get_channels(const struct audio_stream *stream)
+ {
+ struct tuna_stream_in *in = (struct tuna_stream_in *)stream;
+
+- return in->main_channels;
++ if (in->config.channels == 1) {
++ return AUDIO_CHANNEL_IN_MONO;
++ } else {
++ return AUDIO_CHANNEL_IN_STEREO;
++ }
+ }
+
+-static audio_format_t in_get_format(const struct audio_stream *stream)
++static int in_get_format(const struct audio_stream *stream)
+ {
+ return AUDIO_FORMAT_PCM_16_BIT;
+ }
+
+-static int in_set_format(struct audio_stream *stream, audio_format_t format)
++static int in_set_format(struct audio_stream *stream, int format)
+ {
+ return 0;
+ }
+@@ -2275,7 +1722,7 @@ static int do_input_standby(struct tuna_stream_in *in)
+
+ adev->active_input = 0;
+ if (adev->mode != AUDIO_MODE_IN_CALL) {
+- adev->in_device = AUDIO_DEVICE_NONE;
++ adev->devices &= ~AUDIO_DEVICE_IN_ALL;
+ select_input_device(adev);
+ }
+
+@@ -2336,13 +1783,10 @@ static int in_set_parameters(struct audio_stream *stream, const char *kvpairs)
+
+ ret = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING, value, sizeof(value));
+ if (ret >= 0) {
+- val = atoi(value) & ~AUDIO_DEVICE_BIT_IN;
++ val = atoi(value);
+ if ((in->device != val) && (val != 0)) {
+ in->device = val;
+ do_standby = true;
+- /* make sure new device selection is incompatible with multi-mic pre processing
+- * configuration */
+- in_update_aux_channels(in, NULL);
+ }
+ }
+
+@@ -2383,19 +1827,15 @@ static void get_capture_delay(struct tuna_stream_in *in,
+ buffer->time_stamp.tv_sec = 0;
+ buffer->time_stamp.tv_nsec = 0;
+ buffer->delay_ns = 0;
+- ALOGW("read get_capture_delay(): pcm_htimestamp error");
++ LOGW("read get_capture_delay(): pcm_htimestamp error");
+ return;
+ }
+
+ /* read frames available in audio HAL input buffer
+ * add number of frames being read as we want the capture time of first sample
+ * in current buffer */
+- /* frames in in->buffer are at driver sampling rate while frames in in->proc_buf are
+- * at requested sampling rate */
+- buf_delay = (long)(((int64_t)(in->read_buf_frames) * 1000000000) / in->config.rate +
+- ((int64_t)(in->proc_buf_frames) * 1000000000) /
+- in->requested_rate);
+-
++ buf_delay = (long)(((int64_t)(in->frames_in + in->proc_frames_in) * 1000000000)
++ / in->config.rate);
+ /* add delay introduced by resampler */
+ rsmp_delay = 0;
+ if (in->resampler) {
+@@ -2408,12 +1848,12 @@ static void get_capture_delay(struct tuna_stream_in *in,
+
+ buffer->time_stamp = tstamp;
+ buffer->delay_ns = delay_ns;
+- ALOGV("get_capture_delay time_stamp = [%ld].[%ld], delay_ns: [%d],"
++ LOGV("get_capture_delay time_stamp = [%ld].[%ld], delay_ns: [%d],"
+ " kernel_delay:[%ld], buf_delay:[%ld], rsmp_delay:[%ld], kernel_frames:[%d], "
+- "in->read_buf_frames:[%d], in->proc_buf_frames:[%d], frames:[%d]",
++ "in->frames_in:[%d], in->proc_frames_in:[%d], frames:[%d]",
+ buffer->time_stamp.tv_sec , buffer->time_stamp.tv_nsec, buffer->delay_ns,
+ kernel_delay, buf_delay, rsmp_delay, kernel_frames,
+- in->read_buf_frames, in->proc_buf_frames, frames);
++ in->frames_in, in->proc_frames_in, frames);
+
+ }
+
+@@ -2422,32 +1862,31 @@ static int32_t update_echo_reference(struct tuna_stream_in *in, size_t frames)
+ struct echo_reference_buffer b;
+ b.delay_ns = 0;
+
+- ALOGV("update_echo_reference, frames = [%d], in->ref_buf_frames = [%d], "
++ LOGV("update_echo_reference, frames = [%d], in->ref_frames_in = [%d], "
+ "b.frame_count = [%d]",
+- frames, in->ref_buf_frames, frames - in->ref_buf_frames);
+- if (in->ref_buf_frames < frames) {
++ frames, in->ref_frames_in, frames - in->ref_frames_in);
++ if (in->ref_frames_in < frames) {
+ if (in->ref_buf_size < frames) {
+ in->ref_buf_size = frames;
+- in->ref_buf = (int16_t *)realloc(in->ref_buf, pcm_frames_to_bytes(in->pcm, frames));
+- ALOG_ASSERT((in->ref_buf != NULL),
+- "update_echo_reference() failed to reallocate ref_buf");
+- ALOGV("update_echo_reference(): ref_buf %p extended to %d bytes",
+- in->ref_buf, pcm_frames_to_bytes(in->pcm, frames));
++ in->ref_buf = (int16_t *)realloc(in->ref_buf,
++ in->ref_buf_size *
++ in->config.channels * sizeof(int16_t));
+ }
+- b.frame_count = frames - in->ref_buf_frames;
+- b.raw = (void *)(in->ref_buf + in->ref_buf_frames * in->config.channels);
++
++ b.frame_count = frames - in->ref_frames_in;
++ b.raw = (void *)(in->ref_buf + in->ref_frames_in * in->config.channels);
+
+ get_capture_delay(in, frames, &b);
+
+ if (in->echo_reference->read(in->echo_reference, &b) == 0)
+ {
+- in->ref_buf_frames += b.frame_count;
+- ALOGV("update_echo_reference(): in->ref_buf_frames:[%d], "
++ in->ref_frames_in += b.frame_count;
++ LOGV("update_echo_reference: in->ref_frames_in:[%d], "
+ "in->ref_buf_size:[%d], frames:[%d], b.frame_count:[%d]",
+- in->ref_buf_frames, in->ref_buf_size, frames, b.frame_count);
++ in->ref_frames_in, in->ref_buf_size, frames, b.frame_count);
+ }
+ } else
+- ALOGW("update_echo_reference(): NOT enough frames to read ref buffer");
++ LOGW("update_echo_reference: NOT enough frames to read ref buffer");
+ return b.delay_ns;
+ }
+
+@@ -2487,32 +1926,32 @@ static int set_preprocessor_echo_delay(effect_handle_t handle,
+ static void push_echo_reference(struct tuna_stream_in *in, size_t frames)
+ {
+ /* read frames from echo reference buffer and update echo delay
+- * in->ref_buf_frames is updated with frames available in in->ref_buf */
++ * in->ref_frames_in is updated with frames available in in->ref_buf */
+ int32_t delay_us = update_echo_reference(in, frames)/1000;
+ int i;
+ audio_buffer_t buf;
+
+- if (in->ref_buf_frames < frames)
+- frames = in->ref_buf_frames;
++ if (in->ref_frames_in < frames)
++ frames = in->ref_frames_in;
+
+ buf.frameCount = frames;
+ buf.raw = in->ref_buf;
+
+ for (i = 0; i < in->num_preprocessors; i++) {
+- if ((*in->preprocessors[i].effect_itfe)->process_reverse == NULL)
++ if ((*in->preprocessors[i])->process_reverse == NULL)
+ continue;
+
+- (*in->preprocessors[i].effect_itfe)->process_reverse(in->preprocessors[i].effect_itfe,
++ (*in->preprocessors[i])->process_reverse(in->preprocessors[i],
+ &buf,
+ NULL);
+- set_preprocessor_echo_delay(in->preprocessors[i].effect_itfe, delay_us);
++ set_preprocessor_echo_delay(in->preprocessors[i], delay_us);
+ }
+
+- in->ref_buf_frames -= buf.frameCount;
+- if (in->ref_buf_frames) {
++ in->ref_frames_in -= buf.frameCount;
++ if (in->ref_frames_in) {
+ memcpy(in->ref_buf,
+ in->ref_buf + buf.frameCount * in->config.channels,
+- in->ref_buf_frames * in->config.channels * sizeof(int16_t));
++ in->ref_frames_in * in->config.channels * sizeof(int16_t));
+ }
+ }
+
+@@ -2534,31 +1973,23 @@ static int get_next_buffer(struct resampler_buffer_provider *buffer_provider,
+ return -ENODEV;
+ }
+
+- if (in->read_buf_frames == 0) {
+- size_t size_in_bytes = pcm_frames_to_bytes(in->pcm, in->config.period_size);
+- if (in->read_buf_size < in->config.period_size) {
+- in->read_buf_size = in->config.period_size;
+- in->read_buf = (int16_t *) realloc(in->read_buf, size_in_bytes);
+- ALOG_ASSERT((in->read_buf != NULL),
+- "get_next_buffer() failed to reallocate read_buf");
+- ALOGV("get_next_buffer(): read_buf %p extended to %d bytes",
+- in->read_buf, size_in_bytes);
+- }
+-
+- in->read_status = pcm_read(in->pcm, (void*)in->read_buf, size_in_bytes);
+-
++ if (in->frames_in == 0) {
++ in->read_status = pcm_read(in->pcm,
++ (void*)in->buffer,
++ in->config.period_size *
++ audio_stream_frame_size(&in->stream.common));
+ if (in->read_status != 0) {
+- ALOGE("get_next_buffer() pcm_read error %d", in->read_status);
++ LOGE("get_next_buffer() pcm_read error %d", in->read_status);
+ buffer->raw = NULL;
+ buffer->frame_count = 0;
+ return in->read_status;
+ }
+- in->read_buf_frames = in->config.period_size;
++ in->frames_in = in->config.period_size;
+ }
+
+- buffer->frame_count = (buffer->frame_count > in->read_buf_frames) ?
+- in->read_buf_frames : buffer->frame_count;
+- buffer->i16 = in->read_buf + (in->config.period_size - in->read_buf_frames) *
++ buffer->frame_count = (buffer->frame_count > in->frames_in) ?
++ in->frames_in : buffer->frame_count;
++ buffer->i16 = in->buffer + (in->config.period_size - in->frames_in) *
+ in->config.channels;
+
+ return in->read_status;
+@@ -2576,7 +2007,7 @@ static void release_buffer(struct resampler_buffer_provider *buffer_provider,
+ in = (struct tuna_stream_in *)((char *)buffer_provider -
+ offsetof(struct tuna_stream_in, buf_provider));
+
+- in->read_buf_frames -= buffer->frame_count;
++ in->frames_in -= buffer->frame_count;
+ }
+
+ /* read_frames() reads frames from kernel driver, down samples to capture rate
+@@ -2589,10 +2020,9 @@ static ssize_t read_frames(struct tuna_stream_in *in, void *buffer, ssize_t fram
+ size_t frames_rd = frames - frames_wr;
+ if (in->resampler != NULL) {
+ in->resampler->resample_from_provider(in->resampler,
+- (int16_t *)((char *)buffer +
+- pcm_frames_to_bytes(in->pcm ,frames_wr)),
+- &frames_rd);
+-
++ (int16_t *)((char *)buffer +
++ frames_wr * audio_stream_frame_size(&in->stream.common)),
++ &frames_rd);
+ } else {
+ struct resampler_buffer buf = {
+ { raw : NULL, },
+@@ -2601,9 +2031,9 @@ static ssize_t read_frames(struct tuna_stream_in *in, void *buffer, ssize_t fram
+ get_next_buffer(&in->buf_provider, &buf);
+ if (buf.raw != NULL) {
+ memcpy((char *)buffer +
+- pcm_frames_to_bytes(in->pcm, frames_wr),
++ frames_wr * audio_stream_frame_size(&in->stream.common),
+ buf.raw,
+- pcm_frames_to_bytes(in->pcm, buf.frame_count));
++ buf.frame_count * audio_stream_frame_size(&in->stream.common));
+ frames_rd = buf.frame_count;
+ }
+ release_buffer(&in->buf_provider, &buf);
+@@ -2627,127 +2057,66 @@ static ssize_t process_frames(struct tuna_stream_in *in, void* buffer, ssize_t f
+ audio_buffer_t in_buf;
+ audio_buffer_t out_buf;
+ int i;
+- bool has_aux_channels = (~in->main_channels & in->aux_channels);
+- void *proc_buf_out;
+-
+- if (has_aux_channels)
+- proc_buf_out = in->proc_buf_out;
+- else
+- proc_buf_out = buffer;
+
+- /* since all the processing below is done in frames and using the config.channels
+- * as the number of channels, no changes is required in case aux_channels are present */
+ while (frames_wr < frames) {
+ /* first reload enough frames at the end of process input buffer */
+- if (in->proc_buf_frames < (size_t)frames) {
++ if (in->proc_frames_in < (size_t)frames) {
+ ssize_t frames_rd;
+
+ if (in->proc_buf_size < (size_t)frames) {
+- size_t size_in_bytes = pcm_frames_to_bytes(in->pcm, frames);
+-
+ in->proc_buf_size = (size_t)frames;
+- in->proc_buf_in = (int16_t *)realloc(in->proc_buf_in, size_in_bytes);
+- ALOG_ASSERT((in->proc_buf_in != NULL),
+- "process_frames() failed to reallocate proc_buf_in");
+- if (has_aux_channels) {
+- in->proc_buf_out = (int16_t *)realloc(in->proc_buf_out, size_in_bytes);
+- ALOG_ASSERT((in->proc_buf_out != NULL),
+- "process_frames() failed to reallocate proc_buf_out");
+- proc_buf_out = in->proc_buf_out;
+- }
+- ALOGV("process_frames(): proc_buf_in %p extended to %d bytes",
+- in->proc_buf_in, size_in_bytes);
++ in->proc_buf = (int16_t *)realloc(in->proc_buf,
++ in->proc_buf_size *
++ in->config.channels * sizeof(int16_t));
++ LOGV("process_frames(): in->proc_buf %p size extended to %d frames",
++ in->proc_buf, in->proc_buf_size);
+ }
+ frames_rd = read_frames(in,
+- in->proc_buf_in +
+- in->proc_buf_frames * in->config.channels,
+- frames - in->proc_buf_frames);
++ in->proc_buf +
++ in->proc_frames_in * in->config.channels,
++ frames - in->proc_frames_in);
+ if (frames_rd < 0) {
+ frames_wr = frames_rd;
+ break;
+ }
+- in->proc_buf_frames += frames_rd;
++ in->proc_frames_in += frames_rd;
+ }
+
+ if (in->echo_reference != NULL)
+- push_echo_reference(in, in->proc_buf_frames);
++ push_echo_reference(in, in->proc_frames_in);
+
+ /* in_buf.frameCount and out_buf.frameCount indicate respectively
+ * the maximum number of frames to be consumed and produced by process() */
+- in_buf.frameCount = in->proc_buf_frames;
+- in_buf.s16 = in->proc_buf_in;
++ in_buf.frameCount = in->proc_frames_in;
++ in_buf.s16 = in->proc_buf;
+ out_buf.frameCount = frames - frames_wr;
+- out_buf.s16 = (int16_t *)proc_buf_out + frames_wr * in->config.channels;
+-
+- /* FIXME: this works because of current pre processing library implementation that
+- * does the actual process only when the last enabled effect process is called.
+- * The generic solution is to have an output buffer for each effect and pass it as
+- * input to the next.
+- */
+- for (i = 0; i < in->num_preprocessors; i++) {
+- (*in->preprocessors[i].effect_itfe)->process(in->preprocessors[i].effect_itfe,
++ out_buf.s16 = (int16_t *)buffer + frames_wr * in->config.channels;
++
++ for (i = 0; i < in->num_preprocessors; i++)
++ (*in->preprocessors[i])->process(in->preprocessors[i],
+ &in_buf,
+ &out_buf);
+- }
+
+ /* process() has updated the number of frames consumed and produced in
+ * in_buf.frameCount and out_buf.frameCount respectively
+- * move remaining frames to the beginning of in->proc_buf_in */
+- in->proc_buf_frames -= in_buf.frameCount;
+-
+- if (in->proc_buf_frames) {
+- memcpy(in->proc_buf_in,
+- in->proc_buf_in + in_buf.frameCount * in->config.channels,
+- in->proc_buf_frames * in->config.channels * sizeof(int16_t));
++ * move remaining frames to the beginning of in->proc_buf */
++ in->proc_frames_in -= in_buf.frameCount;
++ if (in->proc_frames_in) {
++ memcpy(in->proc_buf,
++ in->proc_buf + in_buf.frameCount * in->config.channels,
++ in->proc_frames_in * in->config.channels * sizeof(int16_t));
+ }
+
+ /* if not enough frames were passed to process(), read more and retry. */
+- if (out_buf.frameCount == 0) {
+- ALOGW("No frames produced by preproc");
++ if (out_buf.frameCount == 0)
+ continue;
+- }
+
+- if ((frames_wr + (ssize_t)out_buf.frameCount) <= frames) {
+- frames_wr += out_buf.frameCount;
+- } else {
+- /* The effect does not comply to the API. In theory, we should never end up here! */
+- ALOGE("preprocessing produced too many frames: %d + %d > %d !",
+- (unsigned int)frames_wr, out_buf.frameCount, (unsigned int)frames);
+- frames_wr = frames;
+- }
++ frames_wr += out_buf.frameCount;
+ }
+-
+- /* Remove aux_channels that have been added on top of main_channels
+- * Assumption is made that the channels are interleaved and that the main
+- * channels are first. */
+- if (has_aux_channels)
+- {
+- size_t src_channels = in->config.channels;
+- size_t dst_channels = popcount(in->main_channels);
+- int16_t* src_buffer = (int16_t *)proc_buf_out;
+- int16_t* dst_buffer = (int16_t *)buffer;
+-
+- if (dst_channels == 1) {
+- for (i = frames_wr; i > 0; i--)
+- {
+- *dst_buffer++ = *src_buffer;
+- src_buffer += src_channels;
+- }
+- } else {
+- for (i = frames_wr; i > 0; i--)
+- {
+- memcpy(dst_buffer, src_buffer, dst_channels*sizeof(int16_t));
+- dst_buffer += dst_channels;
+- src_buffer += src_channels;
+- }
+- }
+- }
+-
+ return frames_wr;
+ }
+
+ static ssize_t in_read(struct audio_stream_in *stream, void* buffer,
+-
+ size_t bytes)
+ {
+ int ret = 0;
+@@ -2798,284 +2167,6 @@ static uint32_t in_get_input_frames_lost(struct audio_stream_in *stream)
+ return 0;
+ }
+
+-#define GET_COMMAND_STATUS(status, fct_status, cmd_status) \
+- do { \
+- if (fct_status != 0) \
+- status = fct_status; \
+- else if (cmd_status != 0) \
+- status = cmd_status; \
+- } while(0)
+-
+-static int in_configure_reverse(struct tuna_stream_in *in)
+-{
+- int32_t cmd_status;
+- uint32_t size = sizeof(int);
+- effect_config_t config;
+- int32_t status = 0;
+- int32_t fct_status = 0;
+- int i;
+-
+- if (in->num_preprocessors > 0) {
+- config.inputCfg.channels = in->main_channels;
+- config.outputCfg.channels = in->main_channels;
+- config.inputCfg.format = AUDIO_FORMAT_PCM_16_BIT;
+- config.outputCfg.format = AUDIO_FORMAT_PCM_16_BIT;
+- config.inputCfg.samplingRate = in->requested_rate;
+- config.outputCfg.samplingRate = in->requested_rate;
+- config.inputCfg.mask =
+- ( EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS | EFFECT_CONFIG_FORMAT );
+- config.outputCfg.mask =
+- ( EFFECT_CONFIG_SMP_RATE | EFFECT_CONFIG_CHANNELS | EFFECT_CONFIG_FORMAT );
+-
+- for (i = 0; i < in->num_preprocessors; i++)
+- {
+- if ((*in->preprocessors[i].effect_itfe)->process_reverse == NULL)
+- continue;
+- fct_status = (*(in->preprocessors[i].effect_itfe))->command(
+- in->preprocessors[i].effect_itfe,
+- EFFECT_CMD_SET_CONFIG_REVERSE,
+- sizeof(effect_config_t),
+- &config,
+- &size,
+- &cmd_status);
+- GET_COMMAND_STATUS(status, fct_status, cmd_status);
+- }
+- }
+- return status;
+-}
+-
+-#define MAX_NUM_CHANNEL_CONFIGS 10
+-
+-static void in_read_audio_effect_channel_configs(struct tuna_stream_in *in,
+- struct effect_info_s *effect_info)
+-{
+- /* size and format of the cmd are defined in hardware/audio_effect.h */
+- effect_handle_t effect = effect_info->effect_itfe;
+- uint32_t cmd_size = 2 * sizeof(uint32_t);
+- uint32_t cmd[] = { EFFECT_FEATURE_AUX_CHANNELS, MAX_NUM_CHANNEL_CONFIGS };
+- /* reply = status + number of configs (n) + n x channel_config_t */
+- uint32_t reply_size =
+- 2 * sizeof(uint32_t) + (MAX_NUM_CHANNEL_CONFIGS * sizeof(channel_config_t));
+- int32_t reply[reply_size];
+- int32_t cmd_status;
+-
+- ALOG_ASSERT((effect_info->num_channel_configs == 0),
+- "in_read_audio_effect_channel_configs() num_channel_configs not cleared");
+- ALOG_ASSERT((effect_info->channel_configs == NULL),
+- "in_read_audio_effect_channel_configs() channel_configs not cleared");
+-
+- /* if this command is not supported, then the effect is supposed to return -EINVAL.
+- * This error will be interpreted as if the effect supports the main_channels but does not
+- * support any aux_channels */
+- cmd_status = (*effect)->command(effect,
+- EFFECT_CMD_GET_FEATURE_SUPPORTED_CONFIGS,
+- cmd_size,
+- (void*)&cmd,
+- &reply_size,
+- (void*)&reply);
+-
+- if (cmd_status != 0) {
+- ALOGV("in_read_audio_effect_channel_configs(): "
+- "fx->command returned %d", cmd_status);
+- return;
+- }
+-
+- if (reply[0] != 0) {
+- ALOGW("in_read_audio_effect_channel_configs(): "
+- "command EFFECT_CMD_GET_FEATURE_SUPPORTED_CONFIGS error %d num configs %d",
+- reply[0], (reply[0] == -ENOMEM) ? reply[1] : MAX_NUM_CHANNEL_CONFIGS);
+- return;
+- }
+-
+- /* the feature is not supported */
+- ALOGV("in_read_audio_effect_channel_configs()(): "
+- "Feature supported and adding %d channel configs to the list", reply[1]);
+- effect_info->num_channel_configs = reply[1];
+- effect_info->channel_configs =
+- (channel_config_t *) malloc(sizeof(channel_config_t) * reply[1]); /* n x configs */
+- memcpy(effect_info->channel_configs, (reply + 2), sizeof(channel_config_t) * reply[1]);
+-}
+-
+-
+-static uint32_t in_get_aux_channels(struct tuna_stream_in *in)
+-{
+- int i;
+- channel_config_t new_chcfg = {0, 0};
+-
+- if (in->num_preprocessors == 0)
+- return 0;
+-
+- /* do not enable dual mic configurations when capturing from other microphones than
+- * main or sub */
+- if (!(in->device & (AUDIO_DEVICE_IN_BUILTIN_MIC | AUDIO_DEVICE_IN_BACK_MIC)))
+- return 0;
+-
+- /* retain most complex aux channels configuration compatible with requested main channels and
+- * supported by audio driver and all pre processors */
+- for (i = 0; i < NUM_IN_AUX_CNL_CONFIGS; i++) {
+- channel_config_t *cur_chcfg = &in_aux_cnl_configs[i];
+- if (cur_chcfg->main_channels == in->main_channels) {
+- size_t match_cnt;
+- size_t idx_preproc;
+- for (idx_preproc = 0, match_cnt = 0;
+- /* no need to continue if at least one preprocessor doesn't match */
+- idx_preproc < (size_t)in->num_preprocessors && match_cnt == idx_preproc;
+- idx_preproc++) {
+- struct effect_info_s *effect_info = &in->preprocessors[idx_preproc];
+- size_t idx_chcfg;
+-
+- for (idx_chcfg = 0; idx_chcfg < effect_info->num_channel_configs; idx_chcfg++) {
+- if (memcmp(effect_info->channel_configs + idx_chcfg,
+- cur_chcfg,
+- sizeof(channel_config_t)) == 0) {
+- match_cnt++;
+- break;
+- }
+- }
+- }
+- /* if all preprocessors match, we have a candidate */
+- if (match_cnt == (size_t)in->num_preprocessors) {
+- /* retain most complex aux channels configuration */
+- if (popcount(cur_chcfg->aux_channels) > popcount(new_chcfg.aux_channels)) {
+- new_chcfg = *cur_chcfg;
+- }
+- }
+- }
+- }
+-
+- ALOGV("in_get_aux_channels(): return %04x", new_chcfg.aux_channels);
+-
+- return new_chcfg.aux_channels;
+-}
+-
+-static int in_configure_effect_channels(effect_handle_t effect,
+- channel_config_t *channel_config)
+-{
+- int status = 0;
+- int fct_status;
+- int32_t cmd_status;
+- uint32_t reply_size;
+- effect_config_t config;
+- uint32_t cmd[(sizeof(uint32_t) + sizeof(channel_config_t) - 1) / sizeof(uint32_t) + 1];
+-
+- ALOGV("in_configure_effect_channels(): configure effect with channels: [%04x][%04x]",
+- channel_config->main_channels,
+- channel_config->aux_channels);
+-
+- config.inputCfg.mask = EFFECT_CONFIG_CHANNELS;
+- config.outputCfg.mask = EFFECT_CONFIG_CHANNELS;
+- reply_size = sizeof(effect_config_t);
+- fct_status = (*effect)->command(effect,
+- EFFECT_CMD_GET_CONFIG,
+- 0,
+- NULL,
+- &reply_size,
+- &config);
+- if (fct_status != 0) {
+- ALOGE("in_configure_effect_channels(): EFFECT_CMD_GET_CONFIG failed");
+- return fct_status;
+- }
+-
+- config.inputCfg.channels = channel_config->main_channels | channel_config->aux_channels;
+- config.outputCfg.channels = config.inputCfg.channels;
+- reply_size = sizeof(uint32_t);
+- fct_status = (*effect)->command(effect,
+- EFFECT_CMD_SET_CONFIG,
+- sizeof(effect_config_t),
+- &config,
+- &reply_size,
+- &cmd_status);
+- GET_COMMAND_STATUS(status, fct_status, cmd_status);
+-
+- cmd[0] = EFFECT_FEATURE_AUX_CHANNELS;
+- memcpy(cmd + 1, channel_config, sizeof(channel_config_t));
+- reply_size = sizeof(uint32_t);
+- fct_status = (*effect)->command(effect,
+- EFFECT_CMD_SET_FEATURE_CONFIG,
+- sizeof(cmd), //sizeof(uint32_t) + sizeof(channel_config_t),
+- cmd,
+- &reply_size,
+- &cmd_status);
+- GET_COMMAND_STATUS(status, fct_status, cmd_status);
+-
+- /* some implementations need to be re-enabled after a config change */
+- reply_size = sizeof(uint32_t);
+- fct_status = (*effect)->command(effect,
+- EFFECT_CMD_ENABLE,
+- 0,
+- NULL,
+- &reply_size,
+- &cmd_status);
+- GET_COMMAND_STATUS(status, fct_status, cmd_status);
+-
+- return status;
+-}
+-
+-static int in_reconfigure_channels(struct tuna_stream_in *in,
+- effect_handle_t effect,
+- channel_config_t *channel_config,
+- bool config_changed) {
+-
+- int status = 0;
+-
+- ALOGV("in_reconfigure_channels(): config_changed %d effect %p",
+- config_changed, effect);
+-
+- /* if config changed, reconfigure all previously added effects */
+- if (config_changed) {
+- int i;
+- for (i = 0; i < in->num_preprocessors; i++)
+- {
+- int cur_status = in_configure_effect_channels(in->preprocessors[i].effect_itfe,
+- channel_config);
+- if (cur_status != 0) {
+- ALOGV("in_reconfigure_channels(): error %d configuring effect "
+- "%d with channels: [%04x][%04x]",
+- cur_status,
+- i,
+- channel_config->main_channels,
+- channel_config->aux_channels);
+- status = cur_status;
+- }
+- }
+- } else if (effect != NULL && channel_config->aux_channels) {
+- /* if aux channels config did not change but aux channels are present,
+- * we still need to configure the effect being added */
+- status = in_configure_effect_channels(effect, channel_config);
+- }
+- return status;
+-}
+-
+-static void in_update_aux_channels(struct tuna_stream_in *in,
+- effect_handle_t effect)
+-{
+- uint32_t aux_channels;
+- channel_config_t channel_config;
+- int status;
+-
+- aux_channels = in_get_aux_channels(in);
+-
+- channel_config.main_channels = in->main_channels;
+- channel_config.aux_channels = aux_channels;
+- status = in_reconfigure_channels(in,
+- effect,
+- &channel_config,
+- (aux_channels != in->aux_channels));
+-
+- if (status != 0) {
+- ALOGV("in_update_aux_channels(): in_reconfigure_channels error %d", status);
+- /* resetting aux channels configuration */
+- aux_channels = 0;
+- channel_config.aux_channels = 0;
+- in_reconfigure_channels(in, effect, &channel_config, true);
+- }
+- if (in->aux_channels != aux_channels) {
+- in->aux_channels_changed = true;
+- in->aux_channels = aux_channels;
+- do_input_standby(in);
+- }
+-}
+-
+ static int in_add_audio_effect(const struct audio_stream *stream,
+ effect_handle_t effect)
+ {
+@@ -3094,26 +2185,15 @@ static int in_add_audio_effect(const struct audio_stream *stream,
+ if (status != 0)
+ goto exit;
+
+- in->preprocessors[in->num_preprocessors].effect_itfe = effect;
+- /* add the supported channel of the effect in the channel_configs */
+- in_read_audio_effect_channel_configs(in, &in->preprocessors[in->num_preprocessors]);
+-
+- in->num_preprocessors++;
+-
+- /* check compatibility between main channel supported and possible auxiliary channels */
+- in_update_aux_channels(in, effect);
+-
+- ALOGV("in_add_audio_effect(), effect type: %08x", desc.type.timeLow);
++ in->preprocessors[in->num_preprocessors++] = effect;
+
+ if (memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0) {
+ in->need_echo_reference = true;
+ do_input_standby(in);
+- in_configure_reverse(in);
+ }
+
+ exit:
+
+- ALOGW_IF(status != 0, "in_add_audio_effect() error %d", status);
+ pthread_mutex_unlock(&in->lock);
+ pthread_mutex_unlock(&in->dev->lock);
+ return status;
+@@ -3125,6 +2205,7 @@ static int in_remove_audio_effect(const struct audio_stream *stream,
+ struct tuna_stream_in *in = (struct tuna_stream_in *)stream;
+ int i;
+ int status = -EINVAL;
++ bool found = false;
+ effect_descriptor_t desc;
+
+ pthread_mutex_lock(&in->dev->lock);
+@@ -3135,17 +2216,14 @@ static int in_remove_audio_effect(const struct audio_stream *stream,
+ }
+
+ for (i = 0; i < in->num_preprocessors; i++) {
+- if (status == 0) { /* status == 0 means an effect was removed from a previous slot */
+- in->preprocessors[i - 1].effect_itfe = in->preprocessors[i].effect_itfe;
+- in->preprocessors[i - 1].channel_configs = in->preprocessors[i].channel_configs;
+- in->preprocessors[i - 1].num_channel_configs = in->preprocessors[i].num_channel_configs;
+- ALOGV("in_remove_audio_effect moving fx from %d to %d", i, i - 1);
++ if (found) {
++ in->preprocessors[i - 1] = in->preprocessors[i];
+ continue;
+ }
+- if (in->preprocessors[i].effect_itfe == effect) {
+- ALOGV("in_remove_audio_effect found fx at index %d", i);
+- free(in->preprocessors[i].channel_configs);
++ if (in->preprocessors[i] == effect) {
++ in->preprocessors[i] = NULL;
+ status = 0;
++ found = true;
+ }
+ }
+
+@@ -3153,21 +2231,10 @@ static int in_remove_audio_effect(const struct audio_stream *stream,
+ goto exit;
+
+ in->num_preprocessors--;
+- /* if we remove one effect, at least the last preproc should be reset */
+- in->preprocessors[in->num_preprocessors].num_channel_configs = 0;
+- in->preprocessors[in->num_preprocessors].effect_itfe = NULL;
+- in->preprocessors[in->num_preprocessors].channel_configs = NULL;
+-
+-
+- /* check compatibility between main channel supported and possible auxiliary channels */
+- in_update_aux_channels(in, NULL);
+
+ status = (*effect)->get_descriptor(effect, &desc);
+ if (status != 0)
+ goto exit;
+-
+- ALOGV("in_remove_audio_effect(), effect type: %08x", desc.type.timeLow);
+-
+ if (memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0) {
+ in->need_echo_reference = false;
+ do_input_standby(in);
+@@ -3175,109 +2242,25 @@ static int in_remove_audio_effect(const struct audio_stream *stream,
+
+ exit:
+
+- ALOGW_IF(status != 0, "in_remove_audio_effect() error %d", status);
+ pthread_mutex_unlock(&in->lock);
+ pthread_mutex_unlock(&in->dev->lock);
+ return status;
+ }
+
+-static int out_read_hdmi_channel_masks(struct tuna_stream_out *out) {
+- int max_channels = 0;
+- struct mixer *mixer_hdmi;
+-
+- mixer_hdmi = mixer_open(CARD_OMAP4_HDMI);
+- if (mixer_hdmi) {
+- struct mixer_ctl *ctl;
+-
+- ctl = mixer_get_ctl_by_name(mixer_hdmi, MIXER_MAXIMUM_LPCM_CHANNELS);
+- if (ctl)
+- max_channels = mixer_ctl_get_value(ctl, 0);
+- mixer_close(mixer_hdmi);
+- }
+-
+- ALOGV("out_read_hdmi_channel_masks() got %d max channels", max_channels);
+-
+- if (max_channels != 6 && max_channels != 8)
+- return -ENOSYS;
+-
+- out->sup_channel_masks[0] = AUDIO_CHANNEL_OUT_5POINT1;
+- if (max_channels == 8)
+- out->sup_channel_masks[1] = AUDIO_CHANNEL_OUT_7POINT1;
+-
+- return 0;
+-}
+
+ static int adev_open_output_stream(struct audio_hw_device *dev,
+- audio_io_handle_t handle,
+- audio_devices_t devices,
+- audio_output_flags_t flags,
+- struct audio_config *config,
++ uint32_t devices, int *format,
++ uint32_t *channels, uint32_t *sample_rate,
+ struct audio_stream_out **stream_out)
+ {
+ struct tuna_audio_device *ladev = (struct tuna_audio_device *)dev;
+ struct tuna_stream_out *out;
+ int ret;
+- int output_type;
+-
+- *stream_out = NULL;
+
+ out = (struct tuna_stream_out *)calloc(1, sizeof(struct tuna_stream_out));
+ if (!out)
+ return -ENOMEM;
+
+- out->sup_channel_masks[0] = AUDIO_CHANNEL_OUT_STEREO;
+- out->channel_mask = AUDIO_CHANNEL_OUT_STEREO;
+-
+- if (flags & AUDIO_OUTPUT_FLAG_DIRECT &&
+- devices == AUDIO_DEVICE_OUT_AUX_DIGITAL) {
+- ALOGV("adev_open_output_stream() HDMI multichannel");
+- if (ladev->outputs[OUTPUT_HDMI] != NULL) {
+- ret = -ENOSYS;
+- goto err_open;
+- }
+- ret = out_read_hdmi_channel_masks(out);
+- if (ret != 0)
+- goto err_open;
+- output_type = OUTPUT_HDMI;
+- if (config->sample_rate == 0)
+- config->sample_rate = MM_FULL_POWER_SAMPLING_RATE;
+- if (config->channel_mask == 0)
+- config->channel_mask = AUDIO_CHANNEL_OUT_5POINT1;
+- out->channel_mask = config->channel_mask;
+- out->stream.common.get_buffer_size = out_get_buffer_size_hdmi;
+- out->stream.common.get_sample_rate = out_get_sample_rate_hdmi;
+- out->stream.get_latency = out_get_latency_hdmi;
+- out->stream.write = out_write_hdmi;
+- out->config[PCM_HDMI] = pcm_config_hdmi_multi;
+- out->config[PCM_HDMI].rate = config->sample_rate;
+- out->config[PCM_HDMI].channels = popcount(config->channel_mask);
+- /* FIXME: workaround for channel swap on first playback after opening the output */
+- out->restart_periods_cnt = out->config[PCM_HDMI].period_count * 2;
+- } else if (flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) {
+- ALOGV("adev_open_output_stream() deep buffer");
+- if (ladev->outputs[OUTPUT_DEEP_BUF] != NULL) {
+- ret = -ENOSYS;
+- goto err_open;
+- }
+- output_type = OUTPUT_DEEP_BUF;
+- out->channel_mask = AUDIO_CHANNEL_OUT_STEREO;
+- out->stream.common.get_buffer_size = out_get_buffer_size_deep_buffer;
+- out->stream.common.get_sample_rate = out_get_sample_rate;
+- out->stream.get_latency = out_get_latency_deep_buffer;
+- out->stream.write = out_write_deep_buffer;
+- } else {
+- ALOGV("adev_open_output_stream() normal buffer");
+- if (ladev->outputs[OUTPUT_LOW_LATENCY] != NULL) {
+- ret = -ENOSYS;
+- goto err_open;
+- }
+- output_type = OUTPUT_LOW_LATENCY;
+- out->stream.common.get_buffer_size = out_get_buffer_size_low_latency;
+- out->stream.common.get_sample_rate = out_get_sample_rate;
+- out->stream.get_latency = out_get_latency_low_latency;
+- out->stream.write = out_write_low_latency;
+- }
+-
+ ret = create_resampler(DEFAULT_OUT_SAMPLING_RATE,
+ MM_FULL_POWER_SAMPLING_RATE,
+ 2,
+@@ -3286,8 +2269,11 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
+ &out->resampler);
+ if (ret != 0)
+ goto err_open;
++ out->buffer = malloc(RESAMPLER_BUFFER_SIZE); /* todo: allow for reallocing */
+
++ out->stream.common.get_sample_rate = out_get_sample_rate;
+ out->stream.common.set_sample_rate = out_set_sample_rate;
++ out->stream.common.get_buffer_size = out_get_buffer_size;
+ out->stream.common.get_channels = out_get_channels;
+ out->stream.common.get_format = out_get_format;
+ out->stream.common.set_format = out_set_format;
+@@ -3297,7 +2283,9 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
+ out->stream.common.get_parameters = out_get_parameters;
+ out->stream.common.add_audio_effect = out_add_audio_effect;
+ out->stream.common.remove_audio_effect = out_remove_audio_effect;
++ out->stream.get_latency = out_get_latency;
+ out->stream.set_volume = out_set_volume;
++ out->stream.write = out_write;
+ out->stream.get_render_position = out_get_render_position;
+
+ out->dev = ladev;
+@@ -3305,40 +2293,31 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
+
+ /* FIXME: when we support multiple output devices, we will want to
+ * do the following:
+- * adev->out_device = out->device;
++ * adev->devices &= ~AUDIO_DEVICE_OUT_ALL;
++ * adev->devices |= out->device;
+ * select_output_device(adev);
+ * This is because out_set_parameters() with a route is not
+ * guaranteed to be called after an output stream is opened. */
+
+- config->format = out->stream.common.get_format(&out->stream.common);
+- config->channel_mask = out->stream.common.get_channels(&out->stream.common);
+- config->sample_rate = out->stream.common.get_sample_rate(&out->stream.common);
++ *format = out_get_format(&out->stream.common);
++ *channels = out_get_channels(&out->stream.common);
++ *sample_rate = out_get_sample_rate(&out->stream.common);
+
+ *stream_out = &out->stream;
+- ladev->outputs[output_type] = out;
+-
+ return 0;
+
+ err_open:
+ free(out);
++ *stream_out = NULL;
+ return ret;
+ }
+
+ static void adev_close_output_stream(struct audio_hw_device *dev,
+ struct audio_stream_out *stream)
+ {
+- struct tuna_audio_device *ladev = (struct tuna_audio_device *)dev;
+ struct tuna_stream_out *out = (struct tuna_stream_out *)stream;
+- int i;
+
+ out_standby(&stream->common);
+- for (i = 0; i < OUTPUT_TOTAL; i++) {
+- if (ladev->outputs[i] == out) {
+- ladev->outputs[i] = NULL;
+- break;
+- }
+- }
+-
+ if (out->buffer)
+ free(out->buffer);
+ if (out->resampler)
+@@ -3390,9 +2369,9 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs)
+ ret = str_parms_get_str(parms, "screen_state", value, sizeof(value));
+ if (ret >= 0) {
+ if (strcmp(value, AUDIO_PARAMETER_VALUE_ON) == 0)
+- adev->screen_off = false;
++ adev->low_power = false;
+ else
+- adev->screen_off = true;
++ adev->low_power = true;
+ }
+
+ str_parms_destroy(parms);
+@@ -3414,13 +2393,11 @@ static int adev_set_voice_volume(struct audio_hw_device *dev, float volume)
+ {
+ struct tuna_audio_device *adev = (struct tuna_audio_device *)dev;
+
+- pthread_mutex_lock(&adev->lock);
+ adev->voice_volume = volume;
+
+ if (adev->mode == AUDIO_MODE_IN_CALL)
+ ril_set_call_volume(&adev->ril, SOUND_TYPE_VOICE, volume);
+
+- pthread_mutex_unlock(&adev->lock);
+ return 0;
+ }
+
+@@ -3429,7 +2406,7 @@ static int adev_set_master_volume(struct audio_hw_device *dev, float volume)
+ return -ENOSYS;
+ }
+
+-static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode)
++static int adev_set_mode(struct audio_hw_device *dev, int mode)
+ {
+ struct tuna_audio_device *adev = (struct tuna_audio_device *)dev;
+
+@@ -3462,30 +2439,29 @@ static int adev_get_mic_mute(const struct audio_hw_device *dev, bool *state)
+ }
+
+ static size_t adev_get_input_buffer_size(const struct audio_hw_device *dev,
+- const struct audio_config *config)
++ uint32_t sample_rate, int format,
++ int channel_count)
+ {
+ size_t size;
+- int channel_count = popcount(config->channel_mask);
+- if (check_input_parameters(config->sample_rate, config->format, channel_count) != 0)
++
++ if (check_input_parameters(sample_rate, format, channel_count) != 0)
+ return 0;
+
+- return get_input_buffer_size(config->sample_rate, config->format, channel_count);
++ return get_input_buffer_size(sample_rate, format, channel_count);
+ }
+
+-static int adev_open_input_stream(struct audio_hw_device *dev,
+- audio_io_handle_t handle,
+- audio_devices_t devices,
+- struct audio_config *config,
++static int adev_open_input_stream(struct audio_hw_device *dev, uint32_t devices,
++ int *format, uint32_t *channel_mask,
++ uint32_t *sample_rate,
++ audio_in_acoustics_t acoustics,
+ struct audio_stream_in **stream_in)
+ {
+ struct tuna_audio_device *ladev = (struct tuna_audio_device *)dev;
+ struct tuna_stream_in *in;
+ int ret;
+- int channel_count = popcount(config->channel_mask);
++ int channel_count = popcount(*channel_mask);
+
+- *stream_in = NULL;
+-
+- if (check_input_parameters(config->sample_rate, config->format, channel_count) != 0)
++ if (check_input_parameters(*sample_rate, *format, channel_count) != 0)
+ return -EINVAL;
+
+ in = (struct tuna_stream_in *)calloc(1, sizeof(struct tuna_stream_in));
+@@ -3508,15 +2484,17 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
+ in->stream.read = in_read;
+ in->stream.get_input_frames_lost = in_get_input_frames_lost;
+
+- in->requested_rate = config->sample_rate;
++ in->requested_rate = *sample_rate;
+
+ memcpy(&in->config, &pcm_config_mm_ul, sizeof(pcm_config_mm_ul));
+ in->config.channels = channel_count;
+
+- in->main_channels = config->channel_mask;
+-
+- /* initialisation of preprocessor structure array is implicit with the calloc.
+- * same for in->aux_channels and in->aux_channels_changed */
++ in->buffer = malloc(in->config.period_size *
++ audio_stream_frame_size(&in->stream.common));
++ if (!in->buffer) {
++ ret = -ENOMEM;
++ goto err;
++ }
+
+ if (in->requested_rate != in->config.rate) {
+ in->buf_provider.get_next_buffer = get_next_buffer;
+@@ -3536,7 +2514,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
+
+ in->dev = ladev;
+ in->standby = 1;
+- in->device = devices & ~AUDIO_DEVICE_BIT_IN;
++ in->device = devices;
+
+ *stream_in = &in->stream;
+ return 0;
+@@ -3546,6 +2524,7 @@ err:
+ release_resampler(in->resampler);
+
+ free(in);
++ *stream_in = NULL;
+ return ret;
+ }
+
+@@ -3553,22 +2532,15 @@ static void adev_close_input_stream(struct audio_hw_device *dev,
+ struct audio_stream_in *stream)
+ {
+ struct tuna_stream_in *in = (struct tuna_stream_in *)stream;
+- int i;
+
+ in_standby(&stream->common);
+
+- for (i = 0; i < in->num_preprocessors; i++) {
+- free(in->preprocessors[i].channel_configs);
+- }
+-
+- free(in->read_buf);
+ if (in->resampler) {
++ free(in->buffer);
+ release_resampler(in->resampler);
+ }
+- if (in->proc_buf_in)
+- free(in->proc_buf_in);
+- if (in->proc_buf_out)
+- free(in->proc_buf_out);
++ if (in->proc_buf)
++ free(in->proc_buf);
+ if (in->ref_buf)
+ free(in->ref_buf);
+
+@@ -3593,6 +2565,29 @@ static int adev_close(hw_device_t *device)
+ return 0;
+ }
+
++static uint32_t adev_get_supported_devices(const struct audio_hw_device *dev)
++{
++ return (/* OUT */
++ AUDIO_DEVICE_OUT_EARPIECE |
++ AUDIO_DEVICE_OUT_SPEAKER |
++ AUDIO_DEVICE_OUT_WIRED_HEADSET |
++ AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
++ AUDIO_DEVICE_OUT_AUX_DIGITAL |
++ AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET |
++ AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET |
++ AUDIO_DEVICE_OUT_ALL_SCO |
++ AUDIO_DEVICE_OUT_DEFAULT |
++ /* IN */
++ AUDIO_DEVICE_IN_COMMUNICATION |
++ AUDIO_DEVICE_IN_AMBIENT |
++ AUDIO_DEVICE_IN_BUILTIN_MIC |
++ AUDIO_DEVICE_IN_WIRED_HEADSET |
++ AUDIO_DEVICE_IN_AUX_DIGITAL |
++ AUDIO_DEVICE_IN_BACK_MIC |
++ AUDIO_DEVICE_IN_ALL_SCO |
++ AUDIO_DEVICE_IN_DEFAULT);
++}
++
+ static int adev_open(const hw_module_t* module, const char* name,
+ hw_device_t** device)
+ {
+@@ -3607,10 +2602,11 @@ static int adev_open(const hw_module_t* module, const char* name,
+ return -ENOMEM;
+
+ adev->hw_device.common.tag = HARDWARE_DEVICE_TAG;
+- adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_2_0;
++ adev->hw_device.common.version = 0;
+ adev->hw_device.common.module = (struct hw_module_t *) module;
+ adev->hw_device.common.close = adev_close;
+
++ adev->hw_device.get_supported_devices = adev_get_supported_devices;
+ adev->hw_device.init_check = adev_init_check;
+ adev->hw_device.set_voice_volume = adev_set_voice_volume;
+ adev->hw_device.set_master_volume = adev_set_master_volume;
+@@ -3626,37 +2622,27 @@ static int adev_open(const hw_module_t* module, const char* name,
+ adev->hw_device.close_input_stream = adev_close_input_stream;
+ adev->hw_device.dump = adev_dump;
+
+- adev->mixer = mixer_open(CARD_OMAP4_ABE);
++ adev->mixer = mixer_open(0);
+ if (!adev->mixer) {
+ free(adev);
+- ALOGE("Unable to open the mixer, aborting.");
++ LOGE("Unable to open the mixer, aborting.");
+ return -EINVAL;
+ }
+
+ adev->mixer_ctls.dl1_eq = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL1_EQUALIZER);
+- adev->mixer_ctls.mm_dl1_volume = mixer_get_ctl_by_name(adev->mixer,
+- MIXER_DL1_MEDIA_PLAYBACK_VOLUME);
+- adev->mixer_ctls.tones_dl1_volume = mixer_get_ctl_by_name(adev->mixer,
+- MIXER_DL1_TONES_PLAYBACK_VOLUME);
+ adev->mixer_ctls.mm_dl2_volume = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL2_MEDIA_PLAYBACK_VOLUME);
+ adev->mixer_ctls.vx_dl2_volume = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL2_VOICE_PLAYBACK_VOLUME);
+- adev->mixer_ctls.tones_dl2_volume = mixer_get_ctl_by_name(adev->mixer,
+- MIXER_DL2_TONES_PLAYBACK_VOLUME);
+ adev->mixer_ctls.mm_dl1 = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL1_MIXER_MULTIMEDIA);
+ adev->mixer_ctls.vx_dl1 = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL1_MIXER_VOICE);
+- adev->mixer_ctls.tones_dl1 = mixer_get_ctl_by_name(adev->mixer,
+- MIXER_DL1_MIXER_TONES);
+ adev->mixer_ctls.mm_dl2 = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL2_MIXER_MULTIMEDIA);
+ adev->mixer_ctls.vx_dl2 = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL2_MIXER_VOICE);
+- adev->mixer_ctls.tones_dl2 = mixer_get_ctl_by_name(adev->mixer,
+- MIXER_DL2_MIXER_TONES);
+ adev->mixer_ctls.dl2_mono = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_DL2_MONO_MIXER);
+ adev->mixer_ctls.dl1_headset = mixer_get_ctl_by_name(adev->mixer,
+@@ -3682,33 +2668,19 @@ static int adev_open(const hw_module_t* module, const char* name,
+ adev->mixer_ctls.earpiece_volume = mixer_get_ctl_by_name(adev->mixer,
+ MIXER_EARPHONE_PLAYBACK_VOLUME);
+
+- if (!adev->mixer_ctls.dl1_eq ||
+- !adev->mixer_ctls.mm_dl1_volume ||
+- !adev->mixer_ctls.tones_dl1_volume ||
+- !adev->mixer_ctls.mm_dl2_volume ||
+- !adev->mixer_ctls.vx_dl2_volume ||
+- !adev->mixer_ctls.tones_dl2_volume ||
+- !adev->mixer_ctls.mm_dl1 ||
+- !adev->mixer_ctls.vx_dl1 ||
+- !adev->mixer_ctls.tones_dl1 ||
+- !adev->mixer_ctls.mm_dl2 ||
+- !adev->mixer_ctls.vx_dl2 ||
+- !adev->mixer_ctls.tones_dl2 ||
+- !adev->mixer_ctls.dl2_mono ||
+- !adev->mixer_ctls.dl1_headset ||
+- !adev->mixer_ctls.dl1_bt ||
+- !adev->mixer_ctls.earpiece_enable ||
+- !adev->mixer_ctls.left_capture ||
+- !adev->mixer_ctls.right_capture ||
+- !adev->mixer_ctls.amic_ul_volume ||
+- !adev->mixer_ctls.voice_ul_volume ||
+- !adev->mixer_ctls.sidetone_capture ||
+- !adev->mixer_ctls.headset_volume ||
+- !adev->mixer_ctls.speaker_volume ||
++ if (!adev->mixer_ctls.dl1_eq || !adev->mixer_ctls.vx_dl2_volume ||
++ !adev->mixer_ctls.mm_dl2_volume || !adev->mixer_ctls.mm_dl1 ||
++ !adev->mixer_ctls.vx_dl1 || !adev->mixer_ctls.mm_dl2 ||
++ !adev->mixer_ctls.vx_dl2 || !adev->mixer_ctls.dl2_mono ||
++ !adev->mixer_ctls.dl1_headset || !adev->mixer_ctls.dl1_bt ||
++ !adev->mixer_ctls.earpiece_enable || !adev->mixer_ctls.left_capture ||
++ !adev->mixer_ctls.right_capture || !adev->mixer_ctls.amic_ul_volume ||
++ !adev->mixer_ctls.voice_ul_volume || !adev->mixer_ctls.sidetone_capture ||
++ !adev->mixer_ctls.headset_volume || !adev->mixer_ctls.speaker_volume ||
+ !adev->mixer_ctls.earpiece_volume) {
+ mixer_close(adev->mixer);
+ free(adev);
+- ALOGE("Unable to locate all mixer controls, aborting.");
++ LOGE("Unable to locate all mixer controls, aborting.");
+ return -EINVAL;
+ }
+
+@@ -3716,8 +2688,7 @@ static int adev_open(const hw_module_t* module, const char* name,
+ pthread_mutex_lock(&adev->lock);
+ set_route_by_array(adev->mixer, defaults, 1);
+ adev->mode = AUDIO_MODE_NORMAL;
+- adev->out_device = AUDIO_DEVICE_OUT_SPEAKER;
+- adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN;
++ adev->devices = AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_IN_BUILTIN_MIC;
+ select_output_device(adev);
+
+ adev->pcm_modem_dl = NULL;
+@@ -3746,8 +2717,8 @@ static struct hw_module_methods_t hal_module_methods = {
+ struct audio_module HAL_MODULE_INFO_SYM = {
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+- .module_api_version = AUDIO_MODULE_API_VERSION_0_1,
+- .hal_api_version = HARDWARE_HAL_API_VERSION,
++ .version_major = 1,
++ .version_minor = 0,
+ .id = AUDIO_HARDWARE_MODULE_ID,
+ .name = "Tuna audio HW HAL",
+ .author = "The Android Open Source Project",
diff --git a/configs/Volume.db b/configs/Volume.db
deleted file mode 100644
index 432428f..0000000
--- a/configs/Volume.db
+++ /dev/null
Binary files differ
diff --git a/configs/default_gain.conf b/configs/default_gain.conf
deleted file mode 100644
index 4d3e3ac..0000000
--- a/configs/default_gain.conf
+++ /dev/null
@@ -1,2243 +0,0 @@
-#Output Modifier Stage
-#Normal, Incall, Ringtone, Incommunication
-
-#Modifier: Normal
-
-Modifier "Normal" {
- SupportedDevice {
- "Earpiece"
- }
- 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 },
- { "Earpiece 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 },
- { "Earpiece Volume", 1 },
- }
-}
-
-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 : Incall
-Modifier "Incall" {
- SupportedDevice {
- "Earpiece"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "Earpiece Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "Earpiece Volume", 1 },
- }
-}
-
-Modifier "Incall" {
- SupportedDevice {
- "Speaker"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- { "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", 58 },
- }
- 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", 60 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "Incall" {
- SupportedDevice {
- "Headset Out"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 50 },
- { "AIF2DAC Volume", 87 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 60 },
- }
- 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 "Incall" {
- SupportedDevice {
- "Headphone"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 50 },
- { "AIF2DAC Volume", 87 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 60 },
- }
- 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 "Incall" {
- SupportedDevice {
- "SCO Headset Out"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 1 },
- { "AIF2DAC2R Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF2DAC Volume", 96 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "Incall" {
- SupportedDevice {
- "SCO Carkit"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 1 },
- { "AIF2DAC2R Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF2DAC Volume", 96 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "Incall" {
- SupportedDevice {
- "SCO"
- }
- Enable {
- { "AIF2DAC2L Mixer AIF2 Switch", 1 },
- { "AIF2DAC2R Mixer AIF2 Switch", 1 },
- { "AIF2DAC Volume", 96 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "AIF2DAC Volume", 96 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-#Modifier: Ringtone
-Modifier "Ringtone" {
- SupportedDevice {
- "Earpiece"
- }
- 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 },
- { "Earpiece 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", 63 },
- { "Earpiece Volume", 1 },
- }
-}
-
-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", 22 },
- }
- 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", 22 },
- }
- 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", 22 },
- }
- 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", 22 },
- }
- 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", 22 },
- }
- 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", 22 },
- }
- Disable {
- { "Headphone ZC Switch", 0 },
- { "AIF1DAC1 Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Headphone Volume", 27 },
- }
-}
-
-Modifier "Incommunication" {
- SupportedDevice {
- "Earpiece"
- }
- Enable {
- { "AIF1DAC1 Volume", 90 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 52 },
- { "Earpiece 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 },
- { "Earpiece Volume", 1 },
- }
-}
-
-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 {
- "Earpiece"
- }
- Enable {
- { "AIF1DAC1 Volume", 88 },
- { "AIF1 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 48 },
- { "Earpiece 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 },
- { "Earpiece 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 {
- "Earpiece"
- }
- 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", 52 },
- { "Earpiece 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 },
- { "Earpiece 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 {
- "Earpiece"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "Earpiece Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "Earpiece Volume", 1 },
- }
-}
-
-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", 60 },
- }
- 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", 60 },
- { "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", 54 },
- }
- 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", 54 },
- }
- 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 : LoopbackPacket
-Modifier "LoopbackPacket" {
- SupportedDevice {
- "Earpiece"
- }
- Enable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 45 },
- { "Earpiece Volume", 1 },
- }
- Disable {
- { "AIF1DAC1 Volume", 96 },
- { "AIF2DAC Volume", 96 },
- { "AIF1 Boost Volume", 0 },
- { "AIF2 Boost Volume", 0 },
- { "DAC1 Volume", 96 },
- { "Left Output Mixer DAC Volume", 7 },
- { "Right Output Mixer DAC Volume", 7 },
- { "Output Volume", 57 },
- { "Earpiece Volume", 1 },
- }
-}
-
-Modifier "LoopbackPacket" {
- 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", 60 },
- { "Speaker Boost Volume", 0 },
- }
-}
-
-Modifier "LoopbackPacket" {
- 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", 54 },
- }
- 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 "LoopbackPacket" {
- 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", 54 },
- }
- 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 },
- { "IN1L Volume", 30 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 120 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 30 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 120 },
- }
-}
-
-Modifier "Voice" {
- SupportedDevice {
- "Back 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 },
- { "IN1L Volume", 30 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 100 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Camcorder" {
- SupportedDevice {
- "Back 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 },
- { "IN1L Volume", 26 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 108 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 112 },
- }
-}
-
-Modifier "Recognition" {
- SupportedDevice {
- "Back 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 "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 {
- "Earpiece"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1L Volume", 30 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 100 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Communication" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1L Volume", 24 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Communication" {
- SupportedDevice {
- "Back Mic"
- }
- 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 {
- "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 {
- "Earpiece"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1L Volume", 30 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 100 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voipin" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1L Volume", 24 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "Voipin" {
- SupportedDevice {
- "Back Mic"
- }
- 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 {
- "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 {
- "Earpiece"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1L Volume", 24 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "SecVoipin" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "AIF1ADC1 HPF Mode", 1 },
- { "AIF1ADC1 HPF Switch", 1 },
- { "IN1L Volume", 24 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 104 },
- }
- Disable {
- { "AIF1ADC1 HPF Mode", 0 },
- { "AIF1ADC1 HPF Switch", 0 },
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "AIF1ADC1 Volume", 96 },
- }
-}
-
-Modifier "SecVoipin" {
- SupportedDevice {
- "Back Mic"
- }
- 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 {
- "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 },
- }
-}
-
-#Incall-Capture Modifier
-Modifier "IncallIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Earpiece"
- }
- Enable {
- { "IN1L Volume", 24 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 104 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "IncallIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "IN1L Volume", 24 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 104 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "IncallIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "IN1L Volume", 20 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "IncallIn" {
- SupportedDevice {
- "Back Mic"
- }
- Enable {
- { "IN2R Volume", 25 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 110 },
- }
- Disable {
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "IncallIn" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
-// { "Sidetone HPF Mux", 3 },
-// { "Sidetone HPF Switch", 1 },
- { "IN1R Volume", 25 },
- { "MIXINR IN1R Volume", 0 },
- { "MIXINR IN1RP Volume", 0 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 110 },
- }
- Disable {
-// { "Sidetone HPF Mux", 0 },
-// { "Sidetone HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "MIXINR IN1RP Volume", 0 },
- { "DAC2 Right Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "IncallIn" {
- SupportedDevice {
- "SCO Headset In"
- }
- Enable {
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
- Disable {
- { "AIF1ADC1R Mixer AIF2 Switch", 1 },
- { "AIF1ADC1L Mixer AIF2 Switch", 1 },
- }
-}
-
-#LoopbackIn-Capture Modifier
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Earpiece"
- }
- Enable {
- { "IN1L Volume", 28 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "IN1L Volume", 28 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "IN1L Volume", 20 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headset Out"
- }
- Enable {
- { "IN1L Volume", 20 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Back Mic"
- }
- Enable {
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackIn" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
-// { "Sidetone HPF Mux", 3 },
-// { "Sidetone HPF Switch", 1 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 1 },
- { "MIXINR IN1RP Volume", 1 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
-// { "Sidetone HPF Mux", 0 },
-// { "Sidetone HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "MIXINR IN1RP Volume", 0 },
- { "DAC2 Right Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-#LoopbackPacketIn-Capture Modifier
-Modifier "LoopbackPacketIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Earpiece"
- }
- Enable {
- { "IN1L Volume", 28 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackPacketIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headphone"
- }
- Enable {
- { "IN1L Volume", 28 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackPacketIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Speaker"
- }
- Enable {
- { "IN1L Volume", 20 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackPacketIn" {
- SupportedDevice {
- "Builtin Mic"
- }
- OutputDevice {
- "Headset Out"
- }
- Enable {
- { "IN1L Volume", 20 },
- { "MIXINL IN1L Volume", 1 },
- { "DAC2 Left Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN1L Volume", 11 },
- { "MIXINL IN1L Volume", 0 },
- { "DAC2 Left Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackPacketIn" {
- SupportedDevice {
- "Back Mic"
- }
- Enable {
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 1 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
- { "IN2R Volume", 11 },
- { "MIXINR IN2R Volume", 0 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
-}
-
-Modifier "LoopbackPacketIn" {
- SupportedDevice {
- "Headset In"
- }
- Enable {
-// { "Sidetone HPF Mux", 3 },
-// { "Sidetone HPF Switch", 1 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 1 },
- { "MIXINR IN1RP Volume", 1 },
- { "DAC2 Right Sidetone Volume", 12 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC Volume", 96 },
- }
- Disable {
-// { "Sidetone HPF Mux", 0 },
-// { "Sidetone HPF Switch", 0 },
- { "IN1R Volume", 11 },
- { "MIXINR IN1R Volume", 0 },
- { "MIXINR IN1RP Volume", 0 },
- { "DAC2 Right Sidetone Volume", 0 },
- { "DAC2 Volume", 96 },
- { "AIF2ADC 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 },
- }
-}
-
-Modifier "Audio_GND_Switch" {
- Enable {
- { "HP Output Mode", 0},
- }
- Disable {
- { "HP Output Mode", 1},
- }
-} \ No newline at end of file
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 8d7b9d1..0000000
--- a/configs/tinyucm.conf
+++ /dev/null
@@ -1,448 +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 {
- { "Earpiece", "Builtin Mic" },
- { "Speaker", "Back Mic" },
- { "Headset Out", "Headset In" },
- { "Headphone", "Builtin Mic" },
- { "SCO Headset Out", "SCO Headset In" },
- { "SCO", "SCO Headset In" },
-}
-
-INPUT_CHANNEL_MAP {
- { "Builtin Mic", "Left" },
- { "Back 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 "Earpiece" {
- Enable {
- { "RCV Switch", 1 },
- }
- Disable {
- { "RCV Switch", 0 },
- }
-}
-
-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 {
- { "Main Mic Switch", 1 },
- { "AIF1ADCL Source", "Left" },
-// { "AIF1ADCR Source", "Left" },
- { "AIF2ADCL Source", "Left" },
- { "AIF2ADCR Source", "Left" },
- { "MIXINL IN1L Switch", 1 },
- { "AIF2DAC2L Mixer Left Sidetone Switch", 1 },
- { "AIF2DAC2L Mixer Right Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Right Sidetone Switch", 0 },
- }
- Disable {
- { "Main Mic Switch", 0 },
- { "MIXINL IN1L Switch", 0 },
- }
-}
-
-Device "Back Mic" {
- Enable {
- { "Sub Mic Switch", 1 },
-// { "AIF1ADCL Source", "Right" },
- { "AIF1ADCR Source", "Right" },
- { "AIF2ADCL Source", "Right" },
- { "AIF2ADCR Source", "Right" },
- { "MIXINR IN2R Switch", 1 },
- { "AIF2DAC2L Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2L Mixer Right Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Right Sidetone 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 },
- { "AIF2DAC2L Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2L Mixer Right Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Right Sidetone 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 },
- { "AIF2DAC2L Mixer Left Sidetone Switch", 1 },
- { "AIF2DAC2L Mixer Right Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Left Sidetone Switch", 0 },
- { "AIF2DAC2R Mixer Right Sidetone Switch", 1 },
- }
- Disable {
- { "AIF2ADC Mux", 0 },
- { "AIF1ADC1R Mixer AIF2 Switch", 0 },
- { "AIF1ADC1L Mixer AIF2 Switch", 0 },
- }
-}
-
-Device "Voice Call" {
- Enable {
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- }
- Disable {
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- }
-}
-
-#Verb Stage
-#Currently just using normal and voicecall
-#Normal, Voicecall
-Verb "Normal" {
- Enable {
- { "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 {
- { "AIF2 Mode", 0 },
-// { "DAC1L Mixer AIF1.1 Switch", 0 },
-// { "DAC1R Mixer AIF1.1 Switch", 0 },
- { "AIF2DAC Mux", "AIF2DACDAT" },
- }
-}
-
-Verb "Ringtone" {
- Enable {
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- }
- Disable {
-// { "DAC1L Mixer AIF1.1 Switch", 0 },
-// { "DAC1R Mixer AIF1.1 Switch", 0 },
- }
-}
-
-Verb "Communication" {
- Enable {
- { "DAC1L Mixer AIF1.1 Switch", 1 },
- { "DAC1R Mixer AIF1.1 Switch", 1 },
- }
- Disable {
- { "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 {
- { "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", "AIF2DACDAT" },
- }
-}
-
-Verb "Loopback" {
- 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" },
- { "AIF2DAC2L Mixer AIF2 Switch", 0 },
- { "AIF2DAC2R Mixer AIF2 Switch", 0 },
- }
- Disable {
- { "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", "AIF2DACDAT" },
- }
-}
-
-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/p3100.mk b/p3100.mk
index 947edcc..01af5d0 100644
--- a/p3100.mk
+++ b/p3100.mk
@@ -22,9 +22,7 @@ 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/espressorf
# Packages
PRODUCT_PACKAGES += \
generated by cgit v1.1 at 2024-04-26 12:18:25 +0000