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. r2069 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
2. r2070 - trunk/src/target/OM-2007/openmoko-libs/libmokogsmd
([EMAIL PROTECTED])
3. r2071 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
4. r2072 - trunk/src/target/kernel/patches ([EMAIL PROTECTED])
5. r2073 - trunk/src/host/qemu-neo1973/openmoko
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-05-23 15:25:55 +0200 (Wed, 23 May 2007)
New Revision: 2069
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
Log:
openmoko-dialer: PIN request done
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
2007-05-23 12:44:30 UTC (rev 2068)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
2007-05-23 13:25:55 UTC (rev 2069)
@@ -44,12 +44,22 @@
void
incoming_pin_request_cb (MokoGsmdConnection *self, int type, MokoDialerData
*data)
{
- g_debug( "INCOMING PIN REQUEST!\n!\n!\n!\n" );
+ g_debug( "incoming pin request for type %d", type );
+ gtk_widget_show_all( data->window_pin );
}
-gboolean initial_timeout_cb (MokoGsmdConnection *conn)
+gboolean initial_timeout_cb (MokoDialerData* data)
{
- g_debug( "INITIAL TIMEOUT" );
- //moko_gsmd_connection_network_register( conn );
+ g_debug( "initial timeout" );
+ /* check whether PIN window is currently visible -- if not, issue register
*/
+ if ( GTK_WIDGET_MAPPED( data->window_pin ) )
+ {
+ g_debug( "pin window is visible, delaying call to register" );
+ }
+ else
+ {
+ g_debug( "pin window not visible, calling register" );
+ moko_gsmd_connection_network_register( data->connection );
+ }
return FALSE;
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
2007-05-23 12:44:30 UTC (rev 2068)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
2007-05-23 13:25:55 UTC (rev 2069)
@@ -28,6 +28,6 @@
void incoming_clip_cb (MokoGsmdConnection *self, const char *number,
MokoDialerData *data);
void incoming_pin_request_cb (MokoGsmdConnection *self, int type,
MokoDialerData *data);
-gboolean initial_timeout_cb (MokoGsmdConnection *conn);
+gboolean initial_timeout_cb (MokoDialerData *data);
#endif
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
2007-05-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
2007-05-23 13:25:55 UTC (rev 2069)
@@ -180,7 +180,6 @@
//init application data
contact_init_contact_data (&(p_dialer_data->g_contactlist));
-
/* application object */
g_set_application_name ("OpenMoko Dialer");
@@ -189,8 +188,8 @@
/* power on GSM */
moko_gsmd_connection_set_antenna_power (conn, TRUE);
- /* handle network registration 4 seconds after powering GSM */
- g_timeout_add( 4 * 1000, (GSourceFunc) initial_timeout_cb, conn );
+ /* handle network registration some seconds after powering GSM */
+ g_timeout_add( 5 * 1000, (GSourceFunc) initial_timeout_cb, p_dialer_data );
g_signal_connect (G_OBJECT (conn), "network-registration", (GCallback)
network_registration_cb, p_dialer_data);
g_signal_connect (G_OBJECT (conn), "incoming-call", (GCallback)
incoming_call_cb, p_dialer_data);
@@ -216,7 +215,6 @@
gtk_main ();
-
//release everything
contact_release_contact_list (&(p_dialer_data->g_contactlist));
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
2007-05-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
2007-05-23 13:25:55 UTC (rev 2069)
@@ -34,7 +34,7 @@
char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN + 1];
gint int_sim_pin_end_point;
- MokoDialerTextview *moko_dialer_text_view; ///<the textview for the
dialer window
+ MokoDialerTextview *moko_dialer_text_view; ///<the textview for the
dialer window
MokoDialerTextview *moko_dtmf_text_view; ///<the textview for the dtmf
window
MokoDialerTextview *moko_pin_text_view;
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
2007-05-23 12:44:30 UTC (rev 2068)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
2007-05-23 13:25:55 UTC (rev 2069)
@@ -28,6 +28,7 @@
#include <gtk/gtkvbox.h>
#include "dialer-main.h"
#include "common.h"
+#include "dialer-callbacks-connection.h"
void
@@ -58,13 +59,11 @@
{ //here send the pin codes and hide our window.
DBG_MESSAGE ("here we send the pin:%s", appdata->str_sim_pin);
- //FIXME:why this call will cause segment fault?
- //lgsm_pin (appdata->lh, appdata->str_sim_pin);
- //lgsm_pin (appdata->lh, "1234");
+ moko_gsmd_connection_send_pin( appdata->connection, appdata->str_sim_pin );
DBG_MESSAGE ("pin:%s sent", appdata->str_sim_pin);
+ g_timeout_add( 1 * 1000, (GSourceFunc) initial_timeout_cb, appdata );
gtk_widget_hide (appdata->window_pin);
}
-
}
@@ -76,7 +75,7 @@
MokoDialerData *appdata = (MokoDialerData *) user_data;
MokoDialerTextview *moko_pin_text_view = appdata->moko_pin_text_view;
char input[2];
-
+
input[0] = parac;
input[1] = 0;
@@ -122,13 +121,13 @@
GdkColor color;
GtkWidget *vbox, *hbox, *eventbox1, *vbox2, *button1, *button2;
GtkWidget *mokotextview, *mokodialerpanel;
-
+
if (p_dialer_data->window_pin)
return 1;
-
+
g_stpcpy (p_dialer_data->str_sim_pin, "");
p_dialer_data->int_sim_pin_end_point = 0;
-
+
gdk_color_parse ("black", &color);
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
@@ -136,7 +135,7 @@
G_CALLBACK (on_window_pin_show), p_dialer_data);
g_signal_connect ((gpointer) window, "hide",
G_CALLBACK (on_window_pin_hide), p_dialer_data);
-
+
/* contents */
vbox = gtk_vbox_new (FALSE, 0);
hbox = gtk_hbox_new (FALSE, 10);
@@ -149,13 +148,14 @@
mokotextview = moko_dialer_textview_new ();
p_dialer_data->moko_pin_text_view = MOKO_DIALER_TEXTVIEW (mokotextview);
- // moko_dialer_textview_fill_it(mokotextview , "Please input the pin:");
+ moko_dialer_textview_fill_it(mokotextview , " PIN?");
+
gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE, FALSE, 0);
mokodialerpanel = moko_dialer_panel_new ();
- gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+ gtk_widget_set_size_request (mokodialerpanel, 380, 384); //??? why hard coded
g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
G_CALLBACK (on_pin_panel_user_input), p_dialer_data);
gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (mokodialerpanel), TRUE,
@@ -170,10 +170,10 @@
moko_pixmap_button_set_finger_toolbox_btn_center_image
(MOKO_PIXMAP_BUTTON (button1),
- file_new_image_from_relative_path ("delete.png"));
+ file_new_image_from_relative_path ("delete.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button1),
- "Delete");
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button1),
+ "Del");
// gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
// WINDOW_DIALER_BUTTON_SIZE_Y);
@@ -184,8 +184,8 @@
moko_pixmap_button_set_finger_toolbox_btn_center_image
(MOKO_PIXMAP_BUTTON (button2),
file_new_image_from_relative_path
("phone.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button2),
- "OK");
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button2),
+ "Ok");
g_signal_connect (G_OBJECT (button2), "clicked",
G_CALLBACK (pin_ok_button_clicked), p_dialer_data);
//gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X,
@@ -194,7 +194,7 @@
gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (vbox2), TRUE, TRUE, 5);
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 5);
-
+
moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
p_dialer_data->window_pin = GTK_WIDGET (window);
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-05-23 15:56:01 +0200 (Wed, 23 May 2007)
New Revision: 2070
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
Log:
libmokogsmd: add sending PIN
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
2007-05-23 13:25:55 UTC (rev 2069)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
2007-05-23 13:56:01 UTC (rev 2070)
@@ -242,7 +242,7 @@
else
{
if ( size == 0 ) /* EOF */
- return FALSE;
+ return FALSE;
lgsm_handle_packet( self->handle, buf, size );
}
@@ -349,21 +349,32 @@
}
/* public API */
-void moko_gsmd_connection_network_register(MokoGsmdConnection* self)
+void moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean
on)
{
MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
g_return_if_fail( priv->handle );
- lgsm_netreg_register( priv->handle, 0 );
+ int result = lgsm_phone_power( priv->handle, on ? 1 : 0 );
+ g_debug( "lgsm_phone_power returned %d", result );
}
-void moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean
on)
+void moko_gsmd_connection_send_pin(MokoGsmdConnection* self, const gchar* pin)
{
MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
g_return_if_fail( priv->handle );
- int result = lgsm_phone_power( priv->handle, on ? 1 : 0 );
- g_debug( "lgsm_phone_power returned %d", result );
+ g_return_if_fail( pin );
+ g_return_if_fail( strlen( pin ) >= 4 );
+ //FIXME lgsm_pin_auth is not yet implemented, so we call lgsm_pin
directly...
+ //lgsm_pin_auth( priv->handle, pin );
+ lgsm_pin( priv->handle, 1, pin, NULL);
}
+void moko_gsmd_connection_network_register(MokoGsmdConnection* self)
+{
+ MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ g_return_if_fail( priv->handle );
+ lgsm_netreg_register( priv->handle, 0 );
+}
+
void moko_gsmd_connection_voice_accept(MokoGsmdConnection* self)
{
MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
2007-05-23 13:25:55 UTC (rev 2069)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
2007-05-23 13:56:01 UTC (rev 2070)
@@ -39,8 +39,17 @@
GType moko_gsmd_connection_get_type();
MokoGsmdConnection* moko_gsmd_connection_new();
+// power
+void moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean
on);
+// pin
+void moko_gsmd_connection_send_pin(MokoGsmdConnection* self, const gchar* pin);
+// network
void moko_gsmd_connection_network_register(MokoGsmdConnection* self); //TODO
add type, i.e. MOKO_GSMD_CONNECTION_NETREG_AUTO
-void moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean
on);
+// voice calls
+void moko_gsmd_connection_voice_accept(MokoGsmdConnection* self);
+void moko_gsmd_connection_voice_hangup(MokoGsmdConnection* self);
+void moko_gsmd_connection_voice_dial(MokoGsmdConnection* self, const gchar*
number);
+void moko_gsmd_connection_voice_dtmf(MokoGsmdConnection* self, const gchar
number);
enum {
MOKO_GSMD_CONNECTION_NETREG_NONE = 0,
@@ -69,18 +78,12 @@
void moko_gsmd_connection_incoming_call(MokoGsmdConnection* self, int type);
void moko_gsmd_connection_call_status_progress(MokoGsmdConnection* self, int
type);
void moko_gsmd_connection_pin_requested(MokoGsmdConnection* self, int type);
-//sms
-//gprs
+// sms
+// gprs
void moko_gsmd_connection_incoming_clip(MokoGsmdConnection* self, const char*
number);
void moko_gsmd_connection_network_registration(MokoGsmdConnection* self, int
type, int lac, int cell);
void moko_gsmd_connection_trigger_signal_strength_event(MokoGsmdConnection*
self);
void moko_gsmd_connection_signal_strength_changed(MokoGsmdConnection* self,
int strength);
-//voice
-void moko_gsmd_connection_voice_accept(MokoGsmdConnection* self);
-void moko_gsmd_connection_voice_hangup(MokoGsmdConnection* self);
-void moko_gsmd_connection_voice_dial(MokoGsmdConnection* self, const gchar*
number);
-void moko_gsmd_connection_voice_dtmf(MokoGsmdConnection* self, const gchar
number);
-
G_END_DECLS
#endif // _MOKO_GSMD_CONNECTION_H_
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-23 18:00:21 +0200 (Wed, 23 May 2007)
New Revision: 2071
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
Log:
openmoko-dialer:
* add a journal entry for incoming calls
* cancel incoming call window if call is disconnected
* cancel outgoing window if call is rejected
* remove some unrequired code from dialer-window-outgoing.c
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
2007-05-23 13:56:01 UTC (rev 2070)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
2007-05-23 16:00:21 UTC (rev 2071)
@@ -221,14 +221,41 @@
}
+static void
+call_progress_cb (MokoGsmdConnection *connection, int type, MokoDialerData
*data)
+{
+ if (type == MOKO_GSMD_PROG_DISCONNECT)
+ {
+ /* call was disconnected before it was answered */
+ gtk_dialog_response (GTK_DIALOG (data->window_incoming),
GTK_RESPONSE_CANCEL);
+ }
+}
+
+
void
window_incoming_show (MokoDialerData *data)
{
+ MokoJournalEntry *entry = NULL;
+ MokoJournalVoiceInfo *info = NULL;
+ gulong progress_handler;
+
if (!data->window_incoming)
{
window_incoming_init (data);
}
+ /* create the journal entry for this call and add it to the journal */
+ entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
+ moko_journal_entry_set_direction (entry, DIRECTION_IN);
+ moko_journal_entry_get_voice_info (entry, &info);
+ moko_journal_entry_set_dtstart (entry, moko_time_new_today ());
+ moko_journal_add_entry (data->journal, entry);
+
+ /* connect our handler to track call progress */
+ progress_handler = g_signal_connect (data->connection, "call-progress",
+ G_CALLBACK (call_progress_cb), data);
+
+
if (gtk_dialog_run (GTK_DIALOG (data->window_incoming)) == GTK_RESPONSE_OK)
{
moko_gsmd_connection_voice_accept (data->connection);
@@ -236,13 +263,21 @@
if (!data->window_talking)
window_talking_init (data);
gtk_widget_show_all (data->window_talking);
+ moko_journal_voice_info_set_was_missed (info, FALSE);
}
else
{
moko_gsmd_connection_voice_hangup (data->connection);
+ /* mark the call as misssed
+ * FIXME: this is not strictly true if the call was rejected
+ */
+ moko_journal_voice_info_set_was_missed (info, TRUE);
}
gtk_widget_hide (data->window_incoming);
+
+ /* disconnect the call progress handler since we no longer need it */
+ g_signal_handler_disconnect (data->connection, progress_handler);
}
void
@@ -250,4 +285,5 @@
{
moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (data->window_incoming),
"Incoming call from %s", clip);
+ // moko_journal_voice_info_set_distant_number ();
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-23 13:56:01 UTC (rev 2070)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-23 16:00:21 UTC (rev 2071)
@@ -110,72 +110,6 @@
}
-
-static void
-on_window_outgoing_hide (GtkWidget * widget, MokoDialerData * appdata)
-{
- if (appdata->g_timer_data.ptimer != 0)
- {
- g_source_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
- if (appdata->g_state.callstate != STATE_TALKING)
- { //
add_histroy_entry(g_state.historytype,g_state.contactinfo.name,g_state.contactinfo.number,g_state.contactinfo.picpath,g_state.starttime,0);
-/*
- add_histroy_entry (appdata, appdata->g_state.historytype,
- appdata->g_peer_info.name,
- appdata->g_peer_info.number,
- appdata->g_peer_info.picpath,
- appdata->g_state.starttime,
- appdata->g_state.startdate, 0);
-*/
- }
-
-
-}
-
-static void
-window_outgoing_setup_timer (MokoDialerData * appdata)
-{
- time_t timep;
- struct tm *p;
- time (&timep);
- p = localtime (&timep);
-
- sprintf (appdata->g_state.starttime, "%02d:%02d:%02d", p->tm_hour,
- p->tm_min, p->tm_sec);
- sprintf (appdata->g_state.startdate, "%04d/%02d/%02d", p->tm_year,
- p->tm_mon, p->tm_mday);
-
- if (appdata->g_timer_data.ptimer != 0)
- {
- g_source_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
-
- memset (&(appdata->g_timer_data), 0, sizeof (appdata->g_timer_data));
-// 1:30 timeout
- appdata->g_timer_data.stopsec = 90;
-
- appdata->g_timer_data.ptimer =
- g_timeout_add (1000, (GSourceFunc) timer_outgoing_time_out, appdata);
-
-
-}
-
-static void
-on_window_outgoing_show (GtkWidget * widget, MokoDialerData * appdata)
-{
-
- window_outgoing_setup_timer (appdata);
- appdata->g_state.callstate = STATE_CALLING;
- /* TODO: MokoGsmdConnection->dial
- * int retv = gsm_dial (appdata->g_peer_info.number);
- * DBG_MESSAGE ("GSM_DIAL returns %d", retv);
- */
-}
-
-
gint
window_outgoing_init (MokoDialerData * p_dialer_data)
{
@@ -242,20 +176,16 @@
p_dialer_data->window_outgoing = GTK_WIDGET (window);
p_dialer_data->status_outgoing = MOKO_DIALER_STATUS (status);
- g_signal_connect (G_OBJECT (window), "show",
- G_CALLBACK (on_window_outgoing_show), p_dialer_data);
- g_signal_connect (G_OBJECT (window), "hide",
- G_CALLBACK (on_window_outgoing_hide), p_dialer_data);
-
return 1;
}
-void
+static void
call_progress_cb (MokoGsmdConnection *connection, int type, MokoDialerData
*data)
{
if (type == MOKO_GSMD_PROG_REJECT)
{
g_debug ("call rejected");
+ gtk_dialog_response (GTK_DIALOG (data->window_outgoing),
GTK_RESPONSE_CANCEL);
return;
}
@@ -268,7 +198,10 @@
void
window_outgoing_dial (MokoDialerData *data, gchar *number)
{
- g_signal_connect (data->connection, "call-progress",
+ gulong progress_handler;
+
+ /* connect our handler to track call progress */
+ progress_handler = g_signal_connect (data->connection, "call-progress",
G_CALLBACK (call_progress_cb), data);
g_object_set_data (G_OBJECT (data->window_outgoing), "current-number",
number);
moko_gsmd_connection_voice_dial (data->connection, number);
@@ -288,4 +221,7 @@
gtk_widget_hide (data->window_outgoing);
g_object_steal_data (G_OBJECT (data->window_outgoing), "current-number");
+
+ /* disconnect the call progress handler since we no longer need it */
+ g_signal_handler_disconnect (data->connection, progress_handler);
}
--- End Message ---
--- Begin Message ---
Author: roh
Date: 2007-05-23 22:22:01 +0200 (Wed, 23 May 2007)
New Revision: 2072
Modified:
trunk/src/target/kernel/patches/gta01-power_control.patch
Log:
fix for setting up the gps 1.5V correctly on gta01bv03/04
is PCF50606_REGULATOR_D2REG should be PCF50606_REGULATOR_DCD
thanks to sean_c
Modified: trunk/src/target/kernel/patches/gta01-power_control.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-power_control.patch 2007-05-23
16:00:21 UTC (rev 2071)
+++ trunk/src/target/kernel/patches/gta01-power_control.patch 2007-05-23
20:22:01 UTC (rev 2072)
@@ -228,9 +228,9 @@
+ case GTA01Bv4_SYSTEM_REV:
+ if (on)
+ pcf50606_voltage_set(pcf50606_global,
-+ PCF50606_REGULATOR_D2REG, 1500);
++ PCF50606_REGULATOR_DCD, 1500);
+ pcf50606_onoff_set(pcf50606_global,
-+ PCF50606_REGULATOR_D2REG, on);
++ PCF50606_REGULATOR_DCD, on);
+ break;
+ }
+}
@@ -249,9 +249,9 @@
+ case GTA01Bv3_SYSTEM_REV:
+ case GTA01Bv4_SYSTEM_REV:
+ if (pcf50606_onoff_get(pcf50606_global,
-+ PCF50606_REGULATOR_D2REG) &&
++ PCF50606_REGULATOR_DCD) &&
+ pcf50606_voltage_get(pcf50606_global,
-+ PCF50606_REGULATOR_D2REG) == 1500)
++ PCF50606_REGULATOR_DCD) == 1500)
+ ret = 1;
+ break;
+ }
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-05-23 22:38:00 +0200 (Wed, 23 May 2007)
New Revision: 2073
Modified:
trunk/src/host/qemu-neo1973/openmoko/Makefile
trunk/src/host/qemu-neo1973/openmoko/env
trunk/src/host/qemu-neo1973/openmoko/flash.sh
Log:
Use an overlay flash image by default.
Modified: trunk/src/host/qemu-neo1973/openmoko/Makefile
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/Makefile 2007-05-23 20:22:01 UTC
(rev 2072)
+++ trunk/src/host/qemu-neo1973/openmoko/Makefile 2007-05-23 20:38:00 UTC
(rev 2073)
@@ -20,7 +20,8 @@
#
SPLASH=splashimg.pl
SPLASHIMG=System_boot.png
-FLASHIMG=openmoko-flash.image
+FLASHIMG=openmoko-flash.base
+FLASHOVERLAY=openmoko-flash.image
SHELL=bash
splash.gz: splash
@@ -57,5 +58,9 @@
cat .16ksec .16ksec .16ksec .16ksec .16ksec .16ksec .16ksec .16ksec > $@
rm -rf .8b .16b .512b .sec .8sec .64sec .512sec .2ksec .16ksec
+$(FLASHOVERLAY): $(FLASHIMG)
+ ../qemu-img create -b $^ -f qcow2 $@
+
clean:
- rm -rf $(SPLASH) $(SPLASHIMG) $(FLASHIMG) splash splash.gz
+ rm -rf $(SPLASH) $(SPLASHIMG) $(FLASHIMG) $(FLASHOVERLAY) \
+ splash splash.gz
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-05-23 20:22:01 UTC (rev
2072)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-05-23 20:38:00 UTC (rev
2073)
@@ -6,6 +6,7 @@
uboot_symlink="$src_dir/u-boot.bin"
qemu_relative="arm-softmmu/qemu-system-arm -M neo -m 130"
qemu="$src_dir/$qemu_relative"
+flash_base=openmoko-flash.base
flash_image=openmoko-flash.image
make=make
which gmake && make=gmake
Modified: trunk/src/host/qemu-neo1973/openmoko/flash.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/flash.sh 2007-05-23 20:22:01 UTC
(rev 2072)
+++ trunk/src/host/qemu-neo1973/openmoko/flash.sh 2007-05-23 20:38:00 UTC
(rev 2073)
@@ -65,8 +65,8 @@
rm -rf $uboot_symlink
ln -s $script_dir_relative/$uboot_image $uboot_symlink
-rm -rf $flash_image
-${make} $flash_image || exit -1
+rm -rf $flash_base
+${make} $flash_base || exit -1
# Launch the emulator assuming that u-boot is now functional enough
# for us to be able to issue u-boot commands.
@@ -74,7 +74,7 @@
# We should parse the u-boot output for command prompt lines and only
# issue commands when u-boot is awaiting them.
emu () {
- $qemu -mtdblock "$script_dir/$flash_image" -kernel "$script_dir/$1" \
+ $qemu -mtdblock "$script_dir/$flash_base" -kernel "$script_dir/$1" \
-serial stdio -nographic -usb -monitor null <&0 & pid=$!
}
uboot () {
@@ -127,6 +127,10 @@
rm -rf openmoko-kernel.bin
ln -s $kernel_image openmoko-kernel.bin
+# Make the flash image accessible under a fixed name
+rm -rf $flash_image
+${make} $flash_image || exit -1
+
echo
echo " "All done.
echo
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
