[PATCH 3/8] sim: support PIN retry counters for telit modems

[PATCH 3/8] sim: support PIN retry counters for telit modems

[Christopher Vogl]

[-- Attachment #1: Type: text/plain, Size: 4280 bytes --]

From: August Mayer <august.mayer@hale.at>

---
 drivers/atmodem/sim.c |   57 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/sim.h         |    2 +
 src/sim.c             |    8 +++++++
 3 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 7b48cd9..81f4416 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -65,6 +65,7 @@ static const char *oercn_prefix[] = { "_OERCN:", NULL };
 static const char *cpinr_prefixes[] = { "+CPINR:", "+CPINRE:", NULL };
 static const char *epin_prefix[] = { "*EPIN:", NULL };
 static const char *spic_prefix[] = { "+SPIC:", NULL };
+static const char *pct_prefix[] = { "#PCT:", NULL };
 static const char *none_prefix[] = { NULL };
 
 static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -841,12 +842,63 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }
 
+#define AT_PCT_SET_RETRIES(retries, pin_type, value) \
+	retries[pin_type] = value; \
+	DBG("retry counter id=%d, val=%d", pin_type, value);
+
+static void at_pct_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_pin_retries_cb_t cb = cbd->cb;
+	struct ofono_sim *sim = cbd->user;
+	const char *final = g_at_result_final_response(result);
+	GAtResultIter iter;
+	struct ofono_error error;
+	int retries[OFONO_SIM_PASSWORD_INVALID];
+	size_t i;
+
+	decode_at_error(&error, final);
+
+	if (!ok) {
+		cb(&error, NULL, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
+		retries[i] = -1;
+
+	enum ofono_sim_password_type pin_type = ofono_sim_get_password_type(sim);
+	if (pin_type == OFONO_SIM_PASSWORD_NONE) {
+		DBG("Note: No password required, returning maximum retries:");
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN, 3);
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN2, 3);
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK, 10);
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK2, 10);
+
+	} else if (g_at_result_iter_next(&iter, "#PCT:") &&
+			g_at_result_iter_next_number(&iter, &retries[pin_type])) {
+		DBG("retry counter id=%d, val=%d", pin_type, retries[pin_type]);
+	}
+	else
+		goto error;
+
+	cb(&error, retries, cbd->data);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+}
+
 static void at_pin_retries_query(struct ofono_sim *sim,
 					ofono_sim_pin_retries_cb_t cb,
 					void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
+	cbd->user = sim;	
 
 	DBG("");
 
@@ -891,6 +943,11 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 					at_spic_cb, cbd, g_free) > 0)
 			return;
 		break;
+	case OFONO_VENDOR_TELIT:
+		if (g_at_chat_send(sd->chat, "AT#PCT", pct_prefix,
+					at_pct_cb, cbd, g_free) > 0)
+			return;
+		break;
 	default:
 		if (g_at_chat_send(sd->chat, "AT+CPINR", cpinr_prefixes,
 					at_cpinr_cb, cbd, g_free) > 0)
diff --git a/include/sim.h b/include/sim.h
index 508ff24..3e5797c 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -189,6 +189,8 @@ enum ofono_sim_phase ofono_sim_get_phase(struct ofono_sim *sim);
 enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim);
 const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim);
 
+enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim);
+
 unsigned int ofono_sim_add_state_watch(struct ofono_sim *sim,
 					ofono_sim_state_event_cb_t cb,
 					void *data, ofono_destroy_func destroy);
diff --git a/src/sim.c b/src/sim.c
index 4384eb0..8059d2b 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2243,6 +2243,14 @@ enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim)
 	return sim->cphs_phase;
 }
 
+enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim)
+{
+	if (sim == NULL)
+		return OFONO_SIM_PASSWORD_NONE;
+
+	return sim->pin_type;
+}
+
 const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim)
 {
 	if (sim == NULL)
-- 
1.7.7.6


--
Scanned by MailScanner.

Re: [PATCH 3/8] sim: support PIN retry counters for telit modems

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 5261 bytes --]

Hi Christopher/August,

On 08/13/2012 08:21 AM, Christopher Vogl wrote:
> From: August Mayer<august.mayer@hale.at>
>
> ---
>   drivers/atmodem/sim.c |   57 +++++++++++++++++++++++++++++++++++++++++++++++++
>   include/sim.h         |    2 +
>   src/sim.c             |    8 +++++++
>   3 files changed, 67 insertions(+), 0 deletions(-)
>

If you want to do it this way, then please separate this into three 
patches.  One for include/sim.h, one for src/sim.c and one for the 
driver part.

> diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
> index 7b48cd9..81f4416 100644
> --- a/drivers/atmodem/sim.c
> +++ b/drivers/atmodem/sim.c
> @@ -65,6 +65,7 @@ static const char *oercn_prefix[] = { "_OERCN:", NULL };
>   static const char *cpinr_prefixes[] = { "+CPINR:", "+CPINRE:", NULL };
>   static const char *epin_prefix[] = { "*EPIN:", NULL };
>   static const char *spic_prefix[] = { "+SPIC:", NULL };
> +static const char *pct_prefix[] = { "#PCT:", NULL };
>   static const char *none_prefix[] = { NULL };
>
>   static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
> @@ -841,12 +842,63 @@ error:
>   	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
>   }
>
> +#define AT_PCT_SET_RETRIES(retries, pin_type, value) \
> +	retries[pin_type] = value; \
> +	DBG("retry counter id=%d, val=%d", pin_type, value);
> +
> +static void at_pct_cb(gboolean ok, GAtResult *result, gpointer user_data)
> +{
> +	struct cb_data *cbd = user_data;
> +	ofono_sim_pin_retries_cb_t cb = cbd->cb;
> +	struct ofono_sim *sim = cbd->user;
> +	const char *final = g_at_result_final_response(result);
> +	GAtResultIter iter;
> +	struct ofono_error error;
> +	int retries[OFONO_SIM_PASSWORD_INVALID];
> +	size_t i;
> +
> +	decode_at_error(&error, final);
> +
> +	if (!ok) {
> +		cb(&error, NULL, cbd->data);
> +		return;
> +	}
> +
> +	g_at_result_iter_init(&iter, result);
> +
> +	for (i = 0; i<  OFONO_SIM_PASSWORD_INVALID; i++)
> +		retries[i] = -1;
> +
> +	enum ofono_sim_password_type pin_type = ofono_sim_get_password_type(sim);
> +	if (pin_type == OFONO_SIM_PASSWORD_NONE) {
> +		DBG("Note: No password required, returning maximum retries:");
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN, 3);
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN2, 3);
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK, 10);
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK2, 10);
> +

You probably should just use a goto to skip ahead to the callback here. 
  Also, the whitespace above is unnecessary.

> +	} else if (g_at_result_iter_next(&iter, "#PCT:")&&
> +			g_at_result_iter_next_number(&iter,&retries[pin_type])) {
> +		DBG("retry counter id=%d, val=%d", pin_type, retries[pin_type]);
> +	}
> +	else
> +		goto error;

The braces around the else if are not necessary since you have a single 
statement there.  Also else should be on the same line as the closing 
brace.  But nevermind, I'd rather see this part written like:

if (g_at_result_iter_next(&iter, "#PCT:") == FALSE)
	goto error;

if (g_at_result_iter_next_number(&iter, &retries[pin_type]) == FALSE)
	goto error;

DBG(...)

> +
> +	cb(&error, retries, cbd->data);
> +
> +	return;
> +
> +error:
> +	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
> +}
> +
>   static void at_pin_retries_query(struct ofono_sim *sim,
>   					ofono_sim_pin_retries_cb_t cb,
>   					void *data)
>   {
>   	struct sim_data *sd = ofono_sim_get_data(sim);
>   	struct cb_data *cbd = cb_data_new(cb, data);
> +	cbd->user = sim;	
>
>   	DBG("");
>
> @@ -891,6 +943,11 @@ static void at_pin_retries_query(struct ofono_sim *sim,
>   					at_spic_cb, cbd, g_free)>  0)
>   			return;
>   		break;
> +	case OFONO_VENDOR_TELIT:
> +		if (g_at_chat_send(sd->chat, "AT#PCT", pct_prefix,
> +					at_pct_cb, cbd, g_free)>  0)
> +			return;
> +		break;
>   	default:
>   		if (g_at_chat_send(sd->chat, "AT+CPINR", cpinr_prefixes,
>   					at_cpinr_cb, cbd, g_free)>  0)
> diff --git a/include/sim.h b/include/sim.h
> index 508ff24..3e5797c 100644
> --- a/include/sim.h
> +++ b/include/sim.h
> @@ -189,6 +189,8 @@ enum ofono_sim_phase ofono_sim_get_phase(struct ofono_sim *sim);
>   enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim);
>   const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim);
>
> +enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim);
> +
>   unsigned int ofono_sim_add_state_watch(struct ofono_sim *sim,
>   					ofono_sim_state_event_cb_t cb,
>   					void *data, ofono_destroy_func destroy);
> diff --git a/src/sim.c b/src/sim.c
> index 4384eb0..8059d2b 100644
> --- a/src/sim.c
> +++ b/src/sim.c
> @@ -2243,6 +2243,14 @@ enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim)
>   	return sim->cphs_phase;
>   }
>
> +enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim)
> +{
> +	if (sim == NULL)
> +		return OFONO_SIM_PASSWORD_NONE;
> +
> +	return sim->pin_type;
> +}
> +
>   const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim)
>   {
>   	if (sim == NULL)

Regards,
-Denis

Re: [PATCH 1/3] sim: add function to get password type

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

Hi Christopher/August,

On 08/16/2012 02:37 AM, Christopher Vogl wrote:
> From: August Mayer<august.mayer@hale.at>
>
> ---
>   include/sim.h |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 2/3] sim: implement function to get password type

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

Hi Christopher/August,

On 08/16/2012 02:37 AM, Christopher Vogl wrote:
> From: August Mayer<august.mayer@hale.at>
>
> ---
>   src/sim.c |    8 ++++++++
>   1 files changed, 8 insertions(+), 0 deletions(-)
>

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 3/3] sim: support PIN retry counters for telit modems

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

Hi Christopher/August,

On 08/16/2012 02:37 AM, Christopher Vogl wrote:
> From: August Mayer<august.mayer@hale.at>
>
> ---
>   drivers/atmodem/sim.c |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
>   1 files changed, 61 insertions(+), 0 deletions(-)
>

Patch has been applied, however it had 3 trailing whitespace violations. 
  I had to edit it manually for it to apply.

Please configure your editor appropriately and add:
[apply]
         whitespace = error

to your .git/config.  It always doesn't hurt to test-apply your patches 
before submission.

Also:

<snip>

> +	enum ofono_sim_password_type pin_type = ofono_sim_get_password_type(sim);

We still prefer C90 syntax for variable declarations, so I had to fix 
this in a follow-on commit.

> +	if (pin_type == OFONO_SIM_PASSWORD_NONE) {
> +		DBG("Note: No password required, returning maximum retries:");
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN, 3);
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN2, 3);
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK, 10);
> +		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK2, 10);
> +		goto callback;
> +	}
> +

Regards,
-Denis

[PATCH 1/3] sim: add function to get password type

[Christopher Vogl]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

From: August Mayer <august.mayer@hale.at>

---
 include/sim.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/sim.h b/include/sim.h
index 508ff24..3e5797c 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -189,6 +189,8 @@ enum ofono_sim_phase ofono_sim_get_phase(struct ofono_sim *sim);
 enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim);
 const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim);
 
+enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim);
+
 unsigned int ofono_sim_add_state_watch(struct ofono_sim *sim,
 					ofono_sim_state_event_cb_t cb,
 					void *data, ofono_destroy_func destroy);
-- 
1.7.7.6


--
Scanned by MailScanner.

[PATCH 2/3] sim: implement function to get password type

[Christopher Vogl]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

From: August Mayer <august.mayer@hale.at>

---
 src/sim.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/sim.c b/src/sim.c
index 4384eb0..8059d2b 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2243,6 +2243,14 @@ enum ofono_sim_cphs_phase ofono_sim_get_cphs_phase(struct ofono_sim *sim)
 	return sim->cphs_phase;
 }
 
+enum ofono_sim_password_type ofono_sim_get_password_type(struct ofono_sim *sim)
+{
+	if (sim == NULL)
+		return OFONO_SIM_PASSWORD_NONE;
+
+	return sim->pin_type;
+}
+
 const unsigned char *ofono_sim_get_cphs_service_table(struct ofono_sim *sim)
 {
 	if (sim == NULL)
-- 
1.7.7.6


--
Scanned by MailScanner.

[PATCH 3/3] sim: support PIN retry counters for telit modems

[Christopher Vogl]

[-- Attachment #1: Type: text/plain, Size: 3151 bytes --]

From: August Mayer <august.mayer@hale.at>

---
 drivers/atmodem/sim.c |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 7b48cd9..8823ee7 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -65,6 +65,7 @@ static const char *oercn_prefix[] = { "_OERCN:", NULL };
 static const char *cpinr_prefixes[] = { "+CPINR:", "+CPINRE:", NULL };
 static const char *epin_prefix[] = { "*EPIN:", NULL };
 static const char *spic_prefix[] = { "+SPIC:", NULL };
+static const char *pct_prefix[] = { "#PCT:", NULL };
 static const char *none_prefix[] = { NULL };
 
 static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -841,12 +842,67 @@ error:
 	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
 }
 
+#define AT_PCT_SET_RETRIES(retries, pin_type, value) \
+	retries[pin_type] = value; \
+	DBG("retry counter id=%d, val=%d", pin_type, value);
+	
+static void at_pct_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_pin_retries_cb_t cb = cbd->cb;
+	struct ofono_sim *sim = cbd->user;
+	const char *final = g_at_result_final_response(result);
+	GAtResultIter iter;
+	struct ofono_error error;
+	int retries[OFONO_SIM_PASSWORD_INVALID];
+	size_t i;
+
+	decode_at_error(&error, final);
+
+	if (!ok) {
+		cb(&error, NULL, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
+		retries[i] = -1;
+
+	enum ofono_sim_password_type pin_type = ofono_sim_get_password_type(sim);
+	if (pin_type == OFONO_SIM_PASSWORD_NONE) {
+		DBG("Note: No password required, returning maximum retries:");
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN, 3);
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PIN2, 3);
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK, 10);
+		AT_PCT_SET_RETRIES(retries, OFONO_SIM_PASSWORD_SIM_PUK2, 10);
+		goto callback;
+	}
+
+	if (g_at_result_iter_next(&iter, "#PCT:") == FALSE)
+		goto error;
+	
+	if (g_at_result_iter_next_number(&iter, &retries[pin_type]) == FALSE)
+		goto error; 
+
+	DBG("retry counter id=%d, val=%d", pin_type, retries[pin_type]);
+
+callback:
+	cb(&error, retries, cbd->data);
+
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
+}
+
 static void at_pin_retries_query(struct ofono_sim *sim,
 					ofono_sim_pin_retries_cb_t cb,
 					void *data)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
+	cbd->user = sim;
 
 	DBG("");
 
@@ -891,6 +947,11 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 					at_spic_cb, cbd, g_free) > 0)
 			return;
 		break;
+	case OFONO_VENDOR_TELIT:
+		if (g_at_chat_send(sd->chat, "AT#PCT", pct_prefix,
+					at_pct_cb, cbd, g_free) > 0)
+			return;
+		break;
 	default:
 		if (g_at_chat_send(sd->chat, "AT+CPINR", cpinr_prefixes,
 					at_cpinr_cb, cbd, g_free) > 0)
-- 
1.7.7.6


--
Scanned by MailScanner.