Fix: Move CHLD from voicecall driver to plugin

According HFP v1.5 spec, AT+CHLD=? should be a part of SLC
connection. So we should not do it after SLC connection is
created.

diff --git a/drivers/hfpmodem/hfpmodem.h b/drivers/hfpmodem/hfpmodem.h
index c0e4c7e..1935cb2 100644 (file)
--- a/drivers/hfpmodem/hfpmodem.h
+++ b/drivers/hfpmodem/hfpmodem.h
@@ -42,6 +42,14 @@
 #define HF_FEATURE_ENHANCED_CALL_STATUS 0x20
 #define HF_FEATURE_ENHANCED_CALL_CONTROL 0x40
 
+#define AG_CHLD_0 0x01
+#define AG_CHLD_1 0x02
+#define AG_CHLD_1x 0x04
+#define AG_CHLD_2 0x08
+#define AG_CHLD_2x 0x10
+#define AG_CHLD_3 0x20
+#define AG_CHLD_4 0x40
+
 enum hfp_indicator {
        HFP_INDICATOR_SERVICE = 0,
        HFP_INDICATOR_CALL,
@@ -56,6 +64,7 @@ enum hfp_indicator {
 struct hfp_data {
        GAtChat *chat;
        unsigned int ag_features;
+       unsigned int ag_mpty_features;
        unsigned int hf_features;
        unsigned char cind_pos[HFP_INDICATOR_LAST];
        unsigned int cind_val[HFP_INDICATOR_LAST];

diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index 52cdfd7..2cd14b5 100644 (file)
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -39,16 +39,7 @@
 
 #include "hfpmodem.h"
 
-#define AG_CHLD_0 0x01
-#define AG_CHLD_1 0x02
-#define AG_CHLD_1x 0x04
-#define AG_CHLD_2 0x08
-#define AG_CHLD_2x 0x10
-#define AG_CHLD_3 0x20
-#define AG_CHLD_4 0x40
-
 static const char *none_prefix[] = { NULL };
-static const char *chld_prefix[] = { "+CHLD:", NULL };
 static const char *clcc_prefix[] = { "+CLCC:", NULL };
 
 struct voicecall_data {
@@ -900,47 +891,6 @@ static void ciev_notify(GAtResult *result, gpointer user_data)
                ciev_callheld_notify(vc, value);
 }
 
-static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
-       struct voicecall_data *vd = user_data;
-       unsigned int ag_mpty_feature = 0;
-       GAtResultIter iter;
-       const char *str;
-
-       if (!ok)
-               return;
-
-       g_at_result_iter_init(&iter, result);
-
-       if (!g_at_result_iter_next(&iter, "+CHLD:"))
-               return;
-
-       if (!g_at_result_iter_open_list(&iter))
-               return;
-
-       while (g_at_result_iter_next_unquoted_string(&iter, &str)) {
-               if (!strcmp(str, "0"))
-                       ag_mpty_feature |= AG_CHLD_0;
-               else if (!strcmp(str, "1"))
-                       ag_mpty_feature |= AG_CHLD_1;
-               else if (!strcmp(str, "1x"))
-                       ag_mpty_feature |= AG_CHLD_1x;
-               else if (!strcmp(str, "2"))
-                       ag_mpty_feature |= AG_CHLD_2;
-               else if (!strcmp(str, "2x"))
-                       ag_mpty_feature |= AG_CHLD_2x;
-               else if (!strcmp(str, "3"))
-                       ag_mpty_feature |= AG_CHLD_3;
-               else if (!strcmp(str, "4"))
-                       ag_mpty_feature |= AG_CHLD_4;
-       }
-
-       if (!g_at_result_iter_close_list(&iter))
-               return;
-
-       vd->ag_mpty_features = ag_mpty_feature;
-}
-
 static void hfp_voicecall_initialized(gboolean ok, GAtResult *result,
                                        gpointer user_data)
 {
@@ -970,14 +920,11 @@ static int hfp_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
 
        vd->chat = data->chat;
        vd->ag_features = data->ag_features;
+       vd->ag_mpty_features = data->ag_mpty_features;
 
        memcpy(vd->cind_pos, data->cind_pos, HFP_INDICATOR_LAST);
        memcpy(vd->cind_val, data->cind_val, HFP_INDICATOR_LAST);
 
-       if (vd->ag_features & AG_FEATURE_3WAY)
-               g_at_chat_send(vd->chat, "AT+CHLD=?", chld_prefix,
-                       chld_cb, vd, NULL);
-
        ofono_voicecall_set_data(vc, vd);
 
        g_at_chat_send(vd->chat, "AT+CLIP=1", NULL, NULL, NULL, NULL);

diff --git a/plugins/hfp.c b/plugins/hfp.c
index 6e630e8..b56abdb 100644 (file)
--- a/plugins/hfp.c
+++ b/plugins/hfp.c
@@ -55,6 +55,7 @@
 static const char *brsf_prefix[] = { "+BRSF:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };
 static const char *cmer_prefix[] = { "+CMER:", NULL };
+static const char *chld_prefix[] = { "+CHLD:", NULL };
 
 static int hfp_disable(struct ofono_modem *modem);
 
@@ -63,6 +64,60 @@ static void hfp_debug(const char *str, void *user_data)
        ofono_info("%s", str);
 }
 
+static void sevice_level_conn_established(struct ofono_modem *modem)
+{
+       struct hfp_data *data = ofono_modem_get_data(modem);
+
+       ofono_info("Service level connection established");
+       ofono_modem_set_powered(modem, TRUE);
+
+       g_at_chat_send(data->chat, "AT+CMEE=1", NULL, NULL, NULL, NULL);
+}
+
+static void chld_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+       struct ofono_modem *modem = user_data;
+       struct hfp_data *data = ofono_modem_get_data(modem);
+       unsigned int ag_mpty_feature = 0;
+       GAtResultIter iter;
+       const char *str;
+
+       if (!ok)
+               return;
+
+       g_at_result_iter_init(&iter, result);
+
+       if (!g_at_result_iter_next(&iter, "+CHLD:"))
+               return;
+
+       if (!g_at_result_iter_open_list(&iter))
+               return;
+
+       while (g_at_result_iter_next_unquoted_string(&iter, &str)) {
+               if (!strcmp(str, "0"))
+                       ag_mpty_feature |= AG_CHLD_0;
+               else if (!strcmp(str, "1"))
+                       ag_mpty_feature |= AG_CHLD_1;
+               else if (!strcmp(str, "1x"))
+                       ag_mpty_feature |= AG_CHLD_1x;
+               else if (!strcmp(str, "2"))
+                       ag_mpty_feature |= AG_CHLD_2;
+               else if (!strcmp(str, "2x"))
+                       ag_mpty_feature |= AG_CHLD_2x;
+               else if (!strcmp(str, "3"))
+                       ag_mpty_feature |= AG_CHLD_3;
+               else if (!strcmp(str, "4"))
+                       ag_mpty_feature |= AG_CHLD_4;
+       }
+
+       if (!g_at_result_iter_close_list(&iter))
+               return;
+
+       data->ag_mpty_features = ag_mpty_feature;
+
+       sevice_level_conn_established(modem);
+}
+
 static void cmer_cb(gboolean ok, GAtResult *result, gpointer user_data)
 {
        struct ofono_modem *modem = user_data;
@@ -73,10 +128,11 @@ static void cmer_cb(gboolean ok, GAtResult *result, gpointer user_data)
                return;
        }
 
-       ofono_info("Service level connection established");
-       g_at_chat_send(data->chat, "AT+CMEE=1", NULL, NULL, NULL, NULL);
-
-       ofono_modem_set_powered(modem, TRUE);
+       if (data->ag_features & AG_FEATURE_3WAY)
+               g_at_chat_send(data->chat, "AT+CHLD=?", chld_prefix,
+                       chld_cb, modem, NULL);
+       else
+               sevice_level_conn_established(modem);
 }
 
 static void cind_status_cb(gboolean ok, GAtResult *result,