r2718 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2: . libmokogsmd
njp at sita.openmoko.org
njp at sita.openmoko.org
Thu Aug 16 18:05:43 CEST 2007
Author: njp
Date: 2007-08-16 18:05:42 +0200 (Thu, 16 Aug 2007)
New Revision: 2718
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:
2007-08-16 Neil J. Patel <njp at o-hand.com>
* libmokogsmd/moko-gsmd-connection.c:
(moko_gsmd_connection_set_antenna_power),
(moko_gsmd_connection_send_pin),
(moko_gsmd_connection_network_register),
(moko_gsmd_connection_voice_accept),
(moko_gsmd_connection_voice_hangup),
(moko_gsmd_connection_voice_dial),
(moko_gsmd_connection_voice_dtmf),
(moko_gsmd_connection_trigger_signal_strength_event):
Add g_return_if_fail's to all public api so we are safe if the functions are
called without the corrent arguments, or if the *self is not valid.
* libmokogsmd/moko-gsmd-connection.h:
Add comments to separate the different type's of signals.
Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-08-16 15:44:55 UTC (rev 2717)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog 2007-08-16 16:05:42 UTC (rev 2718)
@@ -1,3 +1,20 @@
+2007-08-16 Neil J. Patel <njp at o-hand.com>
+
+ * libmokogsmd/moko-gsmd-connection.c:
+ (moko_gsmd_connection_set_antenna_power),
+ (moko_gsmd_connection_send_pin),
+ (moko_gsmd_connection_network_register),
+ (moko_gsmd_connection_voice_accept),
+ (moko_gsmd_connection_voice_hangup),
+ (moko_gsmd_connection_voice_dial),
+ (moko_gsmd_connection_voice_dtmf),
+ (moko_gsmd_connection_trigger_signal_strength_event):
+ Add g_return_if_fail's to all public api so we are safe if the functions are
+ called without the corrent arguments, or if the *self is not valid.
+
+ * libmokogsmd/moko-gsmd-connection.h:
+ Add comments to separate the different type's of signals.
+
2007-08-15 Neil J. Patel <njp at o-hand.com>
* libmokogsmd/moko-gsmd-connection.c:
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-08-16 15:44:55 UTC (rev 2717)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c 2007-08-16 16:05:42 UTC (rev 2718)
@@ -447,19 +447,29 @@
void
moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean on)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ MokoGsmdConnectionPrivate* priv;
+ gint result;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION ( self ) );
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
g_return_if_fail( priv->handle );
- int result = lgsm_phone_power( priv->handle, on ? 1 : 0 );
+
+ result = lgsm_phone_power( priv->handle, on ? 1 : 0 );
g_debug( "lgsm_phone_power returned %d", result );
}
void
moko_gsmd_connection_send_pin(MokoGsmdConnection* self, const gchar* pin)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
- g_return_if_fail( priv->handle );
+ MokoGsmdConnectionPrivate* priv;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION ( self ) );
g_return_if_fail( pin );
g_return_if_fail( strlen( pin ) >= 4 );
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
+ g_return_if_fail( priv->handle );
/*
* FIXME lgsm_pin_auth is not yet implemented, so we call lgsm_pin
* directly...
@@ -471,35 +481,57 @@
void
moko_gsmd_connection_network_register(MokoGsmdConnection* self)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ MokoGsmdConnectionPrivate* priv;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION ( self ) );
+ 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);
+ MokoGsmdConnectionPrivate* priv;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION ( self ) );
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
g_return_if_fail( priv->handle );
+
lgsm_voice_in_accept( priv->handle );
}
void
moko_gsmd_connection_voice_hangup(MokoGsmdConnection* self)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ MokoGsmdConnectionPrivate* priv;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION ( self ) );
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
g_return_if_fail( priv->handle );
+
lgsm_voice_hangup( priv->handle );
}
void
moko_gsmd_connection_voice_dial(MokoGsmdConnection* self, const gchar* number)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
- g_return_if_fail( priv->handle );
+ MokoGsmdConnectionPrivate* priv;
+ struct lgsm_addr addr;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION (self) );
g_return_if_fail( number );
g_return_if_fail( strlen( number ) > 2 );
- struct lgsm_addr addr;
+
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
+ g_return_if_fail( priv->handle );
+
+
addr.type = 129; /* ??? */
g_stpcpy( &addr.addr[0], number );
lgsm_voice_out_init( priv->handle, &addr );
@@ -508,15 +540,27 @@
void
moko_gsmd_connection_voice_dtmf(MokoGsmdConnection* self, const gchar number)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ MokoGsmdConnectionPrivate* priv;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION (self) );
+
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
g_return_if_fail( priv->handle );
+
lgsm_voice_dtmf( priv->handle, number );
}
void
moko_gsmd_connection_trigger_signal_strength_event(MokoGsmdConnection* self)
{
- MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ MokoGsmdConnectionPrivate* priv;
+
+ g_return_if_fail ( MOKO_IS_GSMD_CONNECTION (self) );
+
+ priv = GSMD_CONNECTION_GET_PRIVATE( self );
+
g_return_if_fail( priv->handle );
+
lgsm_signal_quality( priv->handle );
}
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-08-16 15:44:55 UTC (rev 2717)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h 2007-08-16 16:05:42 UTC (rev 2718)
@@ -56,6 +56,8 @@
/* SMS signals */
/* GPRS signals */
+
+ /* Misc signals */
void (*incoming_clip) (MokoGsmdConnection *self, const gchar *number);
void (*network_registration) (MokoGsmdConnection *self,
int type,
More information about the commitlog
mailing list
