r3663 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2: . libmokogsmd

mickey at sita.openmoko.org mickey at sita.openmoko.org
Mon Dec 17 18:44:08 CET 2007


Author: mickey
Date: 2007-12-17 18:44:07 +0100 (Mon, 17 Dec 2007)
New Revision: 3663

Modified:
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
Log:
libmokogsmd2: keep track of GSM cipher status


Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-12-17 15:44:30 UTC (rev 3662)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-12-17 17:44:07 UTC (rev 3663)
@@ -1,3 +1,9 @@
+2007-12-17	Michael Lauer	<mickey at openmoko.org>
+
+	* libmokogsmd/moko-gsmd-connection.[c|h]:
+	Register and emit gobject signal for when
+	"cipher-status" changes.
+
 2007-11-29	Michael Lauer	<mickey at openmoko.org>
 
 	* libmokogsmd/moko-gsmd-connection.[c|h]:

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c	2007-12-17 15:44:30 UTC (rev 3662)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c	2007-12-17 17:44:07 UTC (rev 3663)
@@ -259,7 +259,20 @@
     //TODO add SIGNAL_GSMD_EVT_CALL_WAIT      = 10, /* Call Waiting */
     //TODO add SIGNAL_GSMD_EVT_TIMEZONE       = 11, /* Timezone change */
     //TODO add SIGNAL_GSMD_EVT_SUBSCRIPTIONS  = 12, /* To which events are we subscribed to */
-    //TODO add SIGNAL_GSMD_EVT_CIPHER         = 13, /* Chiphering Information */
+
+    moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_CIPHER] = g_signal_new
+        ("cipher-status-changed",
+        G_TYPE_FROM_CLASS (klass),
+        G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+        G_STRUCT_OFFSET (MokoGsmdConnectionClass, cipher_status_changed ),
+        NULL,
+        NULL,
+        g_cclosure_marshal_VOID__INT,
+        G_TYPE_NONE,
+        1,
+        G_TYPE_INT,
+        NULL );
+
     //TODO add SIGNAL_GSMD_EVT_IN_CBM         = 14, /* Incoming Cell Broadcast message */
     //TODO add SIGNAL_GSMD_EVT_IN_DS          = 15, /* SMS Status Report */
 
@@ -495,9 +508,9 @@
             break;
         case GSMD_EVT_OUT_STATUS:
             g_signal_emit( G_OBJECT(self),
-                moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_OUT_STATUS],
-                0, 
-                aux->u.call_status.prog );
+                           moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_OUT_STATUS],
+                           0,
+                           aux->u.call_status.prog );
             break;
         case GSMD_EVT_OUT_COLP:
             /* moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_OUT_COLP]; */
@@ -512,6 +525,12 @@
             /* moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_SUBSCRIPTIONS]; */
             break;
         case GSMD_EVT_CIPHER:
+            g_debug( "CIPHER event: data = %d, %d, %d", aux->u.cipher.flags, aux->u.cipher.net_state_gsm, aux->u.cipher.net_state_gprs );
+            g_signal_emit( G_OBJECT(self),
+                           moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_CIPHER],
+                           0,
+                           aux->u.cipher.flags );
+            //TODO check whether the net states are important, if so, change signal
             /* moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_CIPHER]; */
             break;
         case GSMD_EVT_IN_CBM:

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h	2007-12-17 15:44:30 UTC (rev 3662)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h	2007-12-17 17:44:07 UTC (rev 3663)
@@ -52,6 +52,7 @@
     void (*network_registration) (MokoGsmdConnection* self, int type, int lac, int cell);
     void (*signal_strength_changed) (MokoGsmdConnection* self, int strength);
     void (*network_current_operator) (MokoGsmdConnection* self, const gchar* name );
+    void (*cipher_status_changed) (MokoGsmdConnection* self, int status );
 
     /* Misc */
     void (*gsmd_connection_status) (MokoGsmdConnection* self, gboolean status);





More information about the commitlog mailing list