Changeset 908

Timestamp:

02/08/07 10:35:49 (6 years ago)

Author:

tony_guan

Message:

attempting to resolve bug54, not finished.

Location:

trunk/src/target/OM-2007/applications/openmoko-dialer/src

Files:

• Makefile.am (modified) (2 diffs)
• dialergsm.c (modified) (4 diffs)
• dialergsm.h (modified) (2 diffs)
• openmoko-dialer-main.c (modified) (2 diffs)
• openmoko-dialer-main.h (modified) (2 diffs)
• pin.c (modified) (3 diffs)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am

@@ -12 +12 @@
 moko-dialer-autolist.c\
 event.c\
-pin.c\
 history.c\
 contacts.c\
@@ -22 +21 @@
 openmoko-dialer-window-incoming.c\
 openmoko-dialer-window-talking.c\
+openmoko-dialer-window-pin.c\
 moko-dialer-status.c\
 alsa.c

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c

@@ -147 +147 @@
     return -1;
   }
-  pin_init (lgsmh, pin);
+  gsm_pin_init (lgsmh);
   event_init (lgsmh);
   lgsm_register_handler (lgsmh, GSMD_MSG_PASSTHROUGH, &pt_msghandler);
@@ -259 +259 @@
 gsm_watcher_install (GMainLoop * mainloop)
 {
-  DBG_ENTER ();
+
   static GSourceFuncs gsm_watcher_funcs = {
     gsm_watcher_prepare,
@@ -277 +277 @@
   g_source_attach (gsm_watcher, NULL);
 //  DBG_MESSAGE ("ATACH OUT");
-  DBG_LEAVE ();
+
   return;
 
@@ -288 +288 @@
   lgsm_voice_dtmf (lgsmh, dtmf);
 }
+#define PIN_SIZE 32
+
+static int
+gsm_pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
+{
+ 
+  int rc;
+
+  printf ("EVENT: PIN request (type=%u) ", aux->u.pin.type);
+
+  /* FIXME: read pin from STDIN and send it back via lgsm_pin */
+
+    gsm_pin_require();
+
+
+  return 0;
+}
+
+int
+gsm_pin_init (struct lgsm_handle *lh)
+{
+  return lgsm_evt_handler_register (lh, GSMD_EVT_PIN, &gsm_pin_handler);
+}

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h

@@ -36 +36 @@
 #include <libgsmd/voicecall.h>
 #include <libgsmd/misc.h>
-#include "pin.h"
+//#include "pin.h"
 #include "event.h"
 #include <glib/gmain.h>
@@ -100 +100 @@
  */
 
+ void gsm_pin_require();
+
   void *gsm_monitor_thread (struct lgsm_handle *lgsmh);
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c

@@ -47 +47 @@
 return p_dialer_data;
 }
-
+void gsm_pin_require()
+{
+MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+
+if(appdata)
+{
+gtk_widget_show(appdata->window_pin);
+}
+else
+{
+DBG_ERROR("gui failed to initialize.try another time.");
+}
+        
+
+}
 void gsm_incoming_call(gchar * number)
 {
@@ -267 +281 @@
   window_dialer_init(p_dialer_data); 
   window_incoming_init(p_dialer_data); 
+  window_pin_init(p_dialer_data); 
 DBG_WARN("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
 //  window_outgoing_init(p_dialer_data); 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h

@@ -40 +40 @@
 
   MokoDialerTextview *moko_dtmf_text_view;      ///<the textview for the dtmf window
-
+  MokoDialerTextview *moko_pin_text_view;
 
   MokoDialerAutolist *moko_dialer_autolist;
@@ -64 +64 @@
   GtkWidget *window_history;
   GtkWidget *window_dialer;
+  GtkWidget *window_pin;
   GtkWidget *window_present;
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c

@@ -5 +5 @@
 #include <libgsmd/event.h>
 
+static int
+pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
+{
 #define PIN_SIZE 32
 
@@ -10 +13 @@
 static char pinbuf[PIN_SIZE + 1];
 
-static int
-pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
-{
   int rc;
 
@@ -25 +25 @@
   else
   {
-    do
-    {
-      printf ("Please enter PIN: ");
-      rc = fscanf (stdin, "%32s", &pinbuf);
-    }
-    while (rc < 1);
-
+   gsm_pin_require(pinbuf);
     return lgsm_pin (lh, pinbuf);
   }