r4098 - trunk/src/target/gsm/src/gsmd

[erin_yueh at sita.openmoko.org]

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");