[PATCH 1/6] phonesim: Don't use VENDOR_PHONESIM for Calypso.

[PATCH 1/6] phonesim: Don't use VENDOR_PHONESIM for Calypso.

[Andrzej Zaborowski]

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

Also move the STK initialisation to post-sim because it is more logical
there (even if it makes no difference under phonesim).

I'm not sure if there's any user of the "calypso" mode in phonesim
driver now, perhaps it can be removed.
---
 plugins/phonesim.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 9c5b2cb..97fa530 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -289,8 +289,6 @@ static void phonesim_pre_sim(struct ofono_modem *modem)
 	else
 		ofono_voicecall_create(modem, 0, "atmodem", data->chat);
 
-	ofono_stk_create(modem, OFONO_VENDOR_PHONESIM, "atmodem", data->chat);
-
 	if (sim)
 		ofono_sim_inserted_notify(sim, TRUE);
 }
@@ -304,6 +302,10 @@ static void phonesim_post_sim(struct ofono_modem *modem)
 
 	DBG("%p", modem);
 
+	if (!data->calypso)
+		ofono_stk_create(modem, OFONO_VENDOR_PHONESIM,
+					"atmodem", data->chat);
+
 	ofono_ussd_create(modem, 0, "atmodem", data->chat);
 	ofono_call_forwarding_create(modem, 0, "atmodem", data->chat);
 	ofono_call_settings_create(modem, 0, "atmodem", data->chat);
-- 
1.7.1.86.g0e460.dirty

[PATCH 2/6] calypso: Check if SIM is present on modem startup.

[Andrzej Zaborowski]

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

Like in case of MBM modem, the SIM slot is not easily accessible
while the device is running so we assume there's no need to check
for SIM presence after startup.
---
 plugins/calypso.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/plugins/calypso.c b/plugins/calypso.c
index 60f3242..7798e10 100644
--- a/plugins/calypso.c
+++ b/plugins/calypso.c
@@ -82,8 +82,11 @@ struct calypso_data {
 	enum powercycle_state state;
 	gboolean phonebook_added;
 	gboolean sms_added;
+	gboolean have_sim;
 };
 
+static const char *cpin_prefix[] = { "+CPIN:", NULL };
+
 static void calypso_debug(const char *str, void *data)
 {
 	guint dlc = GPOINTER_TO_UINT(data);
@@ -217,6 +220,34 @@ static void cfun_set_on_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	ofono_modem_set_powered(modem, ok);
 }
 
+static void simpin_check_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct calypso_data *data = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	/* Modem returns ERROR if there is no SIM in slot. */
+	data->have_sim = ok;
+
+	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CFUN=1", NULL,
+					cfun_set_on_cb, modem, NULL);
+}
+
+static void init_simpin_check(struct ofono_modem *modem)
+{
+	struct calypso_data *data = ofono_modem_get_data(modem);
+
+	/*
+	 * Check for SIM presence by seeing if AT+CPIN? succeeds.
+	 * The SIM can not be practically inserted/removed without
+	 * restarting the device so there's no need to check more
+	 * than once.
+	 */
+	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CPIN?", cpin_prefix,
+			simpin_check_cb, modem, NULL);
+}
+
 static void mux_setup(GAtMux *mux, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -254,8 +285,7 @@ static void mux_setup(GAtMux *mux, gpointer user_data)
 		g_at_chat_set_wakeup_command(data->dlcs[i], "AT\r", 500, 5000);
 	}
 
-	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CFUN=1", NULL,
-					cfun_set_on_cb, modem, NULL);
+	init_simpin_check(modem);
 }
 
 static void modem_initialize(struct ofono_modem *modem)
@@ -437,7 +467,7 @@ static void calypso_pre_sim(struct ofono_modem *modem)
 	sim = ofono_sim_create(modem, 0, "atmodem", data->dlcs[AUX_DLC]);
 	ofono_voicecall_create(modem, 0, "calypsomodem", data->dlcs[VOICE_DLC]);
 
-	if (sim)
+	if (data->have_sim && sim)
 		ofono_sim_inserted_notify(sim, TRUE);
 }
 
-- 
1.7.1.86.g0e460.dirty

[PATCH 3/6] calypsomodem: Add a Calypso STK driver.

[Andrzej Zaborowski]

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

---
 Makefile.am                         |    3 +-
 drivers/calypsomodem/calypsomodem.c |    2 +
 drivers/calypsomodem/calypsomodem.h |    5 +
 drivers/calypsomodem/stk.c          |  277 +++++++++++++++++++++++++++++++++++
 4 files changed, 286 insertions(+), 1 deletions(-)
 create mode 100644 drivers/calypsomodem/stk.c

diff --git a/Makefile.am b/Makefile.am
index b64ce8e..8d1d2c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,7 +169,8 @@ builtin_modules += calypsomodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/calypsomodem/calypsomodem.h \
 			drivers/calypsomodem/calypsomodem.c \
-			drivers/calypsomodem/voicecall.c
+			drivers/calypsomodem/voicecall.c \
+			drivers/calypsomodem/stk.c
 
 builtin_modules += hfpmodem
 builtin_sources += drivers/atmodem/atutil.h \
diff --git a/drivers/calypsomodem/calypsomodem.c b/drivers/calypsomodem/calypsomodem.c
index 8cd213e..2ae436a 100644
--- a/drivers/calypsomodem/calypsomodem.c
+++ b/drivers/calypsomodem/calypsomodem.c
@@ -35,12 +35,14 @@
 static int calypsomodem_init(void)
 {
 	calypso_voicecall_init();
+	calypso_stk_init();
 
 	return 0;
 }
 
 static void calypsomodem_exit(void)
 {
+	calypso_stk_exit();
 	calypso_voicecall_exit();
 }
 
diff --git a/drivers/calypsomodem/calypsomodem.h b/drivers/calypsomodem/calypsomodem.h
index 80af134..2afc6c3 100644
--- a/drivers/calypsomodem/calypsomodem.h
+++ b/drivers/calypsomodem/calypsomodem.h
@@ -20,6 +20,11 @@
  */
 
 #include <drivers/atmodem/atutil.h>
+#include <modem.h>
+#include <stk.h>
 
 extern void calypso_voicecall_init();
 extern void calypso_voicecall_exit();
+
+extern void calypso_stk_init();
+extern void calypso_stk_exit();
diff --git a/drivers/calypsomodem/stk.c b/drivers/calypsomodem/stk.c
new file mode 100644
index 0000000..67472da
--- /dev/null
+++ b/drivers/calypsomodem/stk.c
@@ -0,0 +1,277 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2010  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/stk.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "calypsomodem.h"
+
+struct stk_data {
+	GAtChat *chat;
+};
+
+static const char *sate_prefix[] = { "%SATE:", NULL };
+static const char *none_prefix[] = { NULL };
+
+static void calypso_sate_cb(gboolean ok, GAtResult *result,
+				gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_stk_envelope_cb_t cb = cbd->cb;
+	GAtResultIter iter;
+	struct ofono_error error;
+	const guint8 *pdu = { 0 };
+	gint len = 0;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	/*
+	 * Ignore errors "SIM memory failure" and "Unknown error", seem
+	 * to be generated for no reason.
+	 */
+	if (!ok && error.type == OFONO_ERROR_TYPE_CMS && error.error == 320) {
+		ok = TRUE;
+		error.type = OFONO_ERROR_TYPE_NO_ERROR;
+	}
+	if (!ok && error.type == OFONO_ERROR_TYPE_CME && error.error == 100) {
+		ok = TRUE;
+		error.type = OFONO_ERROR_TYPE_NO_ERROR;
+	}
+
+	if (!ok) {
+		cb(&error, NULL, 0, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (g_at_result_iter_next(&iter, "%SATE:"))
+		if (g_at_result_iter_next_hexstring(&iter, &pdu, &len) == FALSE)
+			goto error;
+
+	cb(&error, pdu, len, cbd->data);
+	return;
+
+error:
+	CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
+}
+
+static void calypso_stk_envelope(struct ofono_stk *stk, int length,
+				const unsigned char *command,
+				ofono_stk_envelope_cb_t cb, void *data)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	char *buf = g_try_new(char, 64 + length * 2);
+	int len, ret;
+
+	if (!cbd || !buf)
+		goto error;
+
+	len = sprintf(buf, "AT%%SATE=\"");
+	for (; length; length--)
+		len += sprintf(buf + len, "%02hhX", *command++);
+	len += sprintf(buf + len, "\"");
+
+	ret = g_at_chat_send(sd->chat, buf, sate_prefix,
+				calypso_sate_cb, cbd, g_free);
+
+	g_free(buf);
+	buf = NULL;
+
+	if (ret > 0)
+		return;
+
+error:
+	g_free(buf);
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
+}
+
+static void calypso_satr_cb(gboolean ok, GAtResult *result,
+				gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_stk_generic_cb_t cb = cbd->cb;
+	struct ofono_error error;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+	cb(&error, cbd->data);
+}
+
+static void calypso_stk_terminal_response(struct ofono_stk *stk, int length,
+				const unsigned char *command,
+				ofono_stk_generic_cb_t cb, void *data)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	char *buf = g_try_new(char, 64 + length * 2);
+	int len, ret;
+
+	if (!cbd || !buf)
+		goto error;
+
+	len = sprintf(buf, "AT%%SATR=\"");
+	for (; length; length--)
+		len += sprintf(buf + len, "%02hhX", *command++);
+	len += sprintf(buf + len, "\"");
+
+	ret = g_at_chat_send(sd->chat, buf, none_prefix,
+				calypso_satr_cb, cbd, g_free);
+
+	g_free(buf);
+	buf = NULL;
+
+	if (ret > 0)
+		return;
+
+error:
+	g_free(buf);
+	g_free(cbd);
+
+	CALLBACK_WITH_FAILURE(cb, data);
+}
+
+static void sati_notify(GAtResult *result, gpointer user_data)
+{
+	struct ofono_stk *stk = user_data;
+	GAtResultIter iter;
+	const guint8 *pdu;
+	gint len;
+	gboolean ret;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "%SATI:"))
+		return;
+
+	ret = g_at_result_iter_next_hexstring(&iter, &pdu, &len);
+	if (!ret || len == 0) {
+		/*
+		 * An empty notification is a End Session notification on
+		 * the part of the UICC.
+		 */
+		ofono_stk_proactive_session_end_notify(stk);
+
+		return;
+	}
+
+	ofono_stk_proactive_command_notify(stk, len, pdu);
+}
+
+static void sata_notify(GAtResult *result, gpointer user_data)
+{
+	/* TODO: Pending call alert */
+}
+
+static void satn_notify(GAtResult *result, gpointer user_data)
+{
+	/*
+	 * Proactive command has been handled by the modem.  Should
+	 * the core be notified?  For now we just ignore it because
+	 * we must not respond to the command.
+	 */
+}
+
+static void calypso_stk_register(gboolean ok,
+		GAtResult *result, gpointer user_data)
+{
+	struct ofono_stk *stk = user_data;
+	struct stk_data *sd = ofono_stk_get_data(stk);
+
+	if (!ok)
+		return;
+
+	g_at_chat_register(sd->chat, "%SATI:", sati_notify, FALSE, stk, NULL);
+	g_at_chat_register(sd->chat, "%SATA:", sata_notify, FALSE, stk, NULL);
+	g_at_chat_register(sd->chat, "%SATN:", satn_notify, FALSE, stk, NULL);
+
+	ofono_stk_register(stk);
+}
+
+static int calypso_stk_probe(struct ofono_stk *stk,
+		unsigned int vendor, void *data)
+{
+	GAtChat *chat = data;
+	struct stk_data *sd;
+
+	sd = g_new0(struct stk_data, 1);
+	sd->chat = chat;
+
+	ofono_stk_set_data(stk, sd);
+
+	/*
+	 * Provide terminal profile data needed for the download and
+	 * enable %SATI / %SATN.  The actual PROFILE DOWNLOAD will
+	 * happen during AT+CFUN=1 later.
+	 */
+	g_at_chat_send(sd->chat, "AT%SATC=1,\"19E1FFFF0000FF7FFF03FEFF\"",
+			none_prefix, NULL, stk, NULL);
+
+	/* Enable Call Control / SMS Control */
+	g_at_chat_send(sd->chat, "AT%SATCC=1",
+			none_prefix, calypso_stk_register, stk, NULL);
+
+	return 0;
+}
+
+static void calypso_stk_remove(struct ofono_stk *stk)
+{
+	struct stk_data *sd = ofono_stk_get_data(stk);
+
+	ofono_stk_set_data(stk, NULL);
+
+	g_free(sd);
+}
+
+static struct ofono_stk_driver driver = {
+	.name			= "calypsomodem",
+	.probe			= calypso_stk_probe,
+	.remove			= calypso_stk_remove,
+	.envelope		= calypso_stk_envelope,
+	.terminal_response	= calypso_stk_terminal_response,
+};
+
+void calypso_stk_init()
+{
+	ofono_stk_driver_register(&driver);
+}
+
+void calypso_stk_exit()
+{
+	ofono_stk_driver_unregister(&driver);
+}
-- 
1.7.1.86.g0e460.dirty

[PATCH 4/6] calypso: Enable AT extended error codes.

[Andrzej Zaborowski]

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

The STK driver tries to interpret the codes.
---
 plugins/calypso.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/plugins/calypso.c b/plugins/calypso.c
index 7798e10..5367684 100644
--- a/plugins/calypso.c
+++ b/plugins/calypso.c
@@ -178,6 +178,8 @@ static void setup_modem(struct ofono_modem *modem)
 		g_at_chat_send(data->dlcs[i], "ATE0", NULL, NULL, NULL, NULL);
 		g_at_chat_send(data->dlcs[i], "AT%CUNS=0",
 				NULL, NULL, NULL, NULL);
+		g_at_chat_send(data->dlcs[i], "AT+CMEE=1",
+				NULL, NULL, NULL, NULL);
 	}
 
 	/* CSTAT tells us when SMS & Phonebook are ready to be used */
-- 
1.7.1.86.g0e460.dirty

Re: [PATCH 1/6] phonesim: Don't use VENDOR_PHONESIM for Calypso.

[Denis Kenzior]

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

Hi Andrew,

On 08/05/2010 12:30 PM, Andrzej Zaborowski wrote:
> Also move the STK initialisation to post-sim because it is more logical
> there (even if it makes no difference under phonesim).
> 
> I'm not sure if there's any user of the "calypso" mode in phonesim
> driver now, perhaps it can be removed.

Could you please do me a favor and put 'comment' paragraphs in the
git-send-email block specifically designated for this?  These are fairly
context specific questions and make no sense to be included in the
commit history.  I have to git --amend and take them out manually.

To answer your question, we use 'calypso' driver for phonesim when using
the Freerunner modem over TCP.  This way oFono can be quickly run and
tested without the need to cross-compile.  This part is still useful in
certain circumstances, so it is safe to leave it in for now...

All patches in this series have been applied.

Regards,
-Denis

Re: [PATCH 3/6] calypsomodem: Add a Calypso STK driver.

[Denis Kenzior]

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

Hi Andrew,

> diff --git a/drivers/calypsomodem/calypsomodem.h b/drivers/calypsomodem/calypsomodem.h
> index 80af134..2afc6c3 100644
> --- a/drivers/calypsomodem/calypsomodem.h
> +++ b/drivers/calypsomodem/calypsomodem.h
> @@ -20,6 +20,11 @@
>   */
>  
>  #include <drivers/atmodem/atutil.h>
> +#include <modem.h>
> +#include <stk.h>

I removed these includes in a later commit as they didn't seem necessary.

Regards,
-Denis

Re: [PATCH 3/6] calypsomodem: Add a Calypso STK driver.

[Andrzej Zaborowski]

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

On 6 August 2010 19:19, Denis Kenzior <denkenz@gmail.com> wrote:
>> +#include <modem.h>
>> +#include <stk.h>
>
> I removed these includes in a later commit as they didn't seem necessary.

Thanks for catching this, they were leftovers from the previous
version where I had a "inject %SATI" additional call.

Regards,
Andrew