[oe-commits] org.oe.dev libgsmd: numeric.patch was applied upstream

[pH5 commit]

libgsmd: numeric.patch was applied upstream
- patch to understand qualcomm '@' extended replies
  is still needed for universal

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: a7c87ae883e56038a7e387b2d426c32cb72de9d9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a7c87ae883e56038a7e387b2d426c32cb72de9d9
Files:
1
packages/gsm/files/numeric.patch
packages/gsm/files/qualcomm-extreply.patch
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r46711b0a1e8087742d64415122a470ae9f3e522c -ra7c87ae883e56038a7e387b2d426c32cb72de9d9
#
# 
# 
# rename "packages/gsm/files/numeric.patch"
#     to "packages/gsm/files/qualcomm-extreply.patch"
# 
# patch "packages/gsm/files/qualcomm-extreply.patch"
#  from [977aab49d5f8a96b98eb9900c325e8d95d323778]
#    to [c1f936d262cfc47d1bf2713b982bb07e9ca8b21f]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [58d136121d9f0daa75928d62428708f3f8441223]
#    to [ce11a43b1052bd190a7d982c2b0fe1c7b4444eaf]
# 
============================================================
--- packages/gsm/files/numeric.patch	977aab49d5f8a96b98eb9900c325e8d95d323778
+++ packages/gsm/files/qualcomm-extreply.patch	c1f936d262cfc47d1bf2713b982bb07e9ca8b21f
@@ -11,46 +11,3 @@ Index: gsm/src/gsmd/atcmd.c
  		/* an extended response */
  		const char *colon = strchr(buf, ':');
  		if (!colon) {
-@@ -269,14 +269,13 @@
- 			memcpy(cmd->buf, buf, len);
- 		}
- 	} else {
--		if (!strcmp(buf, "RING")) {
-+		if (!strcmp(buf, "RING") || buf[0] == '2') {
- 			/* this is the only non-extended unsolicited return
- 			 * code, part of Case 'B' */
- 			return unsolicited_parse(g, buf, len, NULL);
- 		}
- 
--		if (!strcmp(buf, "ERROR") ||
--		    ((g->flags & GSMD_FLAG_V0) && buf[0] == '4')) {
-+		if (!strcmp(buf, "ERROR") || buf[0] == '4') {
- 			/* Part of Case 'C' */
- 			DEBUGP("unspecified error\n");
- 			if (cmd)
-@@ -285,8 +284,7 @@
- 			goto final_cb;
- 		}
- 
--		if (!strncmp(buf, "OK", 2)
--		    || ((g->flags & GSMD_FLAG_V0) && buf[0] == '0')) {
-+		if (!strncmp(buf, "OK", 2) || buf[0] == '0') {
- 			/* Part of Case 'C' */
- 			if (cmd)
- 				cmd->ret = 0;
-@@ -296,13 +294,13 @@
- 
- 		/* FIXME: handling of those special commands in response to
- 		 * ATD / ATA */
--		if (!strncmp(buf, "NO CARRIER", 11)) {
-+		if (!strncmp(buf, "NO CARRIER", 11) || buf[0] == '3') {
- 			/* Part of Case 'D' */
- 			final = 1;
- 			goto final_cb;
- 		}
- 
--		if (!strncmp(buf, "BUSY", 4)) {
-+		if (!strncmp(buf, "BUSY", 4) || buf[0] == '7') {
- 			/* Part of Case 'D' */
- 			final = 1;
- 			goto final_cb;
============================================================
--- packages/gsm/libgsmd_svn.bb	58d136121d9f0daa75928d62428708f3f8441223
+++ packages/gsm/libgsmd_svn.bb	ce11a43b1052bd190a7d982c2b0fe1c7b4444eaf
@@ -11,10 +11,9 @@ S = "${WORKDIR}/gsm"
            file://default"
 S = "${WORKDIR}/gsm"
 
-SRC_URI_append_magician = " file://numeric.patch;patch=1 \
-                            file://plugin.patch;patch=1"
-SRC_URI_append_htcuniversal = " file://numeric.patch;patch=1 \
-                                file://plugin.patch;patch=1"
+SRC_URI_append_magician = " file://plugin.patch;patch=1"
+SRC_URI_append_htcuniversal = " file://plugin.patch;patch=1 \
+                                file://qualcomm-extreply.patch;patch=1"
 
 inherit autotools pkgconfig update-rc.d