[PATCH 1/2] cbs: send topics one by one for ZTE modem.

[Bertrand Aygon]

---
 drivers/atmodem/cbs.c |   58 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/drivers/atmodem/cbs.c b/drivers/atmodem/cbs.c
index e2e1ca4..4673a77 100644
--- a/drivers/atmodem/cbs.c
+++ b/drivers/atmodem/cbs.c
@@ -109,9 +109,9 @@ static void at_cbs_set_topics(struct ofono_cbs *cbs, const 
char *topics,
                                ofono_cbs_set_cb_t cb, void *user_data)
 {
        struct cbs_data *data = ofono_cbs_get_data(cbs);
-       struct cb_data *cbd = cb_data_new(cb, user_data);
        char *buf;
-       unsigned int id;
+       unsigned int id = 0;
+       gboolean send_by_one = FALSE;
 
        DBG("");
 
@@ -125,6 +125,7 @@ static void at_cbs_set_topics(struct ofono_cbs *cbs, const 
char *topics,
        switch (data->vendor) {
        case OFONO_VENDOR_GOBI:
        case OFONO_VENDOR_QUALCOMM_MSM:
+       case OFONO_VENDOR_ZTE:
                g_at_chat_send(data->chat, "AT+CSCB=1", none_prefix,
                                NULL, NULL, NULL);
                break;
@@ -132,17 +133,58 @@ static void at_cbs_set_topics(struct ofono_cbs *cbs, 
const char *topics,
                break;
        }
 
-       buf = g_strdup_printf("AT+CSCB=0,\"%s\"", topics);
+       /* Some ZTE modem doesn't support sending a long AT command
+        * so we send topics one by one
+        */
+       switch (data->vendor) {
+       case OFONO_VENDOR_ZTE:
+               send_by_one = TRUE;
+               break;
+       default:
+               break;
+       }
+
+       if (send_by_one) {
+               gchar **topic_list = NULL;
+               gchar **topic_list_orig = NULL;
+
+               topic_list = topic_list_orig = g_strsplit_set(topics, ",", -1);
+
+               for (; *topic_list; topic_list++) {
+                       struct cb_data *cbd = cb_data_new(cb, user_data);
+
+                       buf = g_strdup_printf("AT+CSCB=0,\"%s\"", *topic_list);
 
-       id = g_at_chat_send(data->chat, buf, none_prefix,
+                       id = g_at_chat_send(data->chat, buf, none_prefix,
                                at_cscb_set_cb, cbd, g_free);
 
-       g_free(buf);
+                       g_free(buf);
 
-       if (id > 0)
-               return;
+                       if (id > 0)
+                               continue;
 
-       g_free(cbd);
+                       g_free(cbd);
+               }
+
+               g_strfreev(topic_list_orig);
+
+               if (id > 0)
+                       return;
+       } else {
+               struct cb_data *cbd = cb_data_new(cb, user_data);
+
+               buf = g_strdup_printf("AT+CSCB=0,\"%s\"", topics);
+
+               id = g_at_chat_send(data->chat, buf, none_prefix,
+                               at_cscb_set_cb, cbd, g_free);
+
+               g_free(buf);
+
+               if (id > 0)
+                       return;
+
+               g_free(cbd);
+       }
 
        CALLBACK_WITH_FAILURE(cb, user_data);
 }
-- 
1.7.4.1

---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris, 
92196 Meudon Cedex, France
Registration Number:  302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono