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. r4083 - in developers/tick: . scripts ([EMAIL PROTECTED])
2. r4084 - in trunk/src/target/gsm: include/gsmd src/gsmd
src/util ([EMAIL PROTECTED])
--- Begin Message ---
Author: tick
Date: 2008-02-18 10:42:18 +0100 (Mon, 18 Feb 2008)
New Revision: 4083
Added:
developers/tick/scripts/
developers/tick/scripts/chout
Log:
put a grep script
Added: developers/tick/scripts/chout
===================================================================
--- developers/tick/scripts/chout 2008-02-17 10:50:35 UTC (rev 4082)
+++ developers/tick/scripts/chout 2008-02-18 09:42:18 UTC (rev 4083)
@@ -0,0 +1,97 @@
+#!/bin/bash
+#composer Tick
+
+function usage {
+if (( $#==0 ));then
+ echo "USAGE: chout [-i] [-<name|type|dir> <FILE|TYPE|DIR>] <Keywords>"
+ echo "Example: chout DEBUG <-- finding files contain
DEBUG"
+ echo "Example: chout -name '*.pro' DEBUG <-- finding DEBUG from pro
files"
+ echo "Example: chout -dir /tmp/ -type f DEBUG <-- all files in specific
directory"
+ echo "Example: chout -i DeBuG <-- ignore case"
+ echo "Other flags: -cmin -ctime"
+ echo "Please reference to \"man find\""
+ exit
+fi
+}
+
+usage $@
+ICASE=" "
+DIR=" "
+NAMEFLAG=" "
+NAME=" "
+TYPEFLAG=" "
+TYPE=" "
+CMINFLAG=" "
+CMIN=" "
+CTIMEFLAG=" "
+CTIME=" "
+ares=" "
+
+
+while (( $# > 1 )) && ( [ "$1" == "-dir" ] || [ "$1" == "-i" ] || [ "$1" ==
"-name" ] || [ "$1" == "-type" ] || [ "$1" == "-ctime" ] || [ "$1" == "-cmin"
] );do
+ if [ "$1" == "-dir" ];then
+ shift
+ DIR="$1"
+ elif [ "$1" == "-type" ];then
+ shift
+ TYPEFLAG="-type"
+ TYPE="$1"
+ elif [ "$1" == "-name" ];then
+ shift
+ NAMEFLAG="-name"
+ NAME="$1"
+ elif [ "$1" == "-i" ];then
+ ICASE=" -i"
+ elif [ "$1" == "-ctime" ];then
+ shift
+ CTIMEFLAG="-ctime"
+ CTIME="$1"
+ elif [ "$1" == "-cmin" ];then
+ shift
+ CMINFLAG="-cmin"
+ CMIN="$1"
+ else
+ echo break time $@
+ break
+ fi
+ shift
+done
+usage $@
+
+if [ "$ares" != " " ];then
+ echo -n ""
+elif [ "$TYPEFLAG" == " " ] \
+ && [ "$NAMEFLAG" == " " ] \
+ && [ "$CTIMEFLAG" == " " ] \
+ && [ "$CMINFLAG" == " " ] \
+ ;then
+ #echo DIR=$DIR
+ ares="`find ${DIR} -name '*.h'` `find ${DIR} -name '*.c'` `find ${DIR}
-name '*.cpp'`"
+else
+ if [ "${NAME}" == " " ];then
+ ares=`find ${DIR} ${CTIMEFLAG} ${CTIME} ${CMINFLAG} ${CMIN}
${TYPEFLAG} ${TYPE}`
+ else
+ #echo "find ${DIR} ${CTIMEFLAG} ${CTIME} ${CMINFLAG} ${CMIN}
${TYPEFLAG} ${TYPE} ${NAMEFLAG} \"${NAME}\""
+ ares=`find ${DIR} ${CTIMEFLAG} ${CTIME} ${CMINFLAG} ${CMIN}
${TYPEFLAG} ${TYPE} ${NAMEFLAG} "${NAME}"`
+ fi
+
+fi
+
+target=" "
+while (( $# > 0 ));do
+ target="$target -e $1"
+ shift
+done
+
+for arrs in $ares ;do
+ if (( `file $arrs | grep "text" | wc -l ` == 0 ));then
+ #echo $arrs is binary
+ continue
+ fi
+ if [ -f $arrs ] && (( `cat $arrs | grep ${ICASE} ${target} | wc -l` > 0 ));
then
+ echo "In file $arrs"
+ grep --color -n ${ICASE} ${target} $arrs
+ #awk '{print NR":\t"$0}' $arrs | grep ${ICASE} $1 | sed -n
"s/${target}/[1m[34m&[0m/p"
+ echo " "
+ fi
+done
Property changes on: developers/tick/scripts/chout
___________________________________________________________________
Name: svn:executable
+ *
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-02-18 10:42:28 +0100 (Mon, 18 Feb 2008)
New Revision: 4084
Modified:
trunk/src/target/gsm/include/gsmd/gsmd.h
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: bug fixed for some changes (Sudharshan S, Paulius Zaleckas)
Modified: trunk/src/target/gsm/include/gsmd/gsmd.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/gsmd.h 2008-02-18 09:42:18 UTC (rev
4083)
+++ trunk/src/target/gsm/include/gsmd/gsmd.h 2008-02-18 09:42:28 UTC (rev
4084)
@@ -73,7 +73,6 @@
#define GSMD_FLAG_SMS_FMT_TEXT 0x0002 /* TODO Use TEXT rather than PDU mode */
#define GSMD_ATCMD_TIMEOUT 60 /* If doesn get respond within 60 secs,
discard */
-#define GSMD_MAX_INFO_LEN 64 /* by the standard it should be 2048,
way too much :) */
struct gsmd {
unsigned int flags;
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2008-02-18 09:42:18 UTC (rev
4083)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2008-02-18 09:42:28 UTC (rev
4084)
@@ -618,12 +618,10 @@
struct gsmd_user *gu = ctx;
DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
- if (strncmp(resp, "+CGMI: ", 7))
- return -EINVAL;
- resp += 7;
+ if (!strncmp(resp, "+CGMI: ", 7))
+ resp += 7;
return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_MANUF,
cmd->id, strlen(resp) + 1, resp);
- return 0;
}
static int gsmd_get_model_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
@@ -631,12 +629,10 @@
struct gsmd_user *gu = ctx;
DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
- if (strncmp(resp, "+CGMM: ", 7))
- return -EINVAL;
- resp += 7;
+ if (!strncmp(resp, "+CGMM: ", 7))
+ resp += 7;
return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_MODEL,
cmd->id, strlen(resp) + 1, resp);
- return 0;
}
static int gsmd_get_revision_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
@@ -644,12 +640,10 @@
struct gsmd_user *gu = ctx;
DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
- if (strncmp(resp, "+CGMR: ", 7))
- return -EINVAL;
- resp += 7;
+ if (!strncmp(resp, "+CGMR: ", 7))
+ resp += 7;
return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_REVISION,
cmd->id, strlen(resp) + 1, resp);
- return 0;
}
static int gsmd_get_serial_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
@@ -657,12 +651,10 @@
struct gsmd_user *gu = ctx;
DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
- if (strncmp(resp, "+CGSN: ", 7))
- return -EINVAL;
- resp += 7;
+ if (!strncmp(resp, "+CGSN: ", 7))
+ resp += 7;
return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_SERIAL,
cmd->id, strlen(resp) + 1, resp);
- return 0;
}
static int usock_rcv_phone(struct gsmd_user *gu, struct gsmd_msg_hdr *gph,
@@ -868,7 +860,7 @@
if ( !er )
return -ENOMEM;
-
+
//extrsp_dump(er);
/* Format: <mode>[,<format>,<oper>] */
@@ -878,12 +870,11 @@
/* In case we're not registered, return an empty string */
buf[0] = '\0';
}
- else if ( er->num_tokens == 3 &&
+ else if ( er->num_tokens >= 3 &&
er->tokens[0].type == GSMD_ECMD_RTT_NUMERIC &&
er->tokens[1].type == GSMD_ECMD_RTT_NUMERIC &&
er->tokens[2].type == GSMD_ECMD_RTT_STRING ) {
-
strlcpy(buf, er->tokens[2].u.string, sizeof(buf));
}
else {
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2008-02-18 09:42:18 UTC (rev
4083)
+++ trunk/src/target/gsm/src/util/shell.c 2008-02-18 09:42:28 UTC (rev
4084)
@@ -392,28 +392,23 @@
static int phone_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
{
- char *payload;
+ char *payload = (char *)gmh + sizeof(*gmh);
int *intresult = (void *)gmh + sizeof(*gmh);
switch (gmh->msg_subtype) {
case GSMD_PHONE_GET_IMSI:
- payload = (char *)gmh + sizeof(*gmh);
printf("imsi <%s>\n", payload);
break;
case GSMD_PHONE_GET_MANUF:
- payload = (char *)gmh + sizeof(*gmh);
printf("manufacturer: %s\n", payload);
break;
case GSMD_PHONE_GET_MODEL:
- payload = (char *)gmh + sizeof(*gmh);
printf("model: %s\n", payload);
break;
case GSMD_PHONE_GET_REVISION:
- payload = (char *)gmh + sizeof(*gmh);
printf("revision: %s\n", payload);
break;
case GSMD_PHONE_GET_SERIAL:
- payload = (char *)gmh + sizeof(*gmh);
printf("serial: %s\n", payload);
break;
case GSMD_PHONE_POWERUP:
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
