Re: [PATCH v2] atmodem: Query the list of supported s from the modem

2017-10-23 Thread Slava Monich 

On 23/10/17 23:33, Denis Kenzior wrote:

Hi Slava,

On 10/23/2017 03:21 PM, Slava Monich wrote:

Not all modems support all s (particularly, "PS"), let's be polite
and not ask them for the ones they don't support.
---
  drivers/atmodem/sim.c | 57 
---

  1 file changed, 45 insertions(+), 12 deletions(-)



drivers/atmodem/sim.c: In function ‘at_clck_query_cb’:
drivers/atmodem/sim.c:1593:17: error: comparison between signed and 
unsigned integer expressions [-Werror=sign-compare]

   for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++) {
 ^
drivers/atmodem/sim.c: In function ‘at_sim_probe’:
drivers/atmodem/sim.c:1623:16: error: comparison between signed and 
unsigned integer expressions [-Werror=sign-compare]

  for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++)


Apparently we are using slightly different compilers. Will fix.

-Slava
___
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono

Re: [PATCH v2] atmodem: Query the list of supported s from the modem

2017-10-23 Thread Denis Kenzior 

Hi Slava,

On 10/23/2017 03:21 PM, Slava Monich wrote:

Not all modems support all s (particularly, "PS"), let's be polite
and not ask them for the ones they don't support.
---
  drivers/atmodem/sim.c | 57 ---
  1 file changed, 45 insertions(+), 12 deletions(-)



drivers/atmodem/sim.c: In function ‘at_clck_query_cb’:
drivers/atmodem/sim.c:1593:17: error: comparison between signed and 
unsigned integer expressions [-Werror=sign-compare]

   for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++) {
 ^
drivers/atmodem/sim.c: In function ‘at_sim_probe’:
drivers/atmodem/sim.c:1623:16: error: comparison between signed and 
unsigned integer expressions [-Werror=sign-compare]

  for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++)
^
drivers/atmodem/sim.c: At top level:
cc1: error: unrecognized command line option ‘-Wno-format-truncation’ 
[-Werror]



Regards,
-Denis
___
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono

[PATCH v2] atmodem: Query the list of supported s from the modem

2017-10-23 Thread Slava Monich 
Not all modems support all s (particularly, "PS"), let's be polite
and not ask them for the ones they don't support.
---
 drivers/atmodem/sim.c | 57 ---
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 6395a04..06bfb90 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -51,6 +51,7 @@ struct sim_data {
GAtChat *chat;
unsigned int vendor;
guint ready_id;
+   guint passwd_type_mask;
struct at_util_sim_state_query *sim_state_query;
 };
 
@@ -1459,9 +1460,8 @@ static void at_pin_enable(struct ofono_sim *sim,
struct cb_data *cbd = cb_data_new(cb, data);
char buf[64];
int ret;
-   unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-   if (passwd_type >= len || at_clck_cpwd_fac[passwd_type] == NULL)
+   if (!(sd->passwd_type_mask & (1 << passwd_type)))
goto error;
 
snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",%i,\"%s\"",
@@ -1490,10 +1490,8 @@ static void at_change_passwd(struct ofono_sim *sim,
struct cb_data *cbd = cb_data_new(cb, data);
char buf[64];
int ret;
-   unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-   if (passwd_type >= len ||
-   at_clck_cpwd_fac[passwd_type] == NULL)
+   if (!(sd->passwd_type_mask & (1 << passwd_type)))
goto error;
 
snprintf(buf, sizeof(buf), "AT+CPWD=\"%s\",\"%s\",\"%s\"",
@@ -1550,9 +1548,8 @@ static void at_query_clck(struct ofono_sim *sim,
struct sim_data *sd = ofono_sim_get_data(sim);
struct cb_data *cbd = cb_data_new(cb, data);
char buf[64];
-   unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-   if (passwd_type >= len || at_clck_cpwd_fac[passwd_type] == NULL)
+   if (!(sd->passwd_type_mask & (1 << passwd_type)))
goto error;
 
snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",2",
@@ -1568,13 +1565,42 @@ error:
CALLBACK_WITH_FAILURE(cb, -1, data);
 }
 
-static gboolean at_sim_register(gpointer user)
+static void at_clck_query_cb(gboolean ok, GAtResult *result, gpointer user)
 {
struct ofono_sim *sim = user;
+   struct sim_data *sd = ofono_sim_get_data(sim);
+   GAtResultIter iter;
+   const char *fac;
 
-   ofono_sim_register(sim);
+   if (!ok)
+   goto done;
+
+   g_at_result_iter_init(, result);
+
+   /* e.g. +CLCK: ("SC","FD","PN","PU","PP","PC","PF") */
+   if (!g_at_result_iter_next(, "+CLCK:") ||
+   !g_at_result_iter_open_list())
+   goto done;
+
+   /* Clear the default mask */
+   sd->passwd_type_mask = 0;
 
-   return FALSE;
+   /* Set the bits for s that are actually supported */
+   while (g_at_result_iter_next_string(, )) {
+   int i;
+
+   /* Find it in the list of known s */
+   for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++) {
+   if (!g_strcmp0(at_clck_cpwd_fac[i], fac)) {
+   sd->passwd_type_mask |= (1 << i);
+   DBG("found %s", fac);
+   break;
+   }
+   }
+   }
+
+done:
+   ofono_sim_register(sim);
 }
 
 static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
@@ -1582,6 +1608,7 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned 
int vendor,
 {
GAtChat *chat = data;
struct sim_data *sd;
+   int i;
 
sd = g_new0(struct sim_data, 1);
sd->chat = g_at_chat_clone(chat);
@@ -1591,9 +1618,15 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned 
int vendor,
g_at_chat_send(sd->chat, "AT*EPEE=1", NULL, NULL, NULL, NULL);
 
ofono_sim_set_data(sim, sd);
-   g_idle_add(at_sim_register, sim);
 
-   return 0;
+   /* s supported by default */
+   for (i = 0; i < ARRAY_SIZE(at_clck_cpwd_fac); i++)
+   if (at_clck_cpwd_fac[i])
+   sd->passwd_type_mask |= (1 << i);
+
+   /* Query supported s */
+   return g_at_chat_send(sd->chat, "AT+CLCK=?", clck_prefix,
+   at_clck_query_cb, sim, NULL) ? 0 : -1;
 }
 
 static void at_sim_remove(struct ofono_sim *sim)
-- 
1.9.1

___
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono