[PATCH] Add vendor quirk for SIMCOM

[PATCH] Add vendor quirk for SIMCOM

[r.r.zaripov]

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

From: Renat Zaripov <r.r.zaripov@gmail.com>

---
 drivers/atmodem/gprs-context.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index 3694c27..0fb63c4 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -208,7 +208,11 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
+	if (gcd->vendor == OFONO_VENDOR_SIMCOM)
+		strcpy(buf, "ATD*99#\0");
+	else
+		sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
+
 	if (g_at_chat_send(gcd->chat, buf, none_prefix,
 				at_cgdata_cb, gc, NULL) > 0)
 		return;
-- 
1.7.10.4

Re: [PATCH] Add vendor quirk for SIMCOM

[Viallard Anthony]

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

On 12. 03. 13 15:40, r.r.zaripov(a)gmail.com wrote:
> From: Renat Zaripov<r.r.zaripov@gmail.com>
>
> ---
>   drivers/atmodem/gprs-context.c |    6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
> index 3694c27..0fb63c4 100644
> --- a/drivers/atmodem/gprs-context.c
> +++ b/drivers/atmodem/gprs-context.c
> @@ -208,7 +208,11 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
>   		return;
>   	}
>
> -	sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
> +	if (gcd->vendor == OFONO_VENDOR_SIMCOM)
> +		strcpy(buf, "ATD*99#\0");
> +	else
> +		sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
> +
>   	if (g_at_chat_send(gcd->chat, buf, none_prefix,
>   				at_cgdata_cb, gc, NULL)>  0)
>   		return;

Hello Renat,

I watched the AT commands set for my SIM5216 and I found AT+CGDATA. 
There isn't this command for sim900 ?

And, I saw "ATD*99#" cryptic command was already used in 
gatchat/gsmdial.c if bluetooth is enabled.

Maybe, it's a specific command for your purpose ? I mean, do you need 
this command to "establish communication between the TE and the network 
using one or more Packet Domain PDP types." ? If it's the case, the 
quirk is only for your device and so, it's not a vendor quirk.
	
Otherwise, why this \0 after ATD*99# ? :)

Regards,
Anthony.

Re: [PATCH] Add vendor quirk for SIMCOM

[Denis Kenzior]

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

Hi Anthony,

> And, I saw "ATD*99#" cryptic command was already used in
> gatchat/gsmdial.c if bluetooth is enabled.
>

This is a legacy operation for entering into data mode.  Refer to 27.007 
Section 10.2.1.1.  It can be used as a shortcut for CGDCONT/CGDATA, and 
it seems that some modems do not implement CGDATA at all.

> Otherwise, why this \0 after ATD*99# ? :)
>

Good spot ;)

Regards,
-Denis

Re: [PATCH] Add vendor quirk for SIMCOM

[Renat Zaripov]

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

Hello Anthony, Denis,

2013/3/12 Denis Kenzior <denkenz@gmail.com>

> Hi Anthony,
>
>  And, I saw "ATD*99#" cryptic command was already used in
>> gatchat/gsmdial.c if bluetooth is enabled.
>>
>>
> This is a legacy operation for entering into data mode.  Refer to 27.007
> Section 10.2.1.1.  It can be used as a shortcut for CGDCONT/CGDATA, and it
> seems that some modems do not implement CGDATA at all.
>
>
Yes, sim900 supports AT+CGDATA command, but unfortunately I can't make it
work. I get no error messages, but the connection is not being established.
I wrote about this issue to SIMCOM, but with my local distributor this is
long story.


>  Otherwise, why this \0 after ATD*99# ? :)
>>
>>
> Good spot ;)
>
>
If I get answer from SIMCOM about AT+CGDATA and make it work properly, I
promise that never send again patch with this funny mistake;)

Anyway, Denis wrote some time ago, we can implement quirks for separating
various models of modem modules of one manufacturer. Like this:

OFONO_VENDOR_SIMCOM_SIM900
OFONO_VENDOR_SIMCOM_SIM5216E


> Regards,
> -Denis
>
> ______________________________**_________________
> ofono mailing list
> ofono(a)ofono.org
> http://lists.ofono.org/**listinfo/ofono<http://lists.ofono.org/listinfo/ofono>
>

[-- Attachment #2: attachment.html --]
[-- Type: text/html, Size: 2349 bytes --]

Re: [PATCH] Add vendor quirk for SIMCOM

[Denis Kenzior]

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

Hi Renat,

On 03/12/2013 09:40 AM, r.r.zaripov(a)gmail.com wrote:
> From: Renat Zaripov<r.r.zaripov@gmail.com>
>
> ---
>   drivers/atmodem/gprs-context.c |    6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
> index 3694c27..0fb63c4 100644
> --- a/drivers/atmodem/gprs-context.c
> +++ b/drivers/atmodem/gprs-context.c
> @@ -208,7 +208,11 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
>   		return;
>   	}
>
> -	sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
> +	if (gcd->vendor == OFONO_VENDOR_SIMCOM)
> +		strcpy(buf, "ATD*99#\0");

The embedded null character is not necessary, strcpy will take care of 
that for you.

> +	else
> +		sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
> +
>   	if (g_at_chat_send(gcd->chat, buf, none_prefix,
>   				at_cgdata_cb, gc, NULL)>  0)
>   		return;

Regards,
-Denis

[PATCH] Add GPRS, mux, volume control support in SIMCOM sim900 modem module

[r.r.zaripov]

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

From: Renat Zaripov <r.r.zaripov@gmail.com>

---
 plugins/sim900.c |  162 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 137 insertions(+), 25 deletions(-)

diff --git a/plugins/sim900.c b/plugins/sim900.c
index 496faa6..f228c0e 100644
--- a/plugins/sim900.c
+++ b/plugins/sim900.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <gatchat.h>
 #include <gattty.h>
+#include <gatmux.h>
 
 #define OFONO_API_SUBJECT_TO_CHANGE
 #include <ofono/plugin.h>
@@ -44,13 +45,28 @@
 #include <ofono/history.h>
 #include <ofono/log.h>
 #include <ofono/voicecall.h>
+#include <ofono/call-volume.h>
 
 #include <drivers/atmodem/vendor.h>
 
+#define NUM_DLC 5
+
+#define SETUP_DLC   0
+#define VOICE_DLC   1
+#define NETREG_DLC  2
+#define SMS_DLC     3
+#define GPRS_DLC    4
+
+
+static char *dlc_prefixes[NUM_DLC] = { "Voice: ", "Net: ", "SMS: ", "GPRS: " , "Setup: "};
+
 static const char *none_prefix[] = { NULL };
 
 struct sim900_data {
-	GAtChat *modem;
+	GIOChannel *device;
+	GAtMux *mux;
+	GAtChat *dlcs[NUM_DLC];
+	guint frame_size;
 };
 
 static int sim900_probe(struct ofono_modem *modem)
@@ -76,7 +92,7 @@ static void sim900_remove(struct ofono_modem *modem)
 
 	ofono_modem_set_data(modem, NULL);
 
-	g_at_chat_unref(data->modem);
+	g_at_chat_unref(data->dlcs[SETUP_DLC]);
 
 	g_free(data);
 }
@@ -91,6 +107,7 @@ static void sim900_debug(const char *str, void *user_data)
 static GAtChat *open_device(struct ofono_modem *modem,
 				const char *key, char *debug)
 {
+	struct sim900_data *data = ofono_modem_get_data(modem);
 	const char *device;
 	GAtSyntax *syntax;
 	GIOChannel *channel;
@@ -119,10 +136,33 @@ static GAtChat *open_device(struct ofono_modem *modem,
 	if (channel == NULL)
 		return NULL;
 
+	data->device = channel;
 	syntax = g_at_syntax_new_gsm_permissive();
 	chat = g_at_chat_new(channel, syntax);
 	g_at_syntax_unref(syntax);
 
+	if (chat == NULL)
+		return NULL;
+
+	if (getenv("OFONO_AT_DEBUG"))
+		g_at_chat_set_debug(chat, sim900_debug, debug);
+
+	return chat;
+}
+
+
+static GAtChat *create_chat(GIOChannel *channel, struct ofono_modem *modem,
+								char *debug)
+{
+	GAtSyntax *syntax;
+	GAtChat *chat;
+
+	if (channel == NULL)
+		return NULL;
+
+	syntax = g_at_syntax_new_gsmv1();
+	chat = g_at_chat_new(channel, syntax);
+	g_at_syntax_unref(syntax);
 	g_io_channel_unref(channel);
 
 	if (chat == NULL)
@@ -134,6 +174,65 @@ static GAtChat *open_device(struct ofono_modem *modem,
 	return chat;
 }
 
+static void setup_internal_mux(struct ofono_modem *modem)
+{
+	struct sim900_data *data = ofono_modem_get_data(modem);
+	int i;
+
+	DBG("");
+
+	data->frame_size = 128;
+
+	data->mux = g_at_mux_new_gsm0710_basic(data->device, data->frame_size);
+	if (data->mux == NULL)
+		goto error;
+
+	if (getenv("OFONO_MUX_DEBUG"))
+		g_at_mux_set_debug(data->mux, sim900_debug, "MUX: ");
+
+	if(!g_at_mux_start(data->mux)) 
+		goto error;
+
+	for (i = 0; i < NUM_DLC; i++) {
+		GIOChannel *channel = g_at_mux_create_channel(data->mux);
+
+		data->dlcs[i] = create_chat(channel, modem, dlc_prefixes[i]);
+		if (data->dlcs[i] == NULL) {
+			ofono_error("Failed to create channel");
+			goto error;
+		}
+	}
+
+	ofono_modem_set_powered(modem, TRUE);
+
+	return;
+
+error:
+	ofono_modem_set_powered(modem, FALSE);
+}
+
+static void mux_setup_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct sim900_data *data = ofono_modem_get_data(modem);
+
+	DBG("");
+
+	g_at_chat_unref(data->dlcs[SETUP_DLC]);
+	data->dlcs[SETUP_DLC] = NULL;
+
+	if (!ok)
+		goto error;
+
+	setup_internal_mux(modem);
+	
+	return;
+	
+error:
+	ofono_modem_set_powered(modem, FALSE);
+}
+
+
 static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -142,11 +241,9 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
 	DBG("");
 
 	if (!ok) {
-		g_at_chat_unref(data->modem);
-		data->modem = NULL;
+		g_at_chat_unref(data->dlcs[SETUP_DLC]);
+		data->dlcs[SETUP_DLC] = NULL;
 	}
-
-	ofono_modem_set_powered(modem, ok);
 }
 
 static int sim900_enable(struct ofono_modem *modem)
@@ -155,21 +252,22 @@ static int sim900_enable(struct ofono_modem *modem)
 
 	DBG("%p", modem);
 
-	data->modem = open_device(modem, "Device", "Device: ");
-	if (data->modem == NULL) {
-		DBG("return -EINVAL");
+	data->dlcs[SETUP_DLC] = open_device(modem, "Device", "Setup: ");
+	if (data->dlcs[SETUP_DLC] == NULL) 
 		return -EINVAL;
-	}
 
-	g_at_chat_send(data->modem, "ATE0", NULL, NULL, NULL, NULL);
+	g_at_chat_send(data->dlcs[SETUP_DLC], "ATE0", NULL, NULL, NULL, NULL);
 
 	/* For obtain correct sms service number */
-	g_at_chat_send(data->modem, "AT+CSCS=\"GSM\"", NULL,
+	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CSCS=\"GSM\"", NULL,
 					NULL, NULL, NULL);
 
-	g_at_chat_send(data->modem, "AT+CFUN=1", none_prefix,
+	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CFUN=1", none_prefix,
 					cfun_enable, modem, NULL);
 
+	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CMUX=0,0,5,128,10,3,30,10,2", 
+		NULL, mux_setup_cb, modem, NULL);
+
 	return -EINPROGRESS;
 }
 
@@ -181,8 +279,8 @@ static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
 
 	DBG("");
 
-	g_at_chat_unref(data->modem);
-	data->modem = NULL;
+	g_at_chat_unref(data->dlcs[SETUP_DLC]);
+	data->dlcs[SETUP_DLC] = NULL;
 
 	if (ok)
 		ofono_modem_set_powered(modem, FALSE);
@@ -194,10 +292,10 @@ static int sim900_disable(struct ofono_modem *modem)
 
 	DBG("%p", modem);
 
-	g_at_chat_cancel_all(data->modem);
-	g_at_chat_unregister_all(data->modem);
+	g_at_chat_cancel_all(data->dlcs[SETUP_DLC]);
+	g_at_chat_unregister_all(data->dlcs[SETUP_DLC]);
 
-	g_at_chat_send(data->modem, "AT+CFUN=4", none_prefix,
+	g_at_chat_send(data->dlcs[SETUP_DLC], "AT+CFUN=4", none_prefix,
 					cfun_disable, modem, NULL);
 
 	return -EINPROGRESS;
@@ -210,9 +308,9 @@ static void sim900_pre_sim(struct ofono_modem *modem)
 
 	DBG("%p", modem);
 
-	ofono_devinfo_create(modem, 0, "atmodem", data->modem);
+	ofono_devinfo_create(modem, 0, "atmodem", data->dlcs[VOICE_DLC]);
 	sim = ofono_sim_create(modem, OFONO_VENDOR_SIMCOM, "atmodem",
-				data->modem);
+				data->dlcs[VOICE_DLC]);
 
 	if (sim)
 		ofono_sim_inserted_notify(sim, TRUE);
@@ -221,12 +319,25 @@ static void sim900_pre_sim(struct ofono_modem *modem)
 static void sim900_post_sim(struct ofono_modem *modem)
 {
 	struct sim900_data *data = ofono_modem_get_data(modem);
+	struct ofono_gprs *gprs;
+	struct ofono_gprs_context *gc;
 
 	DBG("%p", modem);
 
-	ofono_phonebook_create(modem, 0, "atmodem", data->modem);
+	ofono_phonebook_create(modem, 0, "atmodem", data->dlcs[VOICE_DLC]);
 	ofono_sms_create(modem, OFONO_VENDOR_SIMCOM, "atmodem",
-				data->modem);
+				data->dlcs[SMS_DLC]);
+
+	gprs = ofono_gprs_create(modem, 0,		
+					"atmodem", data->dlcs[GPRS_DLC]);
+	if (gprs == NULL)
+		return;
+
+	gc = ofono_gprs_context_create(modem, OFONO_VENDOR_SIMCOM,
+					"atmodem", data->dlcs[GPRS_DLC]);
+	if (gc)
+		ofono_gprs_add_context(gprs, gc);
+
 }
 
 static void sim900_post_online(struct ofono_modem *modem)
@@ -235,9 +346,10 @@ static void sim900_post_online(struct ofono_modem *modem)
 
 	DBG("%p", modem);
 
-	ofono_netreg_create(modem, OFONO_VENDOR_SIMCOM, "atmodem", data->modem);
-	ofono_ussd_create(modem, 0, "atmodem", data->modem);
-	ofono_voicecall_create(modem, 0, "atmodem", data->modem);
+	ofono_netreg_create(modem, OFONO_VENDOR_SIMCOM, "atmodem", data->dlcs[VOICE_DLC]);
+	ofono_ussd_create(modem, 0, "atmodem", data->dlcs[VOICE_DLC]);
+	ofono_voicecall_create(modem, 0, "atmodem", data->dlcs[VOICE_DLC]);
+	ofono_call_volume_create(modem, 0, "atmodem", data->dlcs[VOICE_DLC]);
 }
 
 static struct ofono_modem_driver sim900_driver = {
-- 
1.7.10.4

[PATCH] Add vendor quirk for SIMCOM

[r.r.zaripov]

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

From: Renat Zaripov <r.r.zaripov@gmail.com>

---
 drivers/atmodem/gprs-context.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index 3694c27..c5a0ae7 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -208,7 +208,11 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
+	if (gcd->vendor == OFONO_VENDOR_SIMCOM) 
+		memcpy(buf, "ATD*99#", 7);
+	else
+		sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
+
 	if (g_at_chat_send(gcd->chat, buf, none_prefix,
 				at_cgdata_cb, gc, NULL) > 0)
 		return;
-- 
1.7.10.4

Re: [PATCH] Add vendor quirk for SIMCOM

[Denis Kenzior]

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

Hi Renat,

On 02/28/2013 09:43 AM, r.r.zaripov(a)gmail.com wrote:
> From: Renat Zaripov<r.r.zaripov@gmail.com>
>
> ---
>   drivers/atmodem/gprs-context.c |    6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
> index 3694c27..c5a0ae7 100644
> --- a/drivers/atmodem/gprs-context.c
> +++ b/drivers/atmodem/gprs-context.c
> @@ -208,7 +208,11 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
>   		return;
>   	}
>
> -	sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
> +	if (gcd->vendor == OFONO_VENDOR_SIMCOM)
> +		memcpy(buf, "ATD*99#", 7);

At lease use strcpy, since you're not copying the '\0' here actually.

> +	else
> +		sprintf(buf, "AT+CGDATA=\"PPP\",%u", gcd->active_context);
> +
>   	if (g_at_chat_send(gcd->chat, buf, none_prefix,
>   				at_cgdata_cb, gc, NULL)>  0)
>   		return;

Regards,
-Denis