8:51 a.m.
---
plugins/huawei.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index 0c8d8c0..bff1343 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -205,6 +205,11 @@ static gboolean notify_sim_state(struct ofono_modem *modem,
case HUAWEI_SIM_STATE_INVALID_CS:
case HUAWEI_SIM_STATE_INVALID_PS:
case HUAWEI_SIM_STATE_INVALID_PS_AND_CS:
+ if (data->sim_poll_timeout) {
+ g_source_remove(data->sim_poll_timeout);
+ data->sim_poll_timeout = 0;
+ }
+
/*
* In the "warm start" case the modem skips
* HUAWEI_SIM_STATE_INVALID_OR_LOCKED altogether, so need
--
1.7.3.4
8:51 a.m.
New subject: [PATCH 2/2] huawei: fix SIM state notification when locked
When SIM is locked, huawei modem does not send any notification about
SIM state change because it does not differentiate 'invalid' from
'locked'.
In order to be able to unlock the sim, this patch forces a notification
of a valid state after a timeout.
---
plugins/huawei.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index bff1343..7934956 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -56,6 +56,7 @@
#include <drivers/atmodem/vendor.h>
static const char *none_prefix[] = { NULL };
+static const char *cpin_prefix[] = { "+CPIN:", NULL };
static const char *sysinfo_prefix[] = { "^SYSINFO:", NULL };
static const char *ussdmode_prefix[] = { "^USSDMODE:", NULL };
static const char *cvoice_prefix[] = { "^CVOICE:", NULL };
@@ -226,6 +227,41 @@ static gboolean notify_sim_state(struct ofono_modem *modem,
return FALSE;
}
+static void cpin_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ const char *value;
+ GAtResultIter iter;
+
+ if (!ok)
+ return;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+CPIN:"))
+ return;
+
+ if (!g_at_result_iter_next_unquoted_string(&iter, &value))
+ return;
+
+ /* Force notification of SIM ready because it's in a locked state */
+ if (g_str_has_prefix(value, "SIM"))
+ notify_sim_state(modem, HUAWEI_SIM_STATE_VALID);
+}
+
+static gboolean query_sim_locked(gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct huawei_data *data = ofono_modem_get_data(modem);
+
+ data->sim_poll_timeout = 0;
+
+ g_at_chat_send(data->pcui, "AT+CPIN?", cpin_prefix,
+ cpin_cb, modem, NULL);
+
+ return FALSE;
+}
+
static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data)
{
struct ofono_modem *modem = user_data;
@@ -264,6 +300,10 @@ static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer
user_data)
data->sim_poll_timeout = g_timeout_add_seconds(2,
query_sim_state,
modem);
+ } else if (sim_state == HUAWEI_SIM_STATE_INVALID_OR_LOCKED) {
+ data->sim_poll_timeout = g_timeout_add_seconds(2,
+ query_sim_locked,
+ modem);
}
}
--
1.7.3.4
6:19 a.m.
New subject: [PATCH 2/2] huawei: fix SIM state notification when locked
On Mon, Dec 20, 2010 at 7:51 PM, Lucas De Marchi
<lucas.demarchi(a)profusion.mobi> wrote:
When SIM is locked, huawei modem does not send any notification
about
SIM state change because it does not differentiate 'invalid' from
'locked'.
In order to be able to unlock the sim, this patch forces a notification
of a valid state after a timeout.
---
plugins/huawei.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index bff1343..7934956 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -56,6 +56,7 @@
#include <drivers/atmodem/vendor.h>
static const char *none_prefix[] = { NULL };
+static const char *cpin_prefix[] = { "+CPIN:", NULL };
static const char *sysinfo_prefix[] = { "^SYSINFO:", NULL };
static const char *ussdmode_prefix[] = { "^USSDMODE:", NULL };
static const char *cvoice_prefix[] = { "^CVOICE:", NULL };
@@ -226,6 +227,41 @@ static gboolean notify_sim_state(struct ofono_modem *modem,
return FALSE;
}
+static void cpin_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ const char *value;
+ GAtResultIter iter;
+
+ if (!ok)
+ return;
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+CPIN:"))
+ return;
+
+ if (!g_at_result_iter_next_unquoted_string(&iter, &value))
+ return;
+
+ /* Force notification of SIM ready because it's in a locked state */
+ if (g_str_has_prefix(value, "SIM"))
+ notify_sim_state(modem, HUAWEI_SIM_STATE_VALID);
+}
As I talked to Denis through IRC, this can be simplified. We can cheat
here, not doing all this parsing and only relying on "ok" value. I
tested it with Huawei E220. I'll send another patch.
Lucas De Marchi
6:27 a.m.
New subject: [PATCH] huawei: fix SIM state notification when locked
When SIM is locked, huawei modem does not send any notification about
SIM state change because it does not differentiate 'invalid' from
'locked'.
In order to be able to unlock the sim, this patch forces a notification
of a valid state after a timeout.
---
plugins/huawei.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index bff1343..de45b03 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -226,6 +226,30 @@ static gboolean notify_sim_state(struct ofono_modem *modem,
return FALSE;
}
+static void cpin_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+
+ if (!ok)
+ return;
+
+ /* Force notification of SIM ready because it's in a locked state */
+ notify_sim_state(modem, HUAWEI_SIM_STATE_VALID);
+}
+
+static gboolean query_sim_locked(gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct huawei_data *data = ofono_modem_get_data(modem);
+
+ data->sim_poll_timeout = 0;
+
+ g_at_chat_send(data->pcui, "AT+CPIN?", NULL,
+ cpin_cb, modem, NULL);
+
+ return FALSE;
+}
+
static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data)
{
struct ofono_modem *modem = user_data;
@@ -264,6 +288,10 @@ static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer
user_data)
data->sim_poll_timeout = g_timeout_add_seconds(2,
query_sim_state,
modem);
+ } else if (sim_state == HUAWEI_SIM_STATE_INVALID_OR_LOCKED) {
+ data->sim_poll_timeout = g_timeout_add_seconds(2,
+ query_sim_locked,
+ modem);
}
}
--
1.7.3.4
6:37 a.m.
New subject: [PATCH] huawei: fix SIM state notification when locked
Hi Lucas,
On 12/21/2010 01:27 PM, Lucas De Marchi wrote:
When SIM is locked, huawei modem does not send any notification
about
SIM state change because it does not differentiate 'invalid' from
'locked'.
In order to be able to unlock the sim, this patch forces a notification
of a valid state after a timeout.
---
plugins/huawei.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
Looks good to me. Patch has been applied, thanks.
Regards,
-Denis
4289
days inactive
4290
days old
5 comments
2 participants
participants (2)
-
Denis Kenzior -
Lucas De Marchi