Hi Bertrand,
> 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;
> + }
so we already have a vendor switch statement a few lines above. Why
bother introducing another one here?
> +
> + 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);
So this is not going to work out as nicely as you might think it would.
You keep calling ofono_cbs_set_cb_t callback now for every single topic
you send. And also as a result, the D-Bus call returns successful after
the first one.
You need to properly queue this and properly fail and roll back in case
of a failure.
I addition to that, I would prefer to send as many topics at once as
possible. So how many can ZTE set at once?
Regards
Marcel
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
