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 @@
-Index: gsm/src/gsmd/atcmd.c
-===================================================================
---- gsm.orig/src/gsmd/atcmd.c   2007-06-03 13:24:44.000000000 +0200
-+++ gsm/src/gsmd/atcmd.c        2007-06-03 13:24:46.000000000 +0200
-@@ -185,6 +185,7 @@
-            !strcmp(buf, "AT-Command Interpreter ready")) {
-                g->interpreter_ready = 1;
-                gsmd_initsettings(g);
-+               gmsd_alive_start(g);
-                return 0;
-        }
- 
-Index: gsm/src/gsmd/gsmd.c
-===================================================================
---- gsm.orig/src/gsmd/gsmd.c    2007-06-03 13:22:02.000000000 +0200
-+++ gsm/src/gsmd/gsmd.c 2007-06-03 13:22:56.000000000 +0200
-@@ -128,7 +128,7 @@
-        gsmd_timer_register(tmr);
- }
- 
--static int gmsd_alive_start(struct gsmd *gsmd)
-+int gmsd_alive_start(struct gsmd *gsmd)
- {
-        struct timeval tv;
- 
-@@ -478,10 +478,11 @@
-        /* select a vendor plugin */
-        gsmd_vendor_plugin_find(&g);
- 
--       if (g.interpreter_ready)
-+       if (g.interpreter_ready) {
-                gsmd_initsettings(&g);
-        
--       gmsd_alive_start(&g);
-+               gmsd_alive_start(&g);
-+       }
- 
-        gsmd_opname_init(&g);
- 
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 @@
-Index: gsm/src/gsmd/atcmd.c
-===================================================================
---- gsm.orig/src/gsmd/atcmd.c   2007-06-03 10:46:19.000000000 +0200
-+++ gsm/src/gsmd/atcmd.c        2007-06-03 15:54:53.000000000 +0200
-@@ -208,7 +208,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) {
-@@ -255,7 +255,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;
-                        }
-Index: gsm/src/gsmd/vendor_qc.c
-===================================================================
---- gsm.orig/src/gsmd/vendor_qc.c       2007-06-03 10:46:19.000000000 +0200
-+++ gsm/src/gsmd/vendor_qc.c    2007-06-03 11:45:58.000000000 +0200
-@@ -97,6 +97,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,
-Index: gsm/src/gsmd/vendor_ti.c
-===================================================================
---- gsm.orig/src/gsmd/vendor_ti.c       2007-06-03 10:46:19.000000000 +0200
-+++ gsm/src/gsmd/vendor_ti.c    2007-06-03 11:45:58.000000000 +0200
-@@ -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,
-Index: gsm/include/gsmd/vendorplugin.h
-===================================================================
---- gsm.orig/include/gsmd/vendorplugin.h        2007-02-16 15:12:40.000000000 +0100
-+++ gsm/include/gsmd/vendorplugin.h     2007-06-03 11:45:58.000000000 +0200
-@@ -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);
-Index: gsm/src/gsmd/vendor_tihtc.c
-===================================================================
---- gsm.orig/src/gsmd/vendor_tihtc.c    2007-06-03 15:55:31.000000000 +0200
-+++ gsm/src/gsmd/vendor_tihtc.c 2007-06-03 15:55:43.000000000 +0200
-@@ -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,
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 @@
 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
+--- gsm.orig/src/gsmd/vendor_qc.c       2007-08-01 23:35:03.000000000 +0200
++++ gsm/src/gsmd/vendor_qc.c    2007-08-01 23:35:15.000000000 +0200
 @@ -69,8 +69,15 @@
         return -EIO;
  }
@@ -18,12 +18,3 @@ Index: gsm/src/gsmd/vendor_qc.c
  
         /* FIXME: parse the below and generate the respective events */
  
-@@ -97,7 +109,7 @@
- 
- struct gsmd_vendor_plugin gsmd_vendor_plugin = {
-        .name = "Qualcomm msm6250",
--       .ext_chars = "@",
-+       .ext_chars = "@[",
-        .num_unsolicit = ARRAY_SIZE(qc_unsolicit),
-        .unsolicit = qc_unsolicit,
-        .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 @@
-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);
-        }
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"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r14"
+PR = "r16"
 
 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://vendor-qc-v0.patch;patch=1 \
            file://universal-wcdma.patch;patch=1"
 
 S = "${WORKDIR}/gsm"
 
 inherit autotools pkgconfig update-rc.d
 
-INITSCRIPT_NAME = "gsmd"
+INITSCRIPT_NAME = "gsm"
 INITSCRIPT_PARAMS = "defaults 35"
 
 do_stage() {
@@ -29,7 +26,7 @@ do_stage() {
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/
+        install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/gsm
         install -d ${D}/${sysconfdir}/default
         install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
 }