Porting Audio HAL to use Input device bit

Audio devices musks now intersects for output and
input and contain special bit to identify an input
device explicitely. Audio HAL should thus use
different variables for input devices and output ones.

Change-Id: I156fad5fe457780cfb7ba710ff75b319506cfb2b
Signed-off-by: Sergii Iegorov <x0155539@ti.com>

1 files changed, 44 insertions, 37 deletions

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 05965e7..feeb240 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -836,6 +836,11 @@ struct mixer_ctls
 
 #define MAX_OUTPUTS 2
 
+struct audio_devices {
+    int out_devices;
+    int in_devices;
+};
+
 struct selected_stream_output_device {
     struct omap_stream_out* id;
     int device;
@@ -848,8 +853,8 @@ struct omap_audio_device {
     struct mixer *mixer;
     struct mixer_ctls mixer_ctls;
     int mode;
-    int devices;
-    int cur_devices;
+    struct audio_devices devices;
+    struct audio_devices cur_devices;
     struct selected_stream_output_device selected_device[MAX_OUTPUTS];
     struct pcm *pcm_modem_dl;
     struct pcm *pcm_modem_ul;
@@ -1146,17 +1151,17 @@ static void set_eq_filter(struct omap_audio_device *adev)
     LOGFUNC("%s(%p)", __FUNCTION__, adev);
 
     /* DL1_EQ can't be used for bt */
-    int dl1_eq_applicable = adev->devices & (AUDIO_DEVICE_OUT_WIRED_HEADSET |
+    int dl1_eq_applicable = adev->devices.out_devices & (AUDIO_DEVICE_OUT_WIRED_HEADSET |
                     AUDIO_DEVICE_OUT_WIRED_HEADPHONE | AUDIO_DEVICE_OUT_EARPIECE);
 
     if (!adev->dl2_support)
-        dl1_eq_applicable |= adev->devices & AUDIO_DEVICE_OUT_SPEAKER;
+        dl1_eq_applicable |= adev->devices.out_devices & AUDIO_DEVICE_OUT_SPEAKER;
 
     /* 4Khz LPF is used only in NB-AMR voicecall */
     if ((adev->mode == AUDIO_MODE_IN_CALL) && dl1_eq_applicable &&
             (adev->tty_mode == TTY_MODE_OFF) && !adev->wb_amr)
         mixer_ctl_set_enum_by_string(adev->mixer_ctls.dl1_eq, MIXER_4KHZ_LPF_0DB);
-    else if (!adev->dl2_support && (adev->devices & AUDIO_DEVICE_OUT_SPEAKER))
+    else if (!adev->dl2_support && (adev->devices.out_devices & AUDIO_DEVICE_OUT_SPEAKER))
         mixer_ctl_set_enum_by_string(adev->mixer_ctls.dl1_eq, MIXER_450HZ_HIGH_PASS);
     else
         mixer_ctl_set_enum_by_string(adev->mixer_ctls.dl1_eq, MIXER_FLAT_RESPONSE);
@@ -1210,7 +1215,7 @@ static void set_incall_device(struct omap_audio_device *adev)
      * in call. In this case, an output stream device is not provided, but
      * is instead provided in adev->devices.
      */
-    switch(adev->devices & AUDIO_DEVICE_OUT_ALL) {
+    switch(adev->devices.out_devices & AUDIO_DEVICE_OUT_ALL) {
         case AUDIO_DEVICE_OUT_EARPIECE:
             device_type = SOUND_AUDIO_PATH_HANDSET;
             break;
@@ -1330,7 +1335,7 @@ static void set_output_volumes(struct omap_audio_device *adev)
 
     speaker_volume = adev->mode == AUDIO_MODE_IN_CALL ? VOICE_CALL_SPEAKER_VOLUME :
                                                         NORMAL_SPEAKER_VOLUME;
-    headset_volume = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ?
+    headset_volume = adev->devices.out_devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ?
                                                         HEADSET_VOLUME :
                                                         HEADPHONE_VOLUME;
 
@@ -1385,11 +1390,12 @@ static void select_mode(struct omap_audio_device *adev)
             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->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;
+            if ((adev->devices.out_devices & AUDIO_DEVICE_OUT_ALL) == AUDIO_DEVICE_OUT_SPEAKER) {
+                adev->devices.out_devices = AUDIO_DEVICE_OUT_EARPIECE;
+                adev->devices.in_devices = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN;
+            } else {
+                adev->devices.out_devices &= ~AUDIO_DEVICE_OUT_SPEAKER;
+            }
             select_output_device(adev, NULL);
             if (adev->modem) {
                 ril_set_call_clock_sync(&adev->ril, SOUND_CLOCK_START);
@@ -1502,18 +1508,18 @@ static void select_output_device(struct omap_audio_device *adev,
                 adev->selected_device[i].device = out->device;
             }
         }
-        adev->devices &= ~AUDIO_DEVICE_OUT_ALL;
+        adev->devices.out_devices &= ~AUDIO_DEVICE_OUT_ALL;
         for(i = 0; i < MAX_OUTPUTS; i++) {
             if (adev->selected_device[i].id)
-                adev->devices |= adev->selected_device[i].device;
+                adev->devices.out_devices |= adev->selected_device[i].device;
         }
     }
-    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;
-    fmtx_on |= adev->devices & AUDIO_DEVICE_OUT_FM_RADIO_TX;
+    headset_on |= adev->devices.out_devices & AUDIO_DEVICE_OUT_WIRED_HEADSET;
+    headphone_on |= adev->devices.out_devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
+    speaker_on |= adev->devices.out_devices & AUDIO_DEVICE_OUT_SPEAKER;
+    earpiece_on |= adev->devices.out_devices & AUDIO_DEVICE_OUT_EARPIECE;
+    bt_on |= adev->devices.out_devices & AUDIO_DEVICE_OUT_ALL_SCO;
+    fmtx_on |= adev->devices.out_devices & AUDIO_DEVICE_OUT_FM_RADIO_TX;
 
     /* force rx path according to TTY mode when in call */
     if (adev->mode == AUDIO_MODE_IN_CALL && !bt_on) {
@@ -1590,13 +1596,13 @@ static void select_output_device(struct omap_audio_device *adev,
     /* Automatic change of HSDAC power mode needed for earpiece
        (which requires High-Perfomance mode) is not allowed
        when DACs are active, disable DL1 outputs first */
-    if (((adev->cur_devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) ||
-            (adev->cur_devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE))
+    if (((adev->cur_devices.out_devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) ||
+            (adev->cur_devices.out_devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE))
             && earpiece_on) {
         set_route_by_array(adev->mixer, hs_output, 0);
     }
 
-    if ((adev->cur_devices & AUDIO_DEVICE_OUT_EARPIECE)
+    if ((adev->cur_devices.out_devices & AUDIO_DEVICE_OUT_EARPIECE)
             && (headset_on || headphone_on)) {
         mixer_ctl_set_value(adev->mixer_ctls.earpiece_enable, 0, 0);
     }
@@ -1734,9 +1740,9 @@ static void select_input_device(struct omap_audio_device *adev)
     int headset_on = 0;
     int main_mic_on = 0;
     int sub_mic_on = 0;
-    int bt_on = adev->devices & AUDIO_DEVICE_IN_ALL_SCO;
+    int bt_on = adev->devices.in_devices & AUDIO_DEVICE_IN_ALL_SCO;
     int hw_is_stereo_only = 0;
-    int fm_rx_on = adev->devices & AUDIO_DEVICE_IN_FM_RADIO_RX;
+    int fm_rx_on = adev->devices.in_devices & AUDIO_DEVICE_IN_FM_RADIO_RX;
 
     LOGFUNC("%s(%p)", __FUNCTION__, adev);
 
@@ -1744,12 +1750,12 @@ static void select_input_device(struct omap_audio_device *adev)
         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->devices & AUDIO_DEVICE_OUT_SPEAKER) &&
+                ((adev->devices.out_devices & AUDIO_DEVICE_OUT_SPEAKER) &&
                  (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION));
         }
         if (!sub_mic_on) {
-            headset_on = adev->devices & AUDIO_DEVICE_IN_WIRED_HEADSET;
-            main_mic_on = adev->devices & AUDIO_DEVICE_IN_BUILTIN_MIC;
+            headset_on = adev->devices.in_devices & AUDIO_DEVICE_IN_WIRED_HEADSET;
+            main_mic_on = adev->devices.in_devices & AUDIO_DEVICE_IN_BUILTIN_MIC;
         }
     }
 
@@ -2493,8 +2499,8 @@ static int start_input_stream(struct omap_stream_in *in)
     adev->active_input = in;
 
     if (adev->mode != AUDIO_MODE_IN_CALL) {
-        adev->devices &= ~AUDIO_DEVICE_IN_ALL;
-        adev->devices |= in->device;
+        adev->devices.in_devices &= ~AUDIO_DEVICE_IN_ALL;
+        adev->devices.in_devices |= in->device & ~AUDIO_DEVICE_BIT_IN;;
         select_input_device(adev);
         adev->vx_rec_on = false;
     } else {
@@ -2506,7 +2512,7 @@ static int start_input_stream(struct omap_stream_in *in)
         adev->vx_rec_on = true;
     }
 
-    if(adev->devices & AUDIO_DEVICE_IN_USB_HEADSET) {
+    if(adev->devices.in_devices & AUDIO_DEVICE_IN_USB_HEADSET) {
         adev->input_requires_stereo = 0;
     }
 
@@ -2523,13 +2529,13 @@ static int start_input_stream(struct omap_stream_in *in)
     if (in->remix_at_driver)
         in->config.channels = in->remix_at_driver->in_chans;
 
-    if(adev->devices & AUDIO_DEVICE_IN_USB_HEADSET) {
+    if(adev->devices.in_devices & AUDIO_DEVICE_IN_USB_HEADSET) {
         card = CARD_OMAP_USB;
         /*device should be 0 for usb headset capture */
         device = PORT_MM;
     }
 
-    if(adev->devices & AUDIO_DEVICE_IN_FM_RADIO_RX) {
+    if(adev->devices.in_devices & AUDIO_DEVICE_IN_FM_RADIO_RX) {
         card = CARD_OMAP_DEFAULT;
         /*device should be PORT_MM2_UL for FM capture */
         device = PORT_MM2_UL;
@@ -2548,7 +2554,7 @@ static int start_input_stream(struct omap_stream_in *in)
         adev->active_input = NULL;
         return -ENOMEM;
     }
-    if (adev->devices & AUDIO_DEVICE_IN_FM_RADIO_RX) {
+    if (adev->devices.in_devices & AUDIO_DEVICE_IN_FM_RADIO_RX) {
        ALOGI("FM:FM capture path opened successfully!!\nFM:Triggering loopback for FM capture path");
        fm_enable = true;
        pcm_start(in->pcm);
@@ -2628,7 +2634,7 @@ static int do_input_standby(struct omap_stream_in *in)
 
         adev->active_input = 0;
         if (adev->mode != AUDIO_MODE_IN_CALL) {
-            adev->devices &= ~AUDIO_DEVICE_IN_ALL;
+            adev->devices.in_devices &= ~AUDIO_DEVICE_IN_ALL;
             select_input_device(adev);
         }
 
@@ -3467,7 +3473,7 @@ static int set_voice_volume(struct audio_hw_device *dev, float volume)
 
     /* in-call output devices are maintained in adev->devices */
     if (adev->mode == AUDIO_MODE_IN_CALL) {
-        switch(adev->devices & AUDIO_DEVICE_OUT_ALL) {
+        switch(adev->devices.out_devices & AUDIO_DEVICE_OUT_ALL) {
             case AUDIO_DEVICE_OUT_EARPIECE:
             default:
                 sound_type = SOUND_TYPE_VOICE;
@@ -3921,7 +3927,8 @@ static int adev_open(const hw_module_t* module, const char* name,
         set_route_by_array(adev->mixer, hf_dl1, 1);
     }
     adev->mode = AUDIO_MODE_NORMAL;
-    adev->devices = AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_IN_BUILTIN_MIC;
+    adev->devices.out_devices = AUDIO_DEVICE_OUT_SPEAKER;
+    adev->devices.in_devices = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN;
 
     adev->pcm_modem_dl = NULL;
     adev->pcm_modem_ul = NULL;