[oe-commits] org.oe.dev libgsmd: add two universal patches, bump PR

[pH5 commit]

libgsmd: add two universal patches, bump PR

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: df7f499532296829db0fd2c86b1e288aa117a40d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df7f499532296829db0fd2c86b1e288aa117a40d
Files:
1
packages/gsm/files/vendor-qc-v0.patch
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r23fe4115d6a856b225545c51e0626198ce05769b -rdf7f499532296829db0fd2c86b1e288aa117a40d
#
# 
# 
# add_file "packages/gsm/files/vendor-qc-v0.patch"
#  content [62b70e304fe1104773dcdca09e6f4d48c6408399]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [f29798a9c7083c4985c5d2499c90335f2a9c17f1]
#    to [7b5788cdd0f3ccee90d8b989942ac21ab1ad4db3]
# 
============================================================
--- packages/gsm/files/vendor-qc-v0.patch	62b70e304fe1104773dcdca09e6f4d48c6408399
+++ packages/gsm/files/vendor-qc-v0.patch	62b70e304fe1104773dcdca09e6f4d48c6408399
@@ -0,0 +1,38 @@
+Index: gsm/src/gsmd/vendor_qc.c
+===================================================================
+--- gsm.orig/src/gsmd/vendor_qc.c	2007-06-13 20:13:47.000000000 +0200
++++ gsm/src/gsmd/vendor_qc.c	2007-06-13 20:45:19.000000000 +0200
+@@ -81,6 +88,9 @@
+ {
+ 	/* FIXME: do actual detection of vendor if we have multiple vendors */
+ 	/* open /proc/cpuinfo and check for HTC Universal? */
++
++	/* The Qualcomm chip starts in V0 mode */
++	g->flags |= GSMD_FLAG_V0;
+ 	return 1;
+ }
+ 
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm.orig/src/gsmd/gsmd.c	2007-06-13 20:13:47.000000000 +0200
++++ gsm/src/gsmd/gsmd.c	2007-06-13 20:49:54.000000000 +0200
+@@ -62,7 +62,8 @@
+ {
+ 	struct gsmd_alive_priv *alp = ctx;
+ 
+-	if (!strcmp(resp, "OK"))
++	if (!strcmp(resp, "OK") ||
++	    ((alp->gsmd->flags & GSMD_FLAG_V0) && resp[0] == '0'))
+ 		alp->alive_responded = 1;
+ 	return 0;
+ }
+@@ -201,7 +202,8 @@
+ {
+ 	struct gsmd *gsmd = ctx;
+ 
+-	if (strcmp(resp, "OK")) {
++	if (strcmp(resp, "OK") &&
++	    (!(gsmd->flags & GSMD_FLAG_V0) || resp[0] != '0')) {
+ 		gsmd_log(GSMD_FATAL, "response '%s' to initial command invalid", resp);
+ 		exit(5);
+ 	}
============================================================
--- packages/gsm/libgsmd_svn.bb	f29798a9c7083c4985c5d2499c90335f2a9c17f1
+++ packages/gsm/libgsmd_svn.bb	7b5788cdd0f3ccee90d8b989942ac21ab1ad4db3
@@ -1,18 +1,20 @@ PV = "0.0+svn${SRCDATE}"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
            file://default \
            file://extreplychars.patch;patch=1 \
            file://getopt-wait-interpreter-ready.patch;patch=1 \
-	   file://alive-start-if-interpreter-ready.patch;patch=1 \
-	   file://tihtc-csq-fix.patch;patch=1"
+           file://alive-start-if-interpreter-ready.patch;patch=1 \
+           file://tihtc-csq-fix.patch;patch=1 \
+           file://vendor-qc-v0.patch;patch=1 \
+           file://universal-wcdma.patch;patch=1"
 
 S = "${WORKDIR}/gsm"