summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-02 09:44:28 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-02 09:44:28 +0000
commit659c2ac87e107d2aecc9b8438703bfad5018ad8e (patch)
tree21ee5178e1d10c9fddfb18f6f5dbe18ce510a1e6
parent96e455ffc7875e6f6b509550ad61abe5ea12c4cb (diff)
downloadpoky-659c2ac87e107d2aecc9b8438703bfad5018ad8e.tar.gz
libgsmd: cleaned up patchset to apply for 20070801 version, bumped PR to be newer then OE one
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2313 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta-extras/packages/openmoko/libgsmd/alive-start-if-interpreter-ready.patch39
-rw-r--r--meta-extras/packages/openmoko/libgsmd/extreplychars.patch70
-rw-r--r--meta-extras/packages/openmoko/libgsmd/universal-wcdma.patch13
-rw-r--r--meta-extras/packages/openmoko/libgsmd/vendor-qc-v0.patch38
-rw-r--r--meta-extras/packages/openmoko/libgsmd_svn.bb9
5 files changed, 5 insertions, 164 deletions
diff --git a/meta-extras/packages/openmoko/libgsmd/alive-start-if-interpreter-ready.patch b/meta-extras/packages/openmoko/libgsmd/alive-start-if-interpreter-ready.patch
deleted file mode 100644
index 20104d2e3f..0000000000
--- a/meta-extras/packages/openmoko/libgsmd/alive-start-if-interpreter-ready.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Index: gsm/src/gsmd/atcmd.c
2===================================================================
3--- gsm.orig/src/gsmd/atcmd.c 2007-06-03 13:24:44.000000000 +0200
4+++ gsm/src/gsmd/atcmd.c 2007-06-03 13:24:46.000000000 +0200
5@@ -185,6 +185,7 @@
6 !strcmp(buf, "AT-Command Interpreter ready")) {
7 g->interpreter_ready = 1;
8 gsmd_initsettings(g);
9+ gmsd_alive_start(g);
10 return 0;
11 }
12
13Index: gsm/src/gsmd/gsmd.c
14===================================================================
15--- gsm.orig/src/gsmd/gsmd.c 2007-06-03 13:22:02.000000000 +0200
16+++ gsm/src/gsmd/gsmd.c 2007-06-03 13:22:56.000000000 +0200
17@@ -128,7 +128,7 @@
18 gsmd_timer_register(tmr);
19 }
20
21-static int gmsd_alive_start(struct gsmd *gsmd)
22+int gmsd_alive_start(struct gsmd *gsmd)
23 {
24 struct timeval tv;
25
26@@ -478,10 +478,11 @@
27 /* select a vendor plugin */
28 gsmd_vendor_plugin_find(&g);
29
30- if (g.interpreter_ready)
31+ if (g.interpreter_ready) {
32 gsmd_initsettings(&g);
33
34- gmsd_alive_start(&g);
35+ gmsd_alive_start(&g);
36+ }
37
38 gsmd_opname_init(&g);
39
diff --git a/meta-extras/packages/openmoko/libgsmd/extreplychars.patch b/meta-extras/packages/openmoko/libgsmd/extreplychars.patch
deleted file mode 100644
index 8ebc343e27..0000000000
--- a/meta-extras/packages/openmoko/libgsmd/extreplychars.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1Index: gsm/src/gsmd/atcmd.c
2===================================================================
3--- gsm.orig/src/gsmd/atcmd.c 2007-06-03 10:46:19.000000000 +0200
4+++ gsm/src/gsmd/atcmd.c 2007-06-03 15:54:53.000000000 +0200
5@@ -208,7 +208,7 @@
6 * TBD
7 */
8
9- if (buf[0] == '+' || buf[0] == '%') {
10+ if (buf[0] == '+' || strchr(g->vendorpl->ext_chars, buf[0])) {
11 /* an extended response */
12 const char *colon = strchr(buf, ':');
13 if (!colon) {
14@@ -255,7 +255,7 @@
15 }
16
17 if (cmd) {
18- if (cmd->buf[2] != '+' && cmd->buf[2] != '%') {
19+ if (cmd->buf[2] != '+' && strchr(g->vendorpl->ext_chars, cmd->buf[2]) == NULL) {
20 gsmd_log(GSMD_ERROR, "extd reply to non-extd command?\n");
21 return -EINVAL;
22 }
23Index: gsm/src/gsmd/vendor_qc.c
24===================================================================
25--- gsm.orig/src/gsmd/vendor_qc.c 2007-06-03 10:46:19.000000000 +0200
26+++ gsm/src/gsmd/vendor_qc.c 2007-06-03 11:45:58.000000000 +0200
27@@ -97,6 +97,7 @@
28
29 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
30 .name = "Qualcomm msm6250",
31+ .ext_chars = "@",
32 .num_unsolicit = ARRAY_SIZE(qc_unsolicit),
33 .unsolicit = qc_unsolicit,
34 .detect = &qc_detect,
35Index: gsm/src/gsmd/vendor_ti.c
36===================================================================
37--- gsm.orig/src/gsmd/vendor_ti.c 2007-06-03 10:46:19.000000000 +0200
38+++ gsm/src/gsmd/vendor_ti.c 2007-06-03 11:45:58.000000000 +0200
39@@ -303,6 +303,7 @@
40
41 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
42 .name = "TI Calypso",
43+ .ext_chars = "%@",
44 .num_unsolicit = ARRAY_SIZE(ticalypso_unsolicit),
45 .unsolicit = ticalypso_unsolicit,
46 .detect = &ticalypso_detect,
47Index: gsm/include/gsmd/vendorplugin.h
48===================================================================
49--- gsm.orig/include/gsmd/vendorplugin.h 2007-02-16 15:12:40.000000000 +0100
50+++ gsm/include/gsmd/vendorplugin.h 2007-06-03 11:45:58.000000000 +0200
51@@ -12,6 +12,7 @@
52 struct gsmd_vendor_plugin {
53 struct llist_head list;
54 unsigned char *name;
55+ unsigned char *ext_chars;
56 unsigned int num_unsolicit;
57 const struct gsmd_unsolicit *unsolicit;
58 int (*detect)(struct gsmd *g);
59Index: gsm/src/gsmd/vendor_tihtc.c
60===================================================================
61--- gsm.orig/src/gsmd/vendor_tihtc.c 2007-06-03 15:55:31.000000000 +0200
62+++ gsm/src/gsmd/vendor_tihtc.c 2007-06-03 15:55:43.000000000 +0200
63@@ -298,6 +298,7 @@
64
65 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
66 .name = "TI Calypso / HTC firmware",
67+ .ext_chars = "%",
68 .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit),
69 .unsolicit = tihtc_unsolicit,
70 .detect = &tihtc_detect,
diff --git a/meta-extras/packages/openmoko/libgsmd/universal-wcdma.patch b/meta-extras/packages/openmoko/libgsmd/universal-wcdma.patch
index a162ce2326..350b6aba4d 100644
--- a/meta-extras/packages/openmoko/libgsmd/universal-wcdma.patch
+++ b/meta-extras/packages/openmoko/libgsmd/universal-wcdma.patch
@@ -1,7 +1,7 @@
1Index: gsm/src/gsmd/vendor_qc.c 1Index: gsm/src/gsmd/vendor_qc.c
2=================================================================== 2===================================================================
3--- gsm.orig/src/gsmd/vendor_qc.c 2007-06-13 20:13:47.000000000 +0200 3--- gsm.orig/src/gsmd/vendor_qc.c 2007-08-01 23:35:03.000000000 +0200
4+++ gsm/src/gsmd/vendor_qc.c 2007-06-13 20:45:19.000000000 +0200 4+++ gsm/src/gsmd/vendor_qc.c 2007-08-01 23:35:15.000000000 +0200
5@@ -69,8 +69,15 @@ 5@@ -69,8 +69,15 @@
6 return -EIO; 6 return -EIO;
7 } 7 }
@@ -18,12 +18,3 @@ Index: gsm/src/gsmd/vendor_qc.c
18 18
19 /* FIXME: parse the below and generate the respective events */ 19 /* FIXME: parse the below and generate the respective events */
20 20
21@@ -97,7 +109,7 @@
22
23 struct gsmd_vendor_plugin gsmd_vendor_plugin = {
24 .name = "Qualcomm msm6250",
25- .ext_chars = "@",
26+ .ext_chars = "@[",
27 .num_unsolicit = ARRAY_SIZE(qc_unsolicit),
28 .unsolicit = qc_unsolicit,
29 .detect = &qc_detect,
diff --git a/meta-extras/packages/openmoko/libgsmd/vendor-qc-v0.patch b/meta-extras/packages/openmoko/libgsmd/vendor-qc-v0.patch
deleted file mode 100644
index 8306f8a66e..0000000000
--- a/meta-extras/packages/openmoko/libgsmd/vendor-qc-v0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Index: gsm/src/gsmd/vendor_qc.c
2===================================================================
3--- gsm.orig/src/gsmd/vendor_qc.c 2007-06-13 20:13:47.000000000 +0200
4+++ gsm/src/gsmd/vendor_qc.c 2007-06-13 20:45:19.000000000 +0200
5@@ -81,6 +88,9 @@
6 {
7 /* FIXME: do actual detection of vendor if we have multiple vendors */
8 /* open /proc/cpuinfo and check for HTC Universal? */
9+
10+ /* The Qualcomm chip starts in V0 mode */
11+ g->flags |= GSMD_FLAG_V0;
12 return 1;
13 }
14
15Index: gsm/src/gsmd/gsmd.c
16===================================================================
17--- gsm.orig/src/gsmd/gsmd.c 2007-06-13 20:13:47.000000000 +0200
18+++ gsm/src/gsmd/gsmd.c 2007-06-13 20:49:54.000000000 +0200
19@@ -62,7 +62,8 @@
20 {
21 struct gsmd_alive_priv *alp = ctx;
22
23- if (!strcmp(resp, "OK"))
24+ if (!strcmp(resp, "OK") ||
25+ ((alp->gsmd->flags & GSMD_FLAG_V0) && resp[0] == '0'))
26 alp->alive_responded = 1;
27 return 0;
28 }
29@@ -201,7 +202,8 @@
30 {
31 struct gsmd *gsmd = ctx;
32
33- if (strcmp(resp, "OK")) {
34+ if (strcmp(resp, "OK") &&
35+ (!(gsmd->flags & GSMD_FLAG_V0) || resp[0] != '0')) {
36 gsmd_log(GSMD_FATAL, "response '%s' to initial command invalid", resp);
37 exit(5);
38 }
diff --git a/meta-extras/packages/openmoko/libgsmd_svn.bb b/meta-extras/packages/openmoko/libgsmd_svn.bb
index 7fc54a5afb..a7ea23c6fc 100644
--- a/meta-extras/packages/openmoko/libgsmd_svn.bb
+++ b/meta-extras/packages/openmoko/libgsmd_svn.bb
@@ -4,23 +4,20 @@ LICENSE = "GPL"
4SECTION = "libs/gsm" 4SECTION = "libs/gsm"
5PROVIDES += "gsmd" 5PROVIDES += "gsmd"
6PV = "0.0+svn${SRCDATE}" 6PV = "0.0+svn${SRCDATE}"
7PR = "r14" 7PR = "r16"
8 8
9SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ 9SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
10 file://gsmd \ 10 file://gsmd \
11 file://default \ 11 file://default \
12 file://extreplychars.patch;patch=1 \
13 file://getopt-wait-interpreter-ready.patch;patch=1 \ 12 file://getopt-wait-interpreter-ready.patch;patch=1 \
14 file://alive-start-if-interpreter-ready.patch;patch=1 \
15 file://tihtc-csq-fix.patch;patch=1 \ 13 file://tihtc-csq-fix.patch;patch=1 \
16 file://vendor-qc-v0.patch;patch=1 \
17 file://universal-wcdma.patch;patch=1" 14 file://universal-wcdma.patch;patch=1"
18 15
19S = "${WORKDIR}/gsm" 16S = "${WORKDIR}/gsm"
20 17
21inherit autotools pkgconfig update-rc.d 18inherit autotools pkgconfig update-rc.d
22 19
23INITSCRIPT_NAME = "gsmd" 20INITSCRIPT_NAME = "gsm"
24INITSCRIPT_PARAMS = "defaults 35" 21INITSCRIPT_PARAMS = "defaults 35"
25 22
26do_stage() { 23do_stage() {
@@ -29,7 +26,7 @@ do_stage() {
29 26
30do_install_append() { 27do_install_append() {
31 install -d ${D}/${sysconfdir}/init.d 28 install -d ${D}/${sysconfdir}/init.d
32 install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ 29 install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/gsm
33 install -d ${D}/${sysconfdir}/default 30 install -d ${D}/${sysconfdir}/default
34 install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd 31 install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
35} 32}