Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4098 - trunk/src/target/gsm/src/gsmd
([EMAIL PROTECTED])
2. r4099 - in trunk/src/target/u-boot: patches scripts
([EMAIL PROTECTED])
3. r4100 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
4. r4101 - trunk/src/target/gsm/src/gsmd
([EMAIL PROTECTED])
--- Begin Message ---
Author: erin_yueh
Date: 2008-02-21 12:00:23 +0100 (Thu, 21 Feb 2008)
New Revision: 4098
Modified:
trunk/src/target/gsm/src/gsmd/atcmd.c
trunk/src/target/gsm/src/gsmd/ext_response.c
trunk/src/target/gsm/src/gsmd/gsmd.c
trunk/src/target/gsm/src/gsmd/machine_telit.c
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/gsmd/vendor_telit.c
Log:
gsmd: fix gcc warning (Erin Yueh)
Modified: trunk/src/target/gsm/src/gsmd/atcmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/atcmd.c 2008-02-21 10:28:30 UTC (rev
4097)
+++ trunk/src/target/gsm/src/gsmd/atcmd.c 2008-02-21 11:00:23 UTC (rev
4098)
@@ -270,7 +270,7 @@
!strcmp(buf, "AT-Command Interpreter ready")) {
g->interpreter_ready = 1;
gsmd_initsettings(g);
- gmsd_alive_start(g);
+ gsmd_alive_start(g);
return 0;
}
Modified: trunk/src/target/gsm/src/gsmd/ext_response.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/ext_response.c 2008-02-21 10:28:30 UTC
(rev 4097)
+++ trunk/src/target/gsm/src/gsmd/ext_response.c 2008-02-21 11:00:23 UTC
(rev 4098)
@@ -202,13 +202,14 @@
case GSMD_ECMD_RTT_STRING:
DEBUGP("%s\n", tok->u.string);
break;
+ case GSMD_ECMD_RTT_NONE:
+ break;
case GSMD_ECMD_RTT_RANGE: {
int j;
for (j = 0; j < tok->u.range.num_items; j++)
DEBUGP("%d-%d, ", tok->u.range.item[j].min,
tok->u.range.item[j].max);
}
-
break;
}
}
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2008-02-21 10:28:30 UTC (rev
4097)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2008-02-21 11:00:23 UTC (rev
4098)
@@ -125,7 +125,7 @@
gsmd_timer_register(tmr);
}
-int gmsd_alive_start(struct gsmd *gsmd)
+int gsmd_alive_start(struct gsmd *gsmd)
{
struct timeval tv;
@@ -496,7 +496,7 @@
if (g.interpreter_ready) {
gsmd_initsettings(&g);
- gmsd_alive_start(&g);
+ gsmd_alive_start(&g);
}
gsmd_opname_init(&g);
Modified: trunk/src/target/gsm/src/gsmd/machine_telit.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/machine_telit.c 2008-02-21 10:28:30 UTC
(rev 4097)
+++ trunk/src/target/gsm/src/gsmd/machine_telit.c 2008-02-21 11:00:23 UTC
(rev 4098)
@@ -33,6 +33,7 @@
#include <gsmd/talloc.h>
#include <gsmd/extrsp.h>
#include <gsmd/machineplugin.h>
+#include <gsmd/atcmd.h>
#define GSMD_MODEM_POWEROFF_TIMEOUT 6
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2008-02-21 10:28:30 UTC (rev
4097)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2008-02-21 11:00:23 UTC (rev
4098)
@@ -876,7 +876,6 @@
static int network_oper_n_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
{
struct gsmd_user *gu = ctx;
- int format, s, ret;
char buf[16+1] = {'\0'};
struct gsm_extrsp *er;
@@ -923,7 +922,7 @@
if (strncmp(str, "+COPS: ", 7))
return -EINVAL;
- ptr = str;
+ ptr = (char *) str;
while (*str) {
if ( *str == '(' && isdigit(*(str+1)) ) {
len++;
@@ -943,9 +942,9 @@
while (*str) {
if ( *str == '(' )
- head = str;
+ head = (char *) str;
else if ( *str == ')' ) {
- tail = str;
+ tail = (char *) str;
memset(buf, '\0', sizeof(buf));
strncpy(buf, head+1, (tail-head-1));
Modified: trunk/src/target/gsm/src/gsmd/vendor_telit.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_telit.c 2008-02-21 10:28:30 UTC
(rev 4097)
+++ trunk/src/target/gsm/src/gsmd/vendor_telit.c 2008-02-21 11:00:23 UTC
(rev 4098)
@@ -59,7 +59,6 @@
static int telit_initsettings(struct gsmd *g)
{
int rc = 0;
- struct gsmd_atcmd *cmd;
/* Get network registration events with full information. */
rc |= gsmd_simplecmd(g, "AT+CGREG=2");
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-21 12:17:19 +0100 (Thu, 21 Feb 2008)
New Revision: 4099
Removed:
trunk/src/target/u-boot/patches/build-kludge.patch
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/scripts/build
Log:
scripts/build: updated to GIT_HEAD 928d1d77f8623c120d8763e20e1ca58df9c5c4c6,
SVN_REV 4097
patches/build-kludge.patch, patches/series: removed build-kludge.patch,, since
current GIT doesn't have this bug anymore
Deleted: trunk/src/target/u-boot/patches/build-kludge.patch
===================================================================
--- trunk/src/target/u-boot/patches/build-kludge.patch 2008-02-21 11:00:23 UTC
(rev 4098)
+++ trunk/src/target/u-boot/patches/build-kludge.patch 2008-02-21 11:17:19 UTC
(rev 4099)
@@ -1,13 +0,0 @@
-Index: u-boot/drivers/spi/mpc8xxx_spi.c
-===================================================================
---- u-boot.orig/drivers/spi/mpc8xxx_spi.c
-+++ u-boot/drivers/spi/mpc8xxx_spi.c
-@@ -23,7 +23,7 @@
-
- #include <common.h>
- #include <spi.h>
--#include <asm/mpc8xxx_spi.h>
-+#include <asm-ppc/mpc8xxx_spi.h>
-
- #ifdef CONFIG_HARD_SPI
-
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2008-02-21 11:00:23 UTC (rev
4098)
+++ trunk/src/target/u-boot/patches/series 2008-02-21 11:17:19 UTC (rev
4099)
@@ -90,6 +90,3 @@
# let's see what upstream thinks about this
loadenv.patch
-
-# remove soonish
-build-kludge.patch
Modified: trunk/src/target/u-boot/scripts/build
===================================================================
--- trunk/src/target/u-boot/scripts/build 2008-02-21 11:00:23 UTC (rev
4098)
+++ trunk/src/target/u-boot/scripts/build 2008-02-21 11:17:19 UTC (rev
4099)
@@ -21,10 +21,10 @@
# DEVICE=gta02v5
#
# GIT_HEAD, if defined, specifies which git head we use, e.g.,
-# GIT_HEAD=37e3c62fa07a823e7569c872e3a9395d227ed8e3
+# GIT_HEAD=928d1d77f8623c120d8763e20e1ca58df9c5c4c6
#
# SVN_REV, if defined, specifies which SVN revision we use, e.g.,
-# SVN_REV=4035
+# SVN_REV=4097
#
git clone git://www.denx.de/git/u-boot.git
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-21 12:32:08 +0100 (Thu, 21 Feb 2008)
New Revision: 4100
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
Preparing for GTA02v6.
uboot-gta02.patch:
- board/neo1973/gta02/split_by_variant.sh: added gta02v6_config
- board/neo1973/gta02/split_by_variant.sh: bumped default from GTA02v3 to
GTA02v5
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-02-21 11:17:19 UTC
(rev 4099)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-02-21 11:32:08 UTC
(rev 4100)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2423,6 +2423,14 @@ omap730p2_cs3boot_config : unconfig
+@@ -2428,6 +2428,14 @@ omap730p2_cs3boot_config : unconfig
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -902,7 +902,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/split_by_variant.sh
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,71 @@
+#!/bin/sh
+# ---------------------------------------------------------
+# Set the core module defines according to Core Module
@@ -953,12 +953,18 @@
+ echo "CONFIG_USB_DFU_REVISION=0x0350" > $CFGTMP
+ ;;
+
++ gta02v6_config)
++ echo "#define CONFIG_ARCH_GTA02_v6" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 6" >> $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0360" > $CFGTMP
++ ;;
+
++
+ *)
-+ echo "$0:: Unrecognised config - using GTA02v3 config"
-+ echo "#define CONFIG_ARCH_GTA02_v3" > $CFGINC
-+ echo "#define CONFIG_GTA02_REVISION 3" >> $CFGINC
-+ echo "CONFIG_USB_DFU_REVISION=0x0330" > $CFGTMP
++ echo "$0:: Unrecognised config - using GTA02v5 config"
++ echo "#define CONFIG_ARCH_GTA02_v5" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 5" >> $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0350" > $CFGTMP
+ ;;
+
+ esac
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-02-21 12:41:29 +0100 (Thu, 21 Feb 2008)
New Revision: 4101
Modified:
trunk/src/target/gsm/src/gsmd/usock.c
Log:
gsmd: get the operator list 2nd try (Paulius Zaleckas)
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2008-02-21 11:32:08 UTC (rev
4100)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2008-02-21 11:41:29 UTC (rev
4101)
@@ -921,6 +921,13 @@
if (strncmp(str, "+COPS: ", 7))
return -EINVAL;
+ /*
+ * string ",," means the begginig of extended parameters and we
+ * don't want to scan them for operators.
+ */
+ ptr = strstr(str, ",,");
+ if(ptr)
+ ptr[0] = '\0';
ptr = (char *) str;
while (*str) {
@@ -958,7 +965,7 @@
//extrsp_dump(er);
- if ( er->num_tokens == 4 &&
+ if ( er->num_tokens >= 4 &&
er->tokens[0].type ==
GSMD_ECMD_RTT_NUMERIC &&
er->tokens[1].type ==
GSMD_ECMD_RTT_STRING &&
er->tokens[2].type ==
GSMD_ECMD_RTT_STRING &&
@@ -1002,6 +1009,8 @@
int len, ret;
len = network_opers_parse(resp, &buf);
+ if(len < 0)
+ return len; /* error we got from network_opers_parse */
ret = gsmd_ucmd_submit(gu, GSMD_MSG_NETWORK, GSMD_NETWORK_OPER_LIST,
cmd->id, sizeof(*buf) * (len + 1), buf);
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog