r1757 - in trunk/src/target/OM-2007/openmoko-libs: . libmokogsmd libmokoui
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Sun Apr 15 00:30:16 CEST 2007
Author: mickey
Date: 2007-04-15 00:30:14 +0200 (Sun, 15 Apr 2007)
New Revision: 1757
Added:
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-marshal.list
Modified:
trunk/src/target/OM-2007/openmoko-libs/configure.ac
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in
Log:
openmoko-libs: bump to 0.0.3
- add glib-genmarshal support to buildsystem
- add first bunch of functions to libgsmd API
Modified: trunk/src/target/OM-2007/openmoko-libs/configure.ac
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/configure.ac 2007-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/configure.ac 2007-04-14 22:30:14 UTC (rev 1757)
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(openmoko-libs, 0.0.2, http://www.openmoko.org/)
+AC_INIT(openmoko-libs, 0.0.3, http://www.openmoko.org/)
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(libmokoui/moko-window.c)
AM_CONFIG_HEADER(config.h)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am 2007-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am 2007-04-14 22:30:14 UTC (rev 1757)
@@ -1,9 +1,12 @@
lib_LTLIBRARIES=libmokogsmd.la
public_headers=moko-gsmd-connection.h
+built_sources=moko-gsmd-marshal.h moko-gsmd-marshal.c
+stamp_files=stamp-moko-gsmd-marshal.h stamp-moko-gsmd-marshal.c
sources=moko-gsmd-connection.c
-libmokogsmd_la_SOURCES= $(sources) $(public_headers)
+$(libmokogsmd_la_OBJECTS): $(built_sources)
+libmokogsmd_la_SOURCES= $(public_headers) $(sources)
libmokogsmd_la_LIBADD=
libmokogsmd_la_LDFLAGS= -version-info 0:0:0
AM_CFLAGS = -Wall -pedantic -std=c99
@@ -11,3 +14,19 @@
libmokogsmdheadersdir=$(includedir)/openmoko-libs/libmokogsmd
libmokogsmdheaders_DATA=$(public_headers)
+
+moko-gsmd-marshal.c: stamp-moko-gsmd-marshal.c
+ @true
+stamp-moko-gsmd-marshal.c: moko-gsmd-marshal.list
+ $(GLIB_GENMARSHAL) --prefix=moko_gsmd_marshal $(srcdir)/moko-gsmd-marshal.list --header --body >moko-gsmd-marshal.c \
+ && echo timestamp >$(@F)
+
+moko-gsmd-marshal.h: stamp-moko-gsmd-marshal.h
+ @true
+stamp-moko-gsmd-marshal.h: moko-gsmd-marshal.list
+ $(GLIB_GENMARSHAL) --prefix=moko_gsmd_marshal $(srcdir)/moko-gsmd-marshal.list --header >moko-gsmd-marshal.h \
+ && echo timestamp >$(@F)
+
+CLEANFILES = $(stamp_files) $(built_sources)
+DISTCLEANFILES = $(stamp_files) $(built_sources)
+MAINTAINERCLEANFILES = $(stamp_files) $(built_sources)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro 2007-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro 2007-04-14 22:30:14 UTC (rev 1757)
@@ -1,6 +1,9 @@
TEMPLATE = lib
TARGET = mokogsmd
+GENMARSHALS = moko-gsmd-marshal.list
+GENMARSHALS_PREFIX = moko_gsmd_marshal
+
HEADERS += moko-gsmd-connection.h
SOURCES += moko-gsmd-connection.c
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-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c 2007-04-14 22:30:14 UTC (rev 1757)
@@ -16,6 +16,7 @@
*/
#include "moko-gsmd-connection.h"
+#include "moko-gsmd-marshal.h"
#include <libgsmd/libgsmd.h>
@@ -133,6 +134,34 @@
//TODO add SIGNAL_GSMD_EVT_IN_SMS once libgsmd has it
//TODO add SIGNAL_GSMD_EVT_IN_GPRS once libgsmd has it
+ moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_IN_CLIP] = g_signal_new
+ ("incoming-clip",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+ NULL,
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_STRING,
+ NULL);
+
+ moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_NETREG] = g_signal_new
+ ("network-registration",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
+ NULL,
+ NULL,
+ NULL,
+ moko_gsmd_marshal_VOID__INT_INT_INT,
+ G_TYPE_NONE,
+ 3,
+ G_TYPE_INT,
+ G_TYPE_INT,
+ G_TYPE_INT,
+ NULL);
+
moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_SIGNAL] = g_signal_new
("signal-strength-changed",
G_TYPE_FROM_CLASS (klass),
@@ -196,9 +225,16 @@
case GSMD_EVT_IN_CLIP:
//moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_IN_CLIP]; break;
case GSMD_EVT_NETREG:
- //moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_NETREG]; break;
+ // work around for bugzilla.openmoko.org #454
+ if ( aux->u.netreg.state == MOKO_GSMD_CONNECTION_NETREG_HOME ||
+ aux->u.netreg.state == MOKO_GSMD_CONNECTION_NETREG_ROAMING )
+ g_signal_emit( G_OBJECT(self), moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_NETREG], 0,
+ aux->u.netreg.state, aux->u.netreg.lac, aux->u.netreg.ci );
+ else
+ g_signal_emit( G_OBJECT(self), moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_NETREG], 0,
+ aux->u.netreg.state, 0, 0 );
+ break;
case GSMD_EVT_SIGNAL:
- moko_debug( "-- signal strength = %d", aux->u.signal.sigq.rssi );
g_signal_emit( G_OBJECT(self), moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_SIGNAL], 0, aux->u.signal.sigq.rssi ); break;
case GSMD_EVT_PIN:
//moko_gsmd_connection_signals[SIGNAL_GSMD_EVT_PIN]; break;
@@ -250,8 +286,8 @@
priv->source->pollfd.fd = lgsm_fd( priv->handle );
priv->source->pollfd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
priv->source->pollfd.revents = 0;
- g_source_add_poll( priv->source, &priv->source->pollfd );
- g_source_attach( priv->source, NULL );
+ g_source_add_poll( (GSource*) priv->source, &priv->source->pollfd );
+ g_source_attach( (GSource*) priv->source, NULL );
int rc = 0;
for ( int i = GSMD_EVT_IN_CALL; i < __NUM_GSMD_EVT; ++i )
@@ -262,3 +298,15 @@
}
+/* public API */
+void moko_gsmd_connection_network_register(MokoGsmdConnection* self)
+{
+ MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ lgsm_netreg_register( priv->handle, 0 );
+}
+
+void moko_gsmd_connection_set_antenna_power(MokoGsmdConnection* self, gboolean on)
+{
+ MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+ lgsm_phone_power( priv->handle, on ? 1 : 0 );
+}
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-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h 2007-04-14 22:30:14 UTC (rev 1757)
@@ -39,9 +39,23 @@
GType moko_gsmd_connection_get_type();
MokoGsmdConnection* moko_gsmd_connection_new();
+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);
+enum {
+ MOKO_GSMD_CONNECTION_NETREG_NONE = 0,
+ MOKO_GSMD_CONNECTION_NETREG_HOME = 1,
+ MOKO_GSMD_CONNECTION_NETREG_SEARCHING = 2,
+ MOKO_GSMD_CONNECTION_NETREG_DENIED = 3,
+ MOKO_GSMD_CONNECTION_NETREG_ROAMING = 5,
+} MokoGsmdConnectionNetregType;
+
/* signals */
void moko_gsmd_connection_incoming_call(MokoGsmdConnection* self, int type);
+//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_signal_strength_changed(MokoGsmdConnection* self, int strength);
G_END_DECLS
Added: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-marshal.list
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-marshal.list 2007-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-marshal.list 2007-04-14 22:30:14 UTC (rev 1757)
@@ -0,0 +1 @@
+VOID:INT,INT,INT
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-04-14 22:30:14 UTC (rev 1757)
@@ -49,11 +49,11 @@
LAST_SIGNAL,
};
+static guint moko_tool_box_signals[LAST_SIGNAL] = { 0 };
+
static void moko_tool_box_class_init (MokoToolBoxClass *klass);
static void moko_tool_box_init (MokoToolBox *self);
-static guint moko_tool_box_signals[LAST_SIGNAL] = { 0 };
-
static void _button_release(GtkWidget* w, MokoToolBox* self)
{
MokoToolBoxPriv *priv = MOKO_TOOL_BOX_GET_PRIVATE(self);
Modified: trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in 2007-04-14 08:30:34 UTC (rev 1756)
+++ trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pc.in 2007-04-14 22:30:14 UTC (rev 1757)
@@ -7,5 +7,5 @@
Description: OpenMoko Application Framework Libraries
Version: @VERSION@
Cflags: -I${includedir}
-Libs: -L${libdir} -lmokoui
+Libs: -L${libdir} -lmokoui -lmokojournal -lmokogsmd
Requires: gtk+-2.0
More information about the commitlog
mailing list