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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-09-06 15:27:14 +0200 (Thu, 06 Sep 2007)
New Revision: 2931

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:
* libmokogsmd/moko-gsmd-connection.c:
* libmokogsmd/moko-gsmd-connection.h:

Add GError to moko_gsmd_connection_set_antenna_power ()


Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-09-06 09:11:23 UTC (rev 2930)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-09-06 13:27:14 UTC (rev 2931)
@@ -1,3 +1,10 @@
+2007-09-06  Thomas Wood  <thomas at openedhand.com>
+
+	* libmokogsmd/moko-gsmd-connection.c:
+	* libmokogsmd/moko-gsmd-connection.h:
+
+	Add GError to moko_gsmd_connection_set_antenna_power
+
 2007-08-22  Holger Freyther  <zecke at selfish.org>
 
         Rubberstamped by Mickey.

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-09-06 09:11:23 UTC (rev 2930)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c	2007-09-06 13:27:14 UTC (rev 2931)
@@ -42,6 +42,18 @@
 #define GSMD_CONNECTION_GET_PRIVATE(o)   (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
         MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionPrivate))
 
+
+GQuark
+moko_gsmd_error_quark ()
+{
+  static GQuark quark = 0;
+
+  if (quark == 0)
+    quark = g_quark_from_static_string ("moko-gsmd-error");
+  return quark;
+}
+#define MOKO_GSMD_ERROR moko_gsmd_error_quark ()
+
 /* ugly temp. hack until libgsmd features a user_data pointer for its callbacks
  * Note that this effectively means you can only have one MokoGsmdConnection 
  * object per process (which should be ok anyway...) :M: 
@@ -445,7 +457,7 @@
 
 /* public API */
 void 
-moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean on)
+moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean on, GError **error)
 {
     MokoGsmdConnectionPrivate* priv;
     gint result;
@@ -453,10 +465,18 @@
     g_return_if_fail ( MOKO_IS_GSMD_CONNECTION ( self ) );
     priv  = GSMD_CONNECTION_GET_PRIVATE( self );
 
-    g_return_if_fail( priv->handle );
+    if (!priv->handle)
+    {
+      g_set_error (error, MOKO_GSMD_ERROR, MOKO_GSMD_ERROR_CONNECT, "Error connecting to gsmd");
+      return;
+    }
     
     result = lgsm_phone_power( priv->handle, on ? 1 : 0 );
-    g_debug( "lgsm_phone_power returned %d", result );
+
+    if (result != 0)
+    {
+      g_set_error (error, MOKO_GSMD_ERROR, MOKO_GSMD_ERROR_POWER, "Error setting antenna power");
+    }
 }
 
 void 

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-09-06 09:11:23 UTC (rev 2930)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h	2007-09-06 13:27:14 UTC (rev 2931)
@@ -91,13 +91,19 @@
 
 } MokoGsmdConnectionProgress;
 
+typedef enum
+{
+  MOKO_GSMD_ERROR_CONNECT, /* could not connect to gsmd */
+  MOKO_GSMD_ERROR_POWER /* attenna power did not set correctly */
+} MokoGsmdConnectionError;
+
 GType moko_gsmd_connection_get_type ();
 
 MokoGsmdConnection* moko_gsmd_connection_new ();
 
 /* power */
 void moko_gsmd_connection_set_antenna_power (MokoGsmdConnection *self, 
-                                             gboolean on);
+                                             gboolean on, GError **error);
 /* pin */
 void moko_gsmd_connection_send_pin (MokoGsmdConnection *self, const gchar *pin);