r2728 - in trunk/src/target/gsm: include/gsmd src/gsmd

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-08-17 10:34:29 +0200 (Fri, 17 Aug 2007)
New Revision: 2728

Modified:
   trunk/src/target/gsm/include/gsmd/vendorplugin.h
   trunk/src/target/gsm/src/gsmd/atcmd.c
   trunk/src/target/gsm/src/gsmd/vendor_qc.c
   trunk/src/target/gsm/src/gsmd/vendor_ti.c
   trunk/src/target/gsm/src/gsmd/vendor_tihtc.c
Log:
Use vendor specific ext_chars.


Modified: trunk/src/target/gsm/include/gsmd/vendorplugin.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/vendorplugin.h	2007-08-17 08:33:56 UTC (rev 2727)
+++ trunk/src/target/gsm/include/gsmd/vendorplugin.h	2007-08-17 08:34:29 UTC (rev 2728)
@@ -12,6 +12,7 @@
 struct gsmd_vendor_plugin {
 	struct llist_head list;
 	unsigned char *name;
+	unsigned char *ext_chars;
 	unsigned int num_unsolicit;
 	const struct gsmd_unsolicit *unsolicit;
 	int (*detect)(struct gsmd *g);

Modified: trunk/src/target/gsm/src/gsmd/atcmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/atcmd.c	2007-08-17 08:33:56 UTC (rev 2727)
+++ trunk/src/target/gsm/src/gsmd/atcmd.c	2007-08-17 08:34:29 UTC (rev 2728)
@@ -237,7 +237,7 @@
 	 *    TBD
 	 */
 
-	if (buf[0] == '+' || buf[0] == '%') {
+	if (buf[0] == '+' || strchr(g->vendorpl->ext_chars, buf[0])) {
 		/* an extended response */
 		const char *colon = strchr(buf, ':');
 		if (!colon) {
@@ -293,7 +293,7 @@
 		}
 
 		if (cmd) {
-			if (cmd->buf[2] != '+' && cmd->buf[2] != '%') {
+			if (cmd->buf[2] != '+' && strchr(g->vendorpl->ext_chars, cmd->buf[2]) == NULL) {
 				gsmd_log(GSMD_ERROR, "extd reply to non-extd command?\n");
 				return -EINVAL;
 			}

Modified: trunk/src/target/gsm/src/gsmd/vendor_qc.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_qc.c	2007-08-17 08:33:56 UTC (rev 2727)
+++ trunk/src/target/gsm/src/gsmd/vendor_qc.c	2007-08-17 08:34:29 UTC (rev 2728)
@@ -100,6 +100,7 @@
 
 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
 	.name = "Qualcomm msm6250",
+	.ext_chars = "@",
 	.num_unsolicit = ARRAY_SIZE(qc_unsolicit),
 	.unsolicit = qc_unsolicit,
 	.detect = &qc_detect,

Modified: trunk/src/target/gsm/src/gsmd/vendor_ti.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_ti.c	2007-08-17 08:33:56 UTC (rev 2727)
+++ trunk/src/target/gsm/src/gsmd/vendor_ti.c	2007-08-17 08:34:29 UTC (rev 2728)
@@ -303,6 +303,7 @@
 
 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
 	.name = "TI Calypso",
+	.ext_chars = "%@",
 	.num_unsolicit = ARRAY_SIZE(ticalypso_unsolicit),
 	.unsolicit = ticalypso_unsolicit,
 	.detect = &ticalypso_detect,

Modified: trunk/src/target/gsm/src/gsmd/vendor_tihtc.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_tihtc.c	2007-08-17 08:33:56 UTC (rev 2727)
+++ trunk/src/target/gsm/src/gsmd/vendor_tihtc.c	2007-08-17 08:34:29 UTC (rev 2728)
@@ -298,6 +298,7 @@
 
 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
 	.name = "TI Calypso / HTC firmware",
+	.ext_chars = "%",
 	.num_unsolicit = ARRAY_SIZE(tihtc_unsolicit),
 	.unsolicit = tihtc_unsolicit,
 	.detect = &tihtc_detect,