Send commitlog mailing list submissions to
[email protected]
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. r2704 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
2. r2705 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r2706 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r2707 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
5. r2708 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
6. r2709 - in trunk/src/target/gsm: include/gsmd src/gsmd
src/util ([EMAIL PROTECTED])
--- Begin Message ---
Author: njp
Date: 2007-08-15 14:41:06 +0200 (Wed, 15 Aug 2007)
New Revision: 2704
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_network_registered):
Print the type of registration information.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 12:03:24 UTC (rev 2703)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 12:41:06 UTC (rev 2704)
@@ -1,3 +1,8 @@
+2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
+
+ * src/moko-dialer.c: (on_network_registered):
+ Print the type of registration information.
+
2007-08-14 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_keypad_pin_entry), (moko_dialer_dispose):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 12:03:24 UTC (rev 2703)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 12:41:06 UTC (rev 2704)
@@ -417,6 +417,8 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
+ g_print ("Register type = %d\n");
+
priv->registered = TRUE;
}
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-15 15:26:57 +0200 (Wed, 15 Aug 2007)
New Revision: 2705
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_keypad_pin_entry),
(on_network_registered), (moko_dialer_init):
Check for registration type, and take the right action.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 12:41:06 UTC (rev 2704)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 13:26:57 UTC (rev 2705)
@@ -1,5 +1,11 @@
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_keypad_pin_entry),
+ (on_network_registered), (moko_dialer_init):
+ Check for registration type, and take the right action.
+
+2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (on_network_registered):
Print the type of registration information.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 12:41:06 UTC (rev 2704)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 13:26:57 UTC (rev 2705)
@@ -68,6 +68,7 @@
MokoTime *time;
/* Registration variables */
+ guint reg_timeout;
gboolean reg_request;
gboolean registered;
};
@@ -295,9 +296,9 @@
priv->reg_request = TRUE;
priv->registered = FALSE;
- g_timeout_add (GSM_REGISTER_TIMEOUT,
- (GSourceFunc)register_network_cb,
- dialer);
+ priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT,
+ (GSourceFunc)register_network_cb,
+ dialer);
}
@@ -417,9 +418,25 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
- g_print ("Register type = %d\n");
-
- priv->registered = TRUE;
+ switch (type)
+ {
+ case MOKO_GSMD_CONNECTION_NETREG_NONE:
+ case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
+ /* Do nothing */
+ break;
+ case MOKO_GSMD_CONNECTION_NETREG_DENIED:
+ /* This may be a pin issue*/
+ g_print ("Registration denied, the SIM pin may need to be entered\n");
+ moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), TRUE);
+ g_source_remove (priv->reg_timeout);
+ break;
+ case MOKO_GSMD_CONNECTION_NETREG_HOME:
+ case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
+ priv->registered = TRUE;
+ break;
+ default:
+ g_warning ("Unhandled register event type = %d\n", type);
+ };
}
static void
@@ -727,9 +744,9 @@
* antenna*/
priv->reg_request = TRUE;
priv->registered = FALSE;
- g_timeout_add (GSM_REGISTER_TIMEOUT,
- (GSourceFunc)register_network_cb,
- dialer);
+ priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT,
+ (GSourceFunc)register_network_cb,
+ dialer);
/* Connect to the gsmd signals */
g_signal_connect (G_OBJECT (conn), "network-registration",
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-15 15:31:42 +0200 (Wed, 15 Aug 2007)
New Revision: 2706
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_network_registered):
Remove the registration timeout out on registration.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 13:26:57 UTC (rev 2705)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 13:31:42 UTC (rev 2706)
@@ -1,5 +1,10 @@
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_network_registered):
+ Remove the registration timeout out on registration.
+
+2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/moko-dialer.c: (on_keypad_pin_entry),
(on_network_registered), (moko_dialer_init):
Check for registration type, and take the right action.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 13:26:57 UTC (rev 2705)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 13:31:42 UTC (rev 2706)
@@ -418,6 +418,8 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
+ g_print ("Register type %d\n", type);
+
switch (type)
{
case MOKO_GSMD_CONNECTION_NETREG_NONE:
@@ -432,6 +434,8 @@
break;
case MOKO_GSMD_CONNECTION_NETREG_HOME:
case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
+ g_print ("Network registered\n")
+ g_source_remove (priv->reg_timeout);
priv->registered = TRUE;
break;
default:
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-15 15:36:00 +0200 (Wed, 15 Aug 2007)
New Revision: 2707
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_network_registered):
Fix a typo.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 13:31:42 UTC (rev 2706)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-15 13:36:00 UTC (rev 2707)
@@ -1,6 +1,11 @@
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_network_registered):
+ Fix a typo.
+
+2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
+
+ * src/moko-dialer.c: (on_network_registered):
Remove the registration timeout out on registration.
2007-08-15 Neil J. Patel <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 13:31:42 UTC (rev 2706)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-15 13:36:00 UTC (rev 2707)
@@ -434,8 +434,8 @@
break;
case MOKO_GSMD_CONNECTION_NETREG_HOME:
case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
- g_print ("Network registered\n")
- g_source_remove (priv->reg_timeout);
+ g_print ("Network registered\n");
+ g_source_remove (priv->reg_timeout);
priv->registered = TRUE;
break;
default:
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-08-15 17:32:50 +0200 (Wed, 15 Aug 2007)
New Revision: 2708
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
Log:
* libmokoui/moko-stock.c: (_moko_stock_add_icon): Add a hack to make sure we
at least have a version of the icons available at each possible GtkIconSize
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-08-15
13:36:00 UTC (rev 2707)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-08-15
15:32:50 UTC (rev 2708)
@@ -1,3 +1,8 @@
+2007-08-15 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-stock.c: (_moko_stock_add_icon): Add a hack to make
sure we
+ at least have a version of the icons available at each possible
GtkIconSize
+
2007-08-03 Holger Hans Peter Freyther <[EMAIL PROTECTED]>
Change GtkAdjustment handling to be the Gtk+ way. There is
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
2007-08-15 13:36:00 UTC (rev 2707)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-stock.c
2007-08-15 15:32:50 UTC (rev 2708)
@@ -69,37 +69,49 @@
_moko_stock_add_icon (GtkIconFactory *factory, const GtkStockItem *item)
{
static GtkIconTheme *theme = NULL;
- GtkIconSource *source = NULL;
+ GtkIconSource *source;
GtkIconSet *set = NULL;
GdkPixbuf *pixbuf = NULL;
+ int i;
if (theme == NULL)
theme = gtk_icon_theme_get_default ();
- source = gtk_icon_source_new ();
-
- gtk_icon_source_set_size (source, GTK_ICON_SIZE_BUTTON);
- gtk_icon_source_set_size_wildcarded (source, FALSE);
-
pixbuf = gtk_icon_theme_load_icon (theme, item->stock_id,
32, 0, NULL);
+
if (pixbuf == NULL)
{
g_print ("Cannot load stock icon from theme : %s\n", item->stock_id);
return;
}
- gtk_icon_source_set_pixbuf (source, pixbuf);
+ set = gtk_icon_set_new ();
- g_object_unref (G_OBJECT (pixbuf));
+ /*
+ * This is temporary hack to make sure we have all the sizes available.
+ * Ideally we should try loading the pixbuf at the correct size from the
theme
+ * for each possible size in GtkIconSize, rather than re-using the same
pixbuf
+ */
+ for (i = GTK_ICON_SIZE_MENU; i <= GTK_ICON_SIZE_DIALOG; i++)
+ {
+ source = gtk_icon_source_new ();
+ gtk_icon_source_set_size (source, i);
+ gtk_icon_source_set_size_wildcarded (source, FALSE);
+ gtk_icon_source_set_pixbuf (source, pixbuf);
+ gtk_icon_set_add_source (set, source);
+ gtk_icon_source_free (source);
+ }
- set = gtk_icon_set_new ();
- gtk_icon_set_add_source (set, source);
- gtk_icon_source_free (source);
+
gtk_icon_factory_add (factory, item->stock_id, set);
gtk_icon_set_unref (set);
+
+
+
+ g_object_unref (G_OBJECT (pixbuf));
}
void
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-08-16 06:16:26 +0200 (Thu, 16 Aug 2007)
New Revision: 2709
Modified:
trunk/src/target/gsm/include/gsmd/gsmd.h
trunk/src/target/gsm/src/gsmd/atcmd.c
trunk/src/target/gsm/src/gsmd/unsolicited.c
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/gsmd/vendor_ti.c
trunk/src/target/gsm/src/util/atcmd.c
Log:
From: Andrzej Zaborowski <[EMAIL PROTECTED]>
Date: Wed, 11 Jul 2007 16:03:16 +0200
Subject: [PATCH] Multiline commands support. Miscellaneous bugs.
This adds support for commands like +CMGS and +CMGW that span mroe than one
line and the lines can't be sent to modem as separate commands because every
next line has to wait for a "> " prompt from modem before writing (otherwise
beginnings of the lines get eaten).
This patch also corrects a number of miscellaneous glitches that I have hit. I
can split them each out if needed, but they are all quite obvious. The
cms_error variable is introduced because there are CME and possibly other
errors with the same codes, which resulted in that when I was sending a message
and got error 42 ("congestion") on sending, openmoko-dialer asked for PIN
because CMS event 42 happens to be PIN inquiry. The change in libgsmd-tool
fixes the issue described by Philipp Zabel on the list, with usock locking up.
Modified: trunk/src/target/gsm/include/gsmd/gsmd.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/gsmd.h 2007-08-15 15:32:50 UTC (rev
2708)
+++ trunk/src/target/gsm/include/gsmd/gsmd.h 2007-08-16 04:16:26 UTC (rev
2709)
@@ -27,6 +27,7 @@
u_int32_t buflen;
u_int16_t id;
u_int8_t flags;
+ char *cur;
char buf[];
};
@@ -36,6 +37,8 @@
LLPARSE_STATE_IDLE_LF, /* LF before response (V1) */
LLPARSE_STATE_RESULT, /* within result payload */
LLPARSE_STATE_RESULT_CR, /* CR after result */
+ LLPARSE_STATE_PROMPT, /* within a "> " prompt */
+ LLPARSE_STATE_PROMPT_SPC, /* a complete "> " prompt */
LLPARSE_STATE_ERROR, /* something went wrong */
/* ... idle again */
};
@@ -52,6 +55,7 @@
unsigned int flags;
void *ctx;
int (*cb)(const char *buf, int len, void *ctx);
+ int (*prompt_cb)(void *ctx);
char *cur;
char buf[LLPARSE_BUF_SIZE];
};
@@ -92,7 +96,8 @@
extern int gsmdlog_init(const char *path);
/* write a message to the daemons' logfile */
-void __gsmd_log(int level, const char *file, int line, const char *function,
const char *message, ...);
+void __gsmd_log(int level, const char *file, int line, const char *function,
const char *message, ...)
+ __attribute__ ((__format__ (__printf__, 5, 6)));
/* macro for logging including filename and line number */
#define gsmd_log(level, format, args ...) \
__gsmd_log(level, __FILE__, __LINE__, __FUNCTION__, format, ## args)
Modified: trunk/src/target/gsm/src/gsmd/atcmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/atcmd.c 2007-08-15 15:32:50 UTC (rev
2708)
+++ trunk/src/target/gsm/src/gsmd/atcmd.c 2007-08-16 04:16:26 UTC (rev
2709)
@@ -82,9 +82,12 @@
switch (llp->state) {
case LLPARSE_STATE_IDLE:
+ case LLPARSE_STATE_PROMPT_SPC:
if (llp->flags & LGSM_ATCMD_F_EXTENDED) {
if (byte == '\r')
llp->state = LLPARSE_STATE_IDLE_CR;
+ else if (byte == '>')
+ llp->state = LLPARSE_STATE_PROMPT;
else {
#ifdef STRICT
llp->state = LLPARSE_STATE_ERROR;
@@ -108,6 +111,8 @@
/* can we really go directly into result_cr ? */
if (byte == '\r')
llp->state = LLPARSE_STATE_RESULT_CR;
+ else if (byte == '>')
+ llp->state = LLPARSE_STATE_PROMPT;
else {
llp->state = LLPARSE_STATE_RESULT;
ret = llparse_append(llp, byte);
@@ -127,6 +132,16 @@
memset(llp->buf, 0, LLPARSE_BUF_SIZE);
}
break;
+ case LLPARSE_STATE_PROMPT:
+ if (byte == ' ')
+ llp->state = LLPARSE_STATE_PROMPT_SPC;
+ else {
+ /* this was not a real "> " prompt */
+ llparse_append(llp, '>');
+ ret = llparse_append(llp, byte);
+ llp->state = LLPARSE_STATE_RESULT;
+ }
+ break;
case LLPARSE_STATE_ERROR:
break;
}
@@ -147,6 +162,10 @@
/* FIXME: what to do with return value ? */
llp->cb(llp->buf, llp->cur - llp->buf, llp->ctx);
}
+
+ /* if a full SMS-style prompt was received, poke the select */
+ if (llp->state == LLPARSE_STATE_PROMPT_SPC)
+ llp->prompt_cb(llp->ctx);
}
return 0;
@@ -176,8 +195,9 @@
struct gsmd *g = ctx;
struct gsmd_atcmd *cmd = NULL;
static char mlbuf[MLPARSE_BUF_SIZE];
- int rc = 0, final = 0;
- int mlbuf_len;
+ int rc = 0;
+ static int mlbuf_len;
+ int cme_error = 0;
DEBUGP("buf=`%s'(%d)\n", buf, len);
@@ -231,7 +251,7 @@
DEBUGP("error number %lu\n", err_nr);
if (cmd)
cmd->ret = err_nr;
- final = 1;
+ cme_error = 1;
goto final_cb;
}
if (!strncmp(buf+1, "CMS ERROR", 9)) {
@@ -241,7 +261,6 @@
DEBUGP("error number %lu\n", err_nr);
if (cmd)
cmd->ret = err_nr;
- final = 1;
goto final_cb;
}
@@ -273,7 +292,7 @@
/* it might be a multiline response, so if there's a
previous
response, send out mlbuf and start afresh with an
empty buffer */
- if (mlbuf[0] != 0) {
+ if (mlbuf_len) {
if (!cmd->cb) {
gsmd_log(GSMD_NOTICE, "command without
cb!!!\n");
} else {
@@ -281,8 +300,8 @@
cmd->resp = mlbuf;
rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
DEBUGP("Clearing mlbuf\n");
- mlbuf[0] = 0;
}
+ mlbuf_len = 0;
}
/* the current buf will be appended to mlbuf below */
@@ -301,7 +320,6 @@
DEBUGP("unspecified error\n");
if (cmd)
cmd->ret = 4;
- final = 1;
goto final_cb;
}
@@ -310,7 +328,6 @@
/* Part of Case 'C' */
if (cmd)
cmd->ret = 0;
- final = 1;
goto final_cb;
}
@@ -319,14 +336,12 @@
if (!strncmp(buf, "NO CARRIER", 11) ||
((g->flags & GSMD_FLAG_V0) && buf[0] == '3')) {
/* Part of Case 'D' */
- final = 1;
goto final_cb;
}
if (!strncmp(buf, "BUSY", 4) ||
((g->flags & GSMD_FLAG_V0) && buf[0] == '7')) {
/* Part of Case 'D' */
- final = 1;
goto final_cb;
}
}
@@ -334,21 +349,13 @@
/* we reach here, if we are at an information response that needs to be
* passed on */
- if (mlbuf[0] == 0) {
- DEBUGP("Filling mlbuf\n");
- strncat(mlbuf, buf, sizeof(mlbuf)-1);
- } else {
- DEBUGP("Appending buf to mlbuf\n");
- mlbuf_len = strlen(mlbuf);
- if (mlbuf_len+1 < sizeof(mlbuf)) {
- mlbuf[mlbuf_len] = '\n';
- mlbuf[mlbuf_len+1] = '\0';
- strncat(mlbuf, buf, sizeof(mlbuf)-mlbuf_len-2);
- } else {
- DEBUGP("response too big for mlbuf!!!\n");
- return -EFBIG;
- }
- }
+ if (mlbuf_len)
+ mlbuf[mlbuf_len ++] = '\n';
+ DEBUGP("Appending buf to mlbuf\n");
+ if (len > sizeof(mlbuf) - mlbuf_len)
+ len = sizeof(mlbuf) - mlbuf_len;
+ memcpy(mlbuf + mlbuf_len, buf, len);
+ mlbuf_len += len;
return 0;
final_cb:
@@ -357,7 +364,7 @@
if (!cmd)
return rc;
- if (cmd && cmd->ret != 0)
+ if (cmd && cme_error)
generate_event_from_cme(g, cmd->ret);
if (!cmd->cb) {
@@ -365,13 +372,14 @@
} else {
DEBUGP("Calling final cmd->cb()\n");
/* send final result code if there is no information response
in mlbuf */
- if (mlbuf[0] == 0)
+ if (mlbuf_len) {
+ cmd->resp = mlbuf;
+ mlbuf[mlbuf_len] = 0;
+ } else
cmd->resp = buf;
- else
- cmd->resp = mlbuf;
rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
DEBUGP("Clearing mlbuf\n");
- mlbuf[0] = 0;
+ mlbuf_len = 0;
}
/* remove from list of currently executing cmds */
@@ -384,14 +392,23 @@
g->gfd_uart.when |= GSMD_FD_WRITE;
return rc;
-}
+}
+/* called when the modem asked for a new line of a multiline atcmd */
+static int atcmd_prompt(void *data)
+{
+ struct gsmd *g = data;
+
+ g->gfd_uart.when |= GSMD_FD_WRITE;
+}
+
/* callback to be called if [virtual] UART has some data for us */
static int atcmd_select_cb(int fd, unsigned int what, void *data)
{
int len, rc;
static char rxbuf[1024];
struct gsmd *g = data;
+ char *cr;
if (what & GSMD_FD_READ) {
memset(rxbuf, 0, sizeof(rxbuf));
@@ -415,8 +432,12 @@
if ((what & GSMD_FD_WRITE) && g->interpreter_ready) {
struct gsmd_atcmd *pos, *pos2;
llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) {
- len = strlen(pos->buf);
- rc = write(fd, pos->buf, strlen(pos->buf));
+ cr = strchr(pos->cur, '\n');
+ if (cr)
+ len = cr - pos->cur;
+ else
+ len = pos->buflen;
+ rc = write(fd, pos->cur, len);
if (rc == 0) {
gsmd_log(GSMD_ERROR, "write returns 0,
aborting\n");
break;
@@ -425,27 +446,33 @@
fd, rc);
return rc;
}
- if (rc < len) {
- gsmd_log(GSMD_FATAL, "short write!!! FIXME!\n");
- exit(3);
- }
+ if (cr && rc == len)
+ rc ++; /* Skip the \n */
+ pos->buflen -= rc;
+ pos->cur += rc;
write(fd, "\r", 1);
- /* success: remove from global list of to-be-sent
atcmds */
- llist_del(&pos->list);
- /* append to global list of executing atcmds */
- llist_add_tail(&pos->list, &g->busy_atcmds);
+ if (!pos->buflen) {
+ /* success: remove from global list of
+ * to-be-sent atcmds */
+ llist_del(&pos->list);
+ /* append to global list of executing atcmds */
+ llist_add_tail(&pos->list, &g->busy_atcmds);
+
/* we only send one cmd at the moment */
- g->gfd_uart.when &= ~GSMD_FD_WRITE;
break;
+ } else {
+ /* The write was short or the atcmd has more
+ * lines to send after a "> ". */
+ if (rc < len)
+ return 0;
+ break;
+ }
}
- }
-#if 0
- if (llist_empty(&g->pending_atcmds))
+ /* Either pending_atcmds is empty or a command has to wait */
g->gfd_uart.when &= ~GSMD_FD_WRITE;
-#endif
-
+ }
return 0;
}
@@ -456,10 +483,10 @@
{
int buflen = strlen(cmd);
struct gsmd_atcmd *atcmd;
-
+
if (rlen > buflen)
buflen = rlen;
-
+
atcmd = talloc_size(__atcmd_ctx, sizeof(*atcmd)+ buflen);
if (!atcmd)
return NULL;
@@ -470,6 +497,7 @@
atcmd->ret = -255;
atcmd->buflen = buflen;
atcmd->buf[buflen-1] = '\0';
+ atcmd->cur = atcmd->buf;
atcmd->cb = cb;
atcmd->resp = NULL;
strncpy(atcmd->buf, cmd, buflen-1);
@@ -482,8 +510,9 @@
{
DEBUGP("submitting command `%s'\n", cmd->buf);
+ if (llist_empty(&g->pending_atcmds))
+ g->gfd_uart.when |= GSMD_FD_WRITE;
llist_add_tail(&cmd->list, &g->pending_atcmds);
- g->gfd_uart.when |= GSMD_FD_WRITE;
return 0;
}
@@ -519,9 +548,9 @@
g->llp.cur = g->llp.buf;
g->llp.len = sizeof(g->llp.buf);
g->llp.cb = &ml_parse;
+ g->llp.prompt_cb = &atcmd_prompt;
g->llp.ctx = g;
g->llp.flags = LGSM_ATCMD_F_EXTENDED;
return gsmd_register_fd(&g->gfd_uart);
-}
-
+}
Modified: trunk/src/target/gsm/src/gsmd/unsolicited.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/unsolicited.c 2007-08-15 15:32:50 UTC (rev
2708)
+++ trunk/src/target/gsm/src/gsmd/unsolicited.c 2007-08-16 04:16:26 UTC (rev
2709)
@@ -518,9 +518,11 @@
case GSM0707_CME_PHONE_ADAPT_RESERVED:
case GSM0707_CME_SIM_NOT_INSERTED:
/* FIXME */
+ talloc_free(gu);
return 0;
break;
default:
+ talloc_free(gu);
return 0;
break;
}
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2007-08-15 15:32:50 UTC (rev
2708)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2007-08-16 04:16:26 UTC (rev
2709)
@@ -75,7 +75,7 @@
ucmd->hdr.version = GSMD_PROTO_VERSION;
ucmd->hdr.msg_type = GSMD_MSG_PASSTHROUGH;
ucmd->hdr.msg_subtype = GSMD_PASSTHROUGH_RESP;
- ucmd->hdr.len = strlen(resp)+1;
+ ucmd->hdr.len = rlen;
ucmd->hdr.id = cmd->id;
memcpy(ucmd->buf, resp, ucmd->hdr.len);
@@ -100,7 +100,7 @@
static int usock_rcv_event(struct gsmd_user *gu, struct gsmd_msg_hdr *gph, int
len)
{
- u_int32_t *evtmask = (u_int32_t *) ((char *)gph + sizeof(*gph),
gph->id);
+ u_int32_t *evtmask = (u_int32_t *) ((char *)gph + sizeof(*gph));
if (len < sizeof(*gph) + sizeof(u_int32_t))
return -EINVAL;
Modified: trunk/src/target/gsm/src/gsmd/vendor_ti.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_ti.c 2007-08-15 15:32:50 UTC (rev
2708)
+++ trunk/src/target/gsm/src/gsmd/vendor_ti.c 2007-08-16 04:16:26 UTC (rev
2709)
@@ -277,7 +277,7 @@
static int ticalypso_initsettings(struct gsmd *g)
{
- int rc;
+ int rc = 0;
struct gsmd_atcmd *cmd;
/* use +CTZR: to report time zone changes */
Modified: trunk/src/target/gsm/src/util/atcmd.c
===================================================================
--- trunk/src/target/gsm/src/util/atcmd.c 2007-08-15 15:32:50 UTC (rev
2708)
+++ trunk/src/target/gsm/src/util/atcmd.c 2007-08-16 04:16:26 UTC (rev
2709)
@@ -91,9 +91,11 @@
continue;
}
printf("STR=`%s'\n", buf);
+
+ /* this is a synchronous call for a passthrough
+ * command */
+ lgsm_passthrough(lgsmh, buf, rbuf, &rlen);
+ printf("RSTR=`%s'\n", rbuf);
}
- /* this is a synchronous call for a passthrough command */
- lgsm_passthrough(lgsmh, buf, rbuf, &rlen);
- printf("RSTR=`%s'\n", rbuf);
}
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
