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. r2740 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
2. r2741 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r2742 - trunk/src/target/gsm/src/gsmd ([EMAIL PROTECTED])
4. r2743 - trunk/src/target/gsm ([EMAIL PROTECTED])
5. r2744 - in trunk/src/target/gsm: . src/gsmd
([EMAIL PROTECTED])
6. r2745 - trunk/src/host/qemu-neo1973/openmoko
([EMAIL PROTECTED])
7. r2746 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
8. r2747 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
9. r2748 - in trunk/src/target/gsm: include/gsmd src/util
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-08-19 15:14:37 +0200 (Sun, 19 Aug 2007)
New Revision: 2740
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod/buttonactions: add menu item for toggling portrait/landscape
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-18
17:28:34 UTC (rev 2739)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-19
13:14:37 UTC (rev 2740)
@@ -40,7 +40,7 @@
#include <linux/input.h>
#undef DEBUG_THIS_FILE
-#define DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
//FIXME load this from sysfs
static const int MAX_BRIGHTNESS = 5000;
@@ -79,6 +79,7 @@
};
int pm_value = 0;
+gboolean orientation = TRUE;
typedef enum _PowerState
{
@@ -376,6 +377,16 @@
g_assert( FALSE ); // fail here if called for unknown menu
}
+void neod_buttonactions_popup_selected_orientation( GtkMenuItem* menu,
gpointer user_data )
+{
+ gtk_widget_hide( power_menu );
+ if ( orientation )
+ g_spawn_command_line_async( "xrandr -o 1", NULL );
+ else
+ g_spawn_command_line_async( "xrandr -o 0", NULL );
+ orientation = !orientation;
+}
+
void neod_buttonactions_popup_selected_screenshot( GtkMenuItem* menu, gpointer
user_data )
{
gtk_widget_hide( power_menu );
@@ -487,24 +498,30 @@
if ( !power_menu )
{
power_menu = gtk_menu_new();
+
+ GtkWidget* orientation = gtk_menu_item_new_with_label( "Swap
Orientation" );
+ g_signal_connect( G_OBJECT(orientation), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_orientation), NULL );
+ gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), orientation );
+
GtkWidget* scap = gtk_menu_item_new_with_label( "Screenshot" );
g_signal_connect( G_OBJECT(scap), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_screenshot), NULL );
+ gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), scap );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu),
gtk_separator_menu_item_new() );
// add profiles
// TODO build profile list dynamically from database
GtkWidget* profile = 0;
- profile = gtk_check_menu_item_new_with_label( "Full PM" );
+ profile = gtk_check_menu_item_new_with_label( "Profile: Full PM" );
gtk_check_menu_item_set_draw_as_radio(
GTK_CHECK_MENU_ITEM(profile), TRUE );
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(profile),
pm_value == FULL );
g_signal_connect( G_OBJECT(profile), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_fullPM), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), profile );
- profile = gtk_check_menu_item_new_with_label( "Dim Only" );
+ profile = gtk_check_menu_item_new_with_label( "Profile: Dim Only"
);
gtk_check_menu_item_set_draw_as_radio(
GTK_CHECK_MENU_ITEM(profile), TRUE );
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(profile),
pm_value == DIM_ONLY );
g_signal_connect( G_OBJECT(profile), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_dimOnly), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), profile );
- profile = gtk_check_menu_item_new_with_label( "No PM" );
+ profile = gtk_check_menu_item_new_with_label( "Profile: No PM" );
gtk_check_menu_item_set_draw_as_radio(
GTK_CHECK_MENU_ITEM(profile), TRUE );
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(profile),
pm_value == NONE );
g_signal_connect( G_OBJECT(profile), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_noPM), NULL );
@@ -512,17 +529,17 @@
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu),
gtk_separator_menu_item_new() );
- GtkWidget* lock = gtk_menu_item_new_with_label( "Lock" );
+ GtkWidget* lock = gtk_menu_item_new_with_label( "Lock Phone" );
g_signal_connect( G_OBJECT(lock), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_lock), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), lock );
//GtkWidget* flightmode = gtk_menu_item_new_with_label( "Flight
Mode" );
//gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), flightmode );
//GtkWidget* profilelist = gtk_menu_item_new_with_label( "<Profile
List>" );
//gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), profilelist );
- GtkWidget* restartUI = gtk_menu_item_new_with_label( "Restart UI"
);
- g_signal_connect( G_OBJECT(restartUI), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_restartUI), NULL );
- gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), restartUI );
- GtkWidget* reboot = gtk_menu_item_new_with_label( "Reboot" );
+ //GtkWidget* restartUI = gtk_menu_item_new_with_label( "Restart
UI" );
+ //g_signal_connect( G_OBJECT(restartUI), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_restartUI), NULL );
+ //gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), restartUI );
+ GtkWidget* reboot = gtk_menu_item_new_with_label( "Reboot Phone" );
g_signal_connect( G_OBJECT(reboot), "activate",
G_CALLBACK(neod_buttonactions_popup_selected_reboot), NULL );
gtk_menu_shell_append( GTK_MENU_SHELL(power_menu), reboot );
GtkWidget* poweroff = gtk_menu_item_new_with_label( "Power Off" );
--- End Message ---
--- Begin Message ---
Author: alphaone
Date: 2007-08-19 19:36:16 +0200 (Sun, 19 Aug 2007)
New Revision: 2741
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
2007-08-19 Daniel Willmann <[EMAIL PROTECTED]>
* src/moko-sound.{c,h}: Created functions to switch the audio profiles
* src/Makefile.am, src/moko-talking.c: Switch audio profiles when
accepting/initiating or cancelling a call
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-19 13:14:37 UTC (rev 2740)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-19 17:36:16 UTC (rev 2741)
@@ -1,3 +1,8 @@
+2007-08-19 Daniel Willmann <[EMAIL PROTECTED]>
+ * src/moko-sound.{c,h}: Created functions to switch the audio profiles
+ * src/Makefile.am, src/moko-talking.c: Switch audio profiles when
+ accepting/initiating or cancelling a call
+
2007-08-16 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_keypad_pin_entry),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
2007-08-19 13:14:37 UTC (rev 2740)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
2007-08-19 17:36:16 UTC (rev 2741)
@@ -25,7 +25,9 @@
moko-notify.c \
moko-notify.h \
moko-talking.c \
- moko-talking.h
+ moko-talking.h \
+ moko-sound.c \
+ moko-sound.h
openmoko_dialer_LDADD = @LIBS@
Added: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
2007-08-19 13:14:37 UTC (rev 2740)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
2007-08-19 17:36:16 UTC (rev 2741)
@@ -0,0 +1,40 @@
+/*
+ * moko-sound; Crude hack to switch audio profiles until we have a proper
solution
+ *
+ * by Daniel Willmann <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) 2006-2007 OpenMoko Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#include "moko-dialer.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+char *sound_profile_filenames[] = { "/etc/gsmhandset.state",
+ "/etc/gsmheadset.state",
+ "/etc/stereoout.state" };
+
+void moko_sound_profile_set(int profile) {
+ char command[100];
+ snprintf(command, 100, "alsactl -f %s restore",
sound_profile_filenames[profile]);
+ system(command);
+}
+
+void moko_sound_profile_save(int profile) {
+ char command[100];
+ snprintf(command, 100, "alsactl -f %s store",
sound_profile_filenames[profile]);
+ system(command);
+}
+
Added: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
2007-08-19 13:14:37 UTC (rev 2740)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
2007-08-19 17:36:16 UTC (rev 2741)
@@ -0,0 +1,30 @@
+/*
+ * moko-sound; Crude hack to switch audio profiles until we have a proper
solution
+ *
+ * by Daniel Willmann <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) 2006-2007 OpenMoko Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#ifndef _HAVE_MOKO_SOUND_H
+#define _HAVE_MOKO_SOUND_H
+
+enum { SOUND_PROFILE_GSM_HANDSET,
+SOUND_PROFILE_GSM_HEADSET,
+SOUND_PROFILE_STEREO_OUT };
+
+void moko_sound_profile_set(int profile);
+void moko_sound_profile_save(int profile);
+
+#endif /* _HAVE_MOKO_SOUND_H */
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-08-19 13:14:37 UTC (rev 2740)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-08-19 17:36:16 UTC (rev 2741)
@@ -21,6 +21,7 @@
#include <moko-journal.h>
+#include "moko-sound.h"
#include "moko-talking.h"
G_DEFINE_TYPE (MokoTalking, moko_talking, GTK_TYPE_VBOX)
@@ -168,6 +169,8 @@
gtk_widget_hide (priv->incoming_bar);
gtk_widget_show (priv->main_bar);
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+
if (entry)
markup = g_strdup_printf ("<b>%s</b>\n%s", entry->contact->name, number);
else
@@ -224,6 +227,8 @@
gtk_widget_hide (priv->incoming_bar);
gtk_widget_show (priv->main_bar);
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+
if (entry)
markup = g_strdup_printf ("<b>%s</b>\n%s", entry->contact->name, number);
else
@@ -263,6 +268,7 @@
on_cancel_clicked (GtkToolButton *button, MokoTalking *talking)
{
g_source_remove (talking->priv->timeout);
+ moko_sound_profile_set(SOUND_PROFILE_STEREO_OUT);
g_signal_emit (G_OBJECT (talking), talking_signals[CANCEL_CALL], 0);
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-19 22:20:54 +0200 (Sun, 19 Aug 2007)
New Revision: 2742
Modified:
trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
gsmd: also allow ERROR as answer for the alive timer.
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2007-08-19 17:36:16 UTC (rev
2741)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2007-08-19 20:20:54 UTC (rev
2742)
@@ -52,8 +52,11 @@
static struct gsmd g;
static int daemonize = 0;
-/* alive checking */
+/* alive checking
+ * either OK or ERROR is allowed since, both mean the modem still responds
+ */
+
struct gsmd_alive_priv {
struct gsmd *gsmd;
int alive_responded;
@@ -63,7 +66,7 @@
{
struct gsmd_alive_priv *alp = ctx;
- if (!strcmp(resp, "OK") ||
+ if (!strcmp(resp, "OK") || !strcmp(resp, "ERROR") ||
((alp->gsmd->flags & GSMD_FLAG_V0) && resp[0] == '0'))
alp->alive_responded = 1;
return 0;
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-19 23:02:38 +0200 (Sun, 19 Aug 2007)
New Revision: 2743
Removed:
trunk/src/target/gsm/ChangeLog
Log:
gsmd: remove ChangeLog, no one expect me used it
Deleted: trunk/src/target/gsm/ChangeLog
===================================================================
--- trunk/src/target/gsm/ChangeLog 2007-08-19 20:20:54 UTC (rev 2742)
+++ trunk/src/target/gsm/ChangeLog 2007-08-19 21:02:38 UTC (rev 2743)
@@ -1,3 +0,0 @@
-2007-05-16 Mickey Lauer <[EMAIL PROTECTED]>
-
-* gsmd.c (gsmd_initsettings): always power off gsm to have a sane starting
point
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-19 23:03:58 +0200 (Sun, 19 Aug 2007)
New Revision: 2744
Added:
trunk/src/target/gsm/ChangeLog
Modified:
trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
gsmd: make it slightly more forgiving:
1.) remove early-alive trigger
2.) don't use AT as initial command since TI firmware errors out
Added: trunk/src/target/gsm/ChangeLog
===================================================================
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2007-08-19 21:02:38 UTC (rev
2743)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2007-08-19 21:03:58 UTC (rev
2744)
@@ -143,8 +143,6 @@
if (!gsmd_timer_create(&tv, &alive_interval_tmr_cb, gsmd))
return -1;
- gsmd_modem_alive(gsmd);
-
return 0;
}
@@ -208,8 +206,9 @@
if (strcmp(resp, "OK") &&
(!(gsmd->flags & GSMD_FLAG_V0) || resp[0] != '0')) {
- gsmd_log(GSMD_FATAL, "response '%s' to initial command
invalid", resp);
- exit(5);
+ // temporarily changed to GSMD_ERROR instead of GSMD_FATAL +
commented out exit(4) :M:
+ gsmd_log(GSMD_ERROR, "response '%s' to initial command
invalid", resp);
+ //exit(4);
}
firstcmd_response = 1;
@@ -241,13 +240,9 @@
struct gsmd_atcmd *cmd;
struct timeval tv;
- cmd = atcmd_fill("AT", strlen("AT")+1, &firstcmd_atcb, gsmd, 0);
+ cmd = atcmd_fill("ATZ", strlen("ATZ")+1, &firstcmd_atcb, gsmd, 0);
if (!cmd)
return -ENOMEM;
-
- tv.tv_sec = GSMD_ALIVE_TIMEOUT;
- tv.tv_usec = 0;
- gsmd_timer_create(&tv, &firstcmd_tmr_cb, NULL);
return atcmd_submit(gsmd, cmd);
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-20 00:25:21 +0200 (Mon, 20 Aug 2007)
New Revision: 2745
Modified:
trunk/src/host/qemu-neo1973/openmoko/env
Log:
qemu-neo1973: point openmoko/env to the 2007.2 August Snapshot directory
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-08-19 21:03:58 UTC (rev
2744)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-08-19 22:25:21 UTC (rev
2745)
@@ -19,7 +19,7 @@
splash_size=0x5000
kernel_wildcard="uImage-2.6.*-fic-gta01.bin"
-rootfs_wildcard="openmoko-*.rootfs.jffs2"
+rootfs_wildcard="OpenMoko*.rootfs.jffs2"
uboot_wildcard="u-boot-gta01b*.bin"
-download_dir="http://buildhost.openmoko.org/tmp/deploy/images/";
+download_dir="http://buildhost.openmoko.org/snapshots/2007.08/images/";
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-20 14:44:48 +0200 (Mon, 20 Aug 2007)
New Revision: 2746
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: reset display brightness on power/aux button press
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-19
22:25:21 UTC (rev 2745)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-20
12:44:48 UTC (rev 2746)
@@ -320,6 +320,7 @@
neod_buttonactions_sound_play( "touchscreen" );
neod_buttonactions_powersave_reset();
+ neod_buttonactions_set_display( 100 );
aux_timer = -1;
if ( timeout < 1 )
@@ -455,6 +456,7 @@
neod_buttonactions_sound_play( "touchscreen" );
neod_buttonactions_powersave_reset();
+ neod_buttonactions_set_display( 100 );
power_timer = -1;
if ( timeout < 1 )
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-08-20 15:40:31 +0200 (Mon, 20 Aug 2007)
New Revision: 2747
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:
Fix the focus-on-search in openmoko-today2 launcher
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-08-20 12:44:48 UTC (rev 2746)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-08-20 13:40:31 UTC (rev 2747)
@@ -1,3 +1,8 @@
+2007-08-20 Chris Lord,,, <[EMAIL PROTECTED]>
+
+ * src/today-launcher.c: (today_launcher_search_toggle_cb):
+ Focus the search entry on show instead of hide
+
2007-08-03 Chris Lord,,, <[EMAIL PROTECTED]>
* libtaku/launcher-util.c: (launcher_start):
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-08-20 12:44:48 UTC (rev 2746)
+++
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
2007-08-20 13:40:31 UTC (rev 2747)
@@ -246,6 +246,7 @@
/* Set the category to the created search category */
taku_table_set_filter (TAKU_TABLE (data->launcher_table),
data->search_cat);
+ gtk_widget_grab_focus (data->search_entry);
} else {
/* Set the category back to the one pointed to by the
* drop-down.
@@ -254,7 +255,6 @@
(TakuLauncherCategory *)g_list_nth_data (
data->categories, gtk_combo_box_get_active (
GTK_COMBO_BOX (data->filter_combo))));
- gtk_widget_grab_focus (data->search_entry);
}
}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-08-20 17:53:47 +0200 (Mon, 20 Aug 2007)
New Revision: 2748
Modified:
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/src/util/shell.c
Log:
remove 'struct llist_head' from phonebook messages because
* pointer in data structures passed along sockets is a bad idea, if that socket
is later a network socket and the pointer size of both ends is different
* we cannot include linux_list.h into libgsmd, since libgsmd is LGPL and
linux_list.h GPL licensed
libgsmd and gsmd are actually not using that list header, only the shell
program is effected massively. I hope somebody will clean up after me. At
least this now should solve the issue with non-compiling libgsmd users (such as
libmokogsmd).
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2007-08-20 13:40:31 UTC (rev
2747)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2007-08-20 15:53:47 UTC (rev
2748)
@@ -2,7 +2,6 @@
#define _GSMD_USOCK_H
#include <gsmd/event.h>
-#include <common/linux_list.h>
#define GSMD_UNIX_SOCKET "\0gsmd"
//#define GSMD_UNIX_SOCKET_TYPE SOCK_SEQPACKET
@@ -426,7 +425,6 @@
#define GSMD_PB_NUMB_MAXLEN 44
#define GSMD_PB_TEXT_MAXLEN 14
struct gsmd_phonebook {
- struct llist_head list;
u_int8_t index;
char numb[GSMD_PB_NUMB_MAXLEN+1];
u_int8_t type;
@@ -474,7 +472,6 @@
};
struct gsmd_phonebook_storage {
- struct llist_head list;
char storage[3];
} __attribute__ ((packed));
@@ -510,6 +507,7 @@
#include <gsmd/usock.h>
#include <gsmd/gsmd.h>
+#include <common/linux_list.h>
struct gsmd_user;
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-08-20 13:40:31 UTC (rev
2747)
+++ trunk/src/target/gsm/src/util/shell.c 2007-08-20 15:53:47 UTC (rev
2748)
@@ -34,6 +34,8 @@
#include <gsmd/usock.h>
#include <gsmd/ts0705.h>
+#include <common/linux_list.h>
+
#ifndef __GSMD__
#define __GSMD__
#include <gsmd/talloc.h>
@@ -63,6 +65,7 @@
char buf[128];
switch (gmh->msg_subtype) {
+#if 0
case GSMD_PHONEBOOK_FIND:
case GSMD_PHONEBOOK_READRG:
payload = (char *)gmh + sizeof(*gmh);
@@ -98,6 +101,7 @@
else
printf("%s\n", payload);
break;
+#endif
case GSMD_PHONEBOOK_READ:
gp = (struct gsmd_phonebook *) ((char *)gmh + sizeof(*gmh));
if (gp->index)
@@ -111,6 +115,7 @@
gps = (struct gsmd_phonebook_support *) ((char *)gmh +
sizeof(*gmh));
printf("(1-%d), %d, %d\n", gps->index, gps->nlength,
gps->tlength);
break;
+#if 0
case GSMD_PHONEBOOK_LIST_STORAGE:
payload = (char *)gmh + sizeof(*gmh);
@@ -151,6 +156,7 @@
else
printf("%s\n", payload);
break;
+#endif
case GSMD_PHONEBOOK_WRITE:
case GSMD_PHONEBOOK_DELETE:
case GSMD_PHONEBOOK_SET_STORAGE:
@@ -503,6 +509,7 @@
printf("Delete Phonebook Entry\n");
ptr = strchr(buf, '=');
lgsm_pb_del_entry(lgsmh, atoi(ptr+1));
+#if 0
} else if ( !strncmp(buf, "prr", 3)) {
printf("Read Phonebook Entries\n");
struct lgsm_phonebook_readrg pb_readrg;
@@ -524,9 +531,11 @@
ptr = strchr(buf, ',');
pb_readrg.index2 = atoi(ptr+1);
lgsm_pb_read_entries(lgsmh, &pb_readrg);
+#endif
} else if ( !strncmp(buf, "pr", 2)) {
ptr = strchr(buf, '=');
lgsm_pb_read_entry(lgsmh, atoi(ptr+1));
+#if 0
} else if ( !strncmp(buf, "pf", 2)) {
printf("Find Phonebook Entry\n");
struct lgsm_phonebook_find pb_find;
@@ -550,6 +559,7 @@
pb_find.findtext[strlen(ptr+1)] = '\0';
lgsm_pb_find_entry(lgsmh, &pb_find);
+#endif
} else if ( !strncmp(buf, "pw", 2)) {
printf("Write Phonebook Entry\n");
struct lgsm_phonebook pb;
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
