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. r3537 -
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0
([EMAIL PROTECTED])
2. r3538 - in
trunk/src/target/OM-2007.2/applications/openmoko-calculator2: .
src ([EMAIL PROTECTED])
3. r3539 -
trunk/src/target/OM-2007.2/applications/openmoko-today2
([EMAIL PROTECTED])
4. r3540 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
5. r3541 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
6. r3542 - in
trunk/src/target/OM-2007.2/applications/openmoko-terminal2: . src
([EMAIL PROTECTED])
7. r3543 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
8. r3544 - in trunk/src/target/gsm/src: gsmd util
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-11-30 12:44:15 +0100 (Fri, 30 Nov 2007)
New Revision: 3537
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokosearchbar
Log:
* Increase MokoSearchbar entry padding to fix bug 835
Modified:
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokosearchbar
===================================================================
---
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokosearchbar
2007-11-30 05:42:31 UTC (rev 3536)
+++
trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/gtk-2.0/mokosearchbar
2007-11-30 11:44:15 UTC (rev 3537)
@@ -37,7 +37,7 @@
{
xthickness = 7
ythickness = 16
- GtkEntry::inner_border = {10, 10, 2, 2}
+ GtkEntry::inner_border = {10, 10, 8, 8}
engine "pixmap"
{
image
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-30 17:05:35 +0100 (Fri, 30 Nov 2007)
New Revision: 3538
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
Log:
openmoko-calculator2: use proper glyphs for /, *, etc. -- patch by Ross Burton
Modified: trunk/src/target/OM-2007.2/applications/openmoko-calculator2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/ChangeLog
2007-11-30 11:44:15 UTC (rev 3537)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/ChangeLog
2007-11-30 16:05:35 UTC (rev 3538)
@@ -0,0 +1,5 @@
+2007-30-11 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/openmoko-calculator.c: use proper glyphs for /, *, etc.
+ (patch by Ross Burton)
+
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
2007-11-30 11:44:15 UTC (rev 3537)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
2007-11-30 16:05:35 UTC (rev 3538)
@@ -68,11 +68,11 @@
#define CALC_ROWS 5
#define CALC_COLS 4
static const gchar *label[CALC_ROWS][CALC_COLS] = {
- {N_("CE"), N_("C"), "/", "*" },
+ {N_("CE"), N_("C"), "\303\267" /* divide */, "\303\227" /* multiply */ },
{"7", "8", "9", "+"},
- {"4", "5", "6", "-"},
+ {"4", "5", "6", "\342\210\222" /* minus */},
{"1", "2", "3", "="},
- {"0", N_("."), "+/-", "none"},
+ {"0", N_("."), "\302\261" /* plus/minus */, "none"},
};
static enum operation ops[CALC_ROWS][CALC_COLS] = {
{ clearall, clear, div, mult},
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-11-30 17:10:37 +0100 (Fri, 30 Nov 2007)
New Revision: 3539
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/
Log:
Update libtaku
Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-today2
___________________________________________________________________
Name: svn:externals
- libkoto -r346 http://svn.o-hand.com/repos/tasks/trunk/libkoto
libtaku -r1778
http://svn.o-hand.com/repos/matchbox/trunk/matchbox-desktop-2/libtaku
+ libkoto -r346 http://svn.o-hand.com/repos/tasks/trunk/libkoto
libtaku -r1845
http://svn.o-hand.com/repos/matchbox/trunk/matchbox-desktop-2/libtaku
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-11-30 17:11:16 +0100 (Fri, 30 Nov 2007)
New Revision: 3540
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
Log:
* src/today-launcher.c: (item_removed_cb):
Grey out messages launcher-button if the .desktop gets removed
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-11-30 16:10:37 UTC (rev 3539)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-11-30 16:11:16 UTC (rev 3540)
@@ -1,3 +1,8 @@
+2007-11-30 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/today-launcher.c: (item_removed_cb):
+ Grey out messages launcher-button if the .desktop gets removed
+
2007-11-23 Thomas Wood <[EMAIL PROTECTED]>
* src/today-main.c: (main): Initialise OpenMoko stock items
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-11-30 16:10:37 UTC (rev 3539)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-11-30 16:11:16 UTC (rev 3540)
@@ -71,6 +71,10 @@
GTK_WIDGET (data->dates_button), FALSE);
} else if (data->clock_item == item) {
data->clock_item = NULL;
+ } else if (data->messages_item == item) {
+ data->messages_item = NULL;
+ gtk_widget_set_sensitive (
+ GTK_WIDGET (data->messages_button), FALSE);
}
tiles = gtk_container_get_children (
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-11-30 17:25:31 +0100 (Fri, 30 Nov 2007)
New Revision: 3541
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
Log:
* src/today-main.c: (workarea_changed), (main):
Migrate to x_monitor_workarea from x_get_workarea
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-11-30 16:11:16 UTC (rev 3540)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-11-30 16:25:31 UTC (rev 3541)
@@ -1,5 +1,10 @@
2007-11-30 Chris Lord <[EMAIL PROTECTED]>
+ * src/today-main.c: (workarea_changed), (main):
+ Migrate to x_monitor_workarea from x_get_workarea
+
+2007-11-30 Chris Lord <[EMAIL PROTECTED]>
+
* src/today-launcher.c: (item_removed_cb):
Grey out messages launcher-button if the .desktop gets removed
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-11-30 16:11:16 UTC (rev 3540)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-11-30 16:25:31 UTC (rev 3541)
@@ -349,6 +349,15 @@
}
}
+static GtkWidget *window;
+
+static void
+workarea_changed (int x, int y, int w, int h)
+{
+ gtk_window_resize (GTK_WINDOW (window), w, h);
+ gtk_window_move (GTK_WINDOW (window), x, y);
+}
+
int
main (int argc, char **argv)
{
@@ -426,10 +435,8 @@
gtk_window_set_type_hint (GTK_WINDOW (data.window),
GDK_WINDOW_TYPE_HINT_DESKTOP);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (data.window), TRUE);
- if (x_get_workarea (&x, &y, &w, &h)) {
- gtk_window_set_default_size (GTK_WINDOW (data.window), w, h);
- gtk_window_move (GTK_WINDOW (data.window), x, y);
- }
+ window = data.window;
+ x_monitor_workarea (gtk_widget_get_screen (window), workarea_changed);
#else
gtk_window_set_default_size (GTK_WINDOW (data.window), 480, 600);
#endif
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-30 17:41:52 +0100 (Fri, 30 Nov 2007)
New Revision: 3542
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/moko-terminal.c
Log:
openmoko-terminal2: '~' doesn't work, try $HOME instead
Modified: trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
2007-11-30 16:25:31 UTC (rev 3541)
+++ trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
2007-11-30 16:41:52 UTC (rev 3542)
@@ -1,3 +1,7 @@
+2007-11-30 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/moko-terminal.c: '~' doesn't seem to work, try $HOME instead.
+
2007-11-18 Michael Lauer <[EMAIL PROTECTED]>
* src/moko-terminal.c: fix terminal colors, start in '~'
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/moko-terminal.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/moko-terminal.c
2007-11-30 16:25:31 UTC (rev 3541)
+++
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/src/moko-terminal.c
2007-11-30 16:41:52 UTC (rev 3542)
@@ -18,6 +18,7 @@
#include "moko-terminal.h"
#include <vte/vte.h>
+#include <stdlib.h>
#undef DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
@@ -138,7 +139,7 @@
NULL,
NULL,
NULL,
- "~/",
+ getenv( "HOME" ),
TRUE,
TRUE,
TRUE);
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-11-30 18:17:53 +0100 (Fri, 30 Nov 2007)
New Revision: 3543
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
Log:
* src/today-task-manager.c: (today_task_manager_populate_tasks),
(set_focus_cb), (page_shown), (page_hidden),
(today_task_manager_notify_visible_cb),
(today_task_manager_visibility_notify_event_cb),
(today_task_manager_unmap_cb), (today_task_manager_page_create):
* src/today.h:
Grey out kill/jump-to/killall buttons where appropriate, fix spurious
warnings on app exit
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-11-30 16:41:52 UTC (rev 3542)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-11-30 17:17:53 UTC (rev 3543)
@@ -1,5 +1,16 @@
2007-11-30 Chris Lord <[EMAIL PROTECTED]>
+ * src/today-task-manager.c: (today_task_manager_populate_tasks),
+ (set_focus_cb), (page_shown), (page_hidden),
+ (today_task_manager_notify_visible_cb),
+ (today_task_manager_visibility_notify_event_cb),
+ (today_task_manager_unmap_cb), (today_task_manager_page_create):
+ * src/today.h:
+ Grey out kill/jump-to/killall buttons where appropriate, fix spurious
+ warnings on app exit
+
+2007-11-30 Chris Lord <[EMAIL PROTECTED]>
+
* src/today-main.c: (workarea_changed), (main):
Migrate to x_monitor_workarea from x_get_workarea
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
2007-11-30 16:41:52 UTC (rev 3542)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
2007-11-30 17:17:53 UTC (rev 3543)
@@ -343,6 +343,9 @@
/* Empty list */
today_task_manager_free_tasks (data);
+ /* Return if our main window has gone (e.g. on quit) */
+ if ((!data->window) || (!data->window->window)) return;
+
/* Retrieve list of app windows from root window */
display = gtk_widget_get_display (data->tasks_table);
screen = gtk_widget_get_screen (data->tasks_table);
@@ -380,7 +383,7 @@
GdkPixbuf *icon;
GdkWindow *window;
- if (GDK_WINDOW_XID (current) == windows[i]) continue;
+ if (current && GDK_WINDOW_XID (current) == windows[i]) continue;
if (GDK_WINDOW_XID (data->window->window) == windows[i])
continue;
@@ -427,35 +430,63 @@
task_tile);
gtk_widget_show (task_tile);
}
- g_object_unref (current);
+ if (current) g_object_unref (current);
- /* If no windows were found, insert an insensitive "No tasks" item */
- if (nitems == 0) {
- GtkWidget *task_tile;
-
- task_tile = taku_icon_tile_new ();
+ /* If no windows were found, insert an insensitive "No tasks" item */
+ if (nitems == 0) {
+ GtkWidget *task_tile;
+
+ task_tile = taku_icon_tile_new ();
taku_icon_tile_set_primary (TAKU_ICON_TILE (task_tile),
_("No active tasks"));
- gtk_widget_set_sensitive (task_tile, FALSE);
+ gtk_widget_set_sensitive (task_tile, FALSE);
gtk_container_add (GTK_CONTAINER (data->tasks_table),
task_tile);
gtk_widget_show (task_tile);
+
+ gtk_widget_set_sensitive (
+ GTK_WIDGET (data->killall_button), FALSE);
+ } else {
+ gtk_widget_set_sensitive (
+ GTK_WIDGET (data->killall_button), TRUE);
}
- /* Cleanup */
- XFree (windows);
+ /* Cleanup */
+ XFree (windows);
}
static void
+set_focus_cb (GtkWindow *window, GtkWidget *widget, TodayData *data)
+{
+ gtk_widget_set_sensitive (data->kill_button, TAKU_IS_TILE (widget));
+ gtk_widget_set_sensitive (data->switch_button, TAKU_IS_TILE (widget));
+}
+
+static void
+page_shown (TodayData *data)
+{
+ today_task_manager_populate_tasks (data);
+ g_signal_connect (data->window, "set-focus",
+ G_CALLBACK (set_focus_cb), data);
+}
+
+static void
+page_hidden (TodayData *data)
+{
+ today_task_manager_free_tasks (data);
+ g_signal_handlers_disconnect_by_func (data->window, set_focus_cb, data);
+}
+
+static void
today_task_manager_notify_visible_cb (GObject *gobject,
GParamSpec *arg1,
TodayData *data)
{
if ((!hidden) && (!GTK_WIDGET_VISIBLE (gobject))) {
hidden = TRUE;
- today_task_manager_free_tasks (data);
+ page_hidden (data);
}
}
@@ -467,11 +498,11 @@
if (((event->state == GDK_VISIBILITY_PARTIAL) ||
(event->state == GDK_VISIBILITY_UNOBSCURED)) && (hidden)) {
hidden = FALSE;
- today_task_manager_populate_tasks (data);
+ page_shown (data);
} else if ((event->state == GDK_VISIBILITY_FULLY_OBSCURED) &&
(!hidden)) {
hidden = TRUE;
- today_task_manager_free_tasks (data);
+ page_hidden (data);
}
return FALSE;
@@ -482,7 +513,7 @@
{
if (!hidden) {
hidden = TRUE;
- today_task_manager_free_tasks (data);
+ page_hidden (data);
}
}
@@ -715,7 +746,6 @@
today_task_manager_page_create (TodayData *data)
{
GtkWidget *vbox, *toolbar, *viewport, *scroll;
- GtkToolItem *button;
vbox = gtk_vbox_new (FALSE, 0);
@@ -724,28 +754,29 @@
gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, TRUE, 0);
/* Kill all apps button */
- button = gtk_tool_button_new_from_stock (MOKO_STOCK_FOLDER_DELETE);
- gtk_tool_item_set_expand (button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
+ data->kill_button = gtk_tool_button_new_from_stock (
+ MOKO_STOCK_FOLDER_DELETE);
+ gtk_tool_item_set_expand (data->kill_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->kill_button, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
gtk_separator_tool_item_new (), 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (data->kill_button, "clicked",
G_CALLBACK (today_task_manager_killall_clicked_cb), data);
/* Switch to app button */
- button = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO);
- gtk_tool_item_set_expand (button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
+ data->switch_button = gtk_tool_button_new_from_stock
(GTK_STOCK_JUMP_TO);
+ gtk_tool_item_set_expand (data->switch_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->switch_button, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
gtk_separator_tool_item_new (), 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ g_signal_connect (data->switch_button, "clicked",
G_CALLBACK (today_task_manager_raise_clicked_cb), data);
/* Kill app button */
- button = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
- gtk_tool_item_set_expand (button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), button, 0);
- g_signal_connect (G_OBJECT (button), "clicked",
+ data->killall_button = gtk_tool_button_new_from_stock
(GTK_STOCK_DELETE);
+ gtk_tool_item_set_expand (data->killall_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->killall_button, 0);
+ g_signal_connect (data->killall_button, "clicked",
G_CALLBACK (today_task_manager_kill_clicked_cb), data);
/* Viewport / tasks table */
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-11-30 16:41:52 UTC (rev 3542)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today.h
2007-11-30 17:17:53 UTC (rev 3543)
@@ -60,6 +60,9 @@
/* App manager */
GdkWindow *root_window;
GtkWidget *tasks_table;
+ GtkToolItem *kill_button;
+ GtkToolItem *killall_button;
+ GtkToolItem *switch_button;
} TodayData;
#endif
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-12-01 02:54:59 +0100 (Sat, 01 Dec 2007)
New Revision: 3544
Modified:
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: Modem power-up and -down result events.(Andrzej Zaborowski)
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2007-11-30 17:17:53 UTC (rev
3543)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2007-12-01 01:54:59 UTC (rev
3544)
@@ -248,6 +248,7 @@
static int phone_powerup_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
{
struct gsmd_user *gu = ctx;
+ struct gsmd_ucmd *ucmd;
/* We need to verify if there is some error */
switch (cmd->ret) {
@@ -260,9 +261,31 @@
gsmd_log(GSMD_DEBUG, "Radio power-up failed\n");
break;
}
- return 0;
+
+ ucmd = gsmd_ucmd_fill(sizeof(int), GSMD_MSG_PHONE,
+ GSMD_PHONE_POWERUP, 0);
+ if (ucmd) {
+ ((int *) ucmd->buf)[0] = cmd->ret;
+ usock_cmd_enqueue(ucmd, gu);
+ return 0;
+ }
+ return -ENOMEM;
}
+static int phone_powerdown_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
+{
+ struct gsmd_user *gu = ctx;
+ struct gsmd_ucmd *ucmd = gsmd_ucmd_fill(sizeof(int), GSMD_MSG_PHONE,
+ GSMD_PHONE_POWERDOWN, 0);
+
+ if (ucmd) {
+ ((int *) ucmd->buf)[0] = cmd->ret;
+ usock_cmd_enqueue(ucmd, gu);
+ return 0;
+ }
+ return -ENOMEM;
+}
+
static int get_imsi_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
{
struct gsmd_user *gu = ctx;
@@ -295,7 +318,7 @@
case GSMD_PHONE_POWERDOWN:
cmd = atcmd_fill("AT+CFUN=0", 9+1,
- &null_cmd_cb, gu, 0, NULL);
+ &phone_powerdown_cb, gu, 0, NULL);
gu->gsmd->dev_state.on = 0;
break;
case GSMD_PHONE_GET_IMSI:
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-11-30 17:17:53 UTC (rev
3543)
+++ trunk/src/target/gsm/src/util/shell.c 2007-12-01 01:54:59 UTC (rev
3544)
@@ -344,18 +344,33 @@
}
}
-static int phone_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh) {
- char *payload;
- switch (gmh->msg_subtype) {
+static int phone_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
+{
+ char *payload;
+ 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);
- pending_responses --;
break;
- default:
- return -EINVAL;
- }
- return 0;
+ case GSMD_PHONE_POWERUP:
+ if (*intresult)
+ printf("Modem power-up failed: %i\n", *intresult);
+ else
+ printf("Modem powered-up okay\n");
+ break;
+ case GSMD_PHONE_POWERDOWN:
+ if (*intresult)
+ printf("Modem power-down failed: %i\n", *intresult);
+ else
+ printf("Modem down\n");
+ break;
+ default:
+ return -EINVAL;
+ }
+ pending_responses --;
+ return 0;
}
static int shell_help(void)
@@ -688,9 +703,11 @@
} else if (!strncmp(buf, "M", 1)) {
printf("Modem Power On\n");
lgsm_modem_power(lgsmh, 1);
+ pending_responses ++;
} else if (!strncmp(buf, "m", 1)) {
printf("Modem Power Off\n");
lgsm_modem_power(lgsmh, 0);
+ pending_responses ++;
} else {
printf("Unknown command `%s'\n", buf);
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
