r1733 - in trunk/src/target/OM-2007: devel/qmake openmoko-libs openmoko-libs/libmokogsmd
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Thu Apr 12 23:54:35 CEST 2007
Author: mickey
Date: 2007-04-12 23:54:34 +0200 (Thu, 12 Apr 2007)
New Revision: 1733
Added:
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/
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
Modified:
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/openmoko-libs/Makefile.am
trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pro
Log:
openmoko-libs: add skeleton for MokoGsmdConnection class
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-04-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-04-12 21:54:34 UTC (rev 1733)
@@ -33,6 +33,12 @@
LIBS += -lmokocore -L$(OPENMOKODIR)/lib
}
+mokogsmd {
+ INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
+ PKGCONFIG += libgsmd
+ LIBS += -lmokogsmd -L$(OPENMOKODIR)/lib
+}
+
mokoui {
INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
PKGCONFIG += gtk+-2.0
@@ -49,6 +55,11 @@
LIBS += -lmokonet -L$(OPENMOKODIR)/lib
}
+mokojournal {
+ INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
+ LIBS += -lmokojournal -L$(OPENMOKODIR)/lib
+}
+
# handle pkgconfig for CFLAGS, CXXFLAGS and LIBS already handled by qmake
for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
# QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG_LIB)
Modified: trunk/src/target/OM-2007/openmoko-libs/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/Makefile.am 2007-04-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/openmoko-libs/Makefile.am 2007-04-12 21:54:34 UTC (rev 1733)
@@ -1,4 +1,3 @@
-# SUBDIRS = libmokocore libmokoui libmokopim libmokonet
SUBDIRS = libmokoui libmokojournal data
pcdata_DATA= openmoko-libs.pc
Added: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am 2007-04-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/Makefile.am 2007-04-12 21:54:34 UTC (rev 1733)
@@ -0,0 +1,13 @@
+lib_LTLIBRARIES=libmokogsmd.la
+
+public_headers=moko-gsmd-connection.h
+sources=moko-gsmd-connection.c
+
+libmokogsmd_la_SOURCES= $(sources) $(public_headers)
+libmokogsmd_la_LIBADD=
+libmokogsmd_la_LDFLAGS= -version-info 0:0:0
+AM_CFLAGS = -Wall -pedantic -std=c99
+
+libmokogsmdheadersdir=$(includedir)/openmoko-libs/libmokogsmd
+libmokogsmdheaders_DATA=$(public_headers)
+
Added: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro 2007-04-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/libmokogsmd.pro 2007-04-12 21:54:34 UTC (rev 1733)
@@ -0,0 +1,10 @@
+TEMPLATE = lib
+TARGET = mokogsmd
+
+HEADERS += moko-gsmd-connection.h
+SOURCES += moko-gsmd-connection.c
+
+PKGCONFIG += glib-2.0 libgsmd
+
+include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
+
Added: 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-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c 2007-04-12 21:54:34 UTC (rev 1733)
@@ -0,0 +1,102 @@
+/* moko-gsmd-connection.c
+ *
+ * Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ * Copyright (C) 2007 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date: 2006/12/21 18:03:04 $) [$Author: mickey $]
+ */
+
+#include "moko-gsmd-connection.h"
+
+#include <libgsmd/libgsmd.h>
+
+#undef DEBUG_THIS_FILE
+#define DEBUG_THIS_FILE
+
+#ifdef DEBUG_THIS_FILE
+#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
+#else
+#define moko_debug(fmt,...)
+#endif
+
+G_DEFINE_TYPE (MokoGsmdConnection, moko_gsmd_connection, G_TYPE_OBJECT);
+
+#define GSMD_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionPrivate))
+
+typedef struct _MokoGsmdConnectionPrivate
+{
+ struct lgsm_handle* handle;
+ GPollFD fd;
+} MokoGsmdConnectionPrivate;
+
+/* parent class pointer */
+GObjectClass* parent_class = NULL;
+
+/* forward declarations */
+/* ... */
+
+static void
+moko_gsmd_connection_dispose(GObject* object)
+{
+ if (G_OBJECT_CLASS (moko_gsmd_connection_parent_class)->dispose)
+ G_OBJECT_CLASS (moko_gsmd_connection_parent_class)->dispose (object);
+}
+
+static void
+moko_gsmd_connection_finalize(GObject* object)
+{
+ moko_debug( "finalize" );
+ //TODO remove source from mainloop and cleanup w/ libgsmd
+ G_OBJECT_CLASS (moko_gsmd_connection_parent_class)->finalize (object);
+}
+
+static void
+moko_gsmd_connection_class_init(MokoGsmdConnectionClass* klass)
+{
+ /* hook parent */
+ GObjectClass* object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent(klass);
+
+ /* add private */
+ g_type_class_add_private (klass, sizeof(MokoGsmdConnectionPrivate));
+
+ /* hook destruction */
+ object_class->dispose = moko_gsmd_connection_dispose;
+ object_class->finalize = moko_gsmd_connection_finalize;
+
+ /* virtual methods */
+
+ /* install properties */
+}
+
+MokoGsmdConnection*
+moko_gsmd_connection_new(void)
+{
+ return g_object_new(MOKO_TYPE_GSMD_CONNECTION, NULL);
+}
+
+static void
+moko_gsmd_connection_init(MokoGsmdConnection* self)
+{
+ moko_debug( "moko_gsmd_connection_init()" );
+ MokoGsmdConnectionPrivate* priv = GSMD_CONNECTION_GET_PRIVATE(self);
+
+ priv->handle = lgsm_init( LGSMD_DEVICE_GSMD );
+ if ( !priv->handle )
+ {
+ g_warning( "libgsmd: can't connect to gsmd. You won't receive any events." );
+ }
+ else
+ {
+ moko_debug( "-- connected to gsmd (socketfd = %d)", lgsm_fd( priv->handle ) );
+ }
+}
Property changes on: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
___________________________________________________________________
Name: svn:eol-style
+ native
Added: 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-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h 2007-04-12 21:54:34 UTC (rev 1733)
@@ -0,0 +1,46 @@
+/* moko-gsmd-connection.h
+ *
+ * Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ * Copyright (C) 2007 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date: 2006/12/21 18:03:04 $) [$Author: mickey $]
+ */
+
+#ifndef _MOKO_GSMD_CONNECTION_H_
+#define _MOKO_GSMD_CONNECTION_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define MOKO_TYPE_GSMD_CONNECTION moko_gsmd_connection_get_type()
+#define MOKO_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnection))
+#define MOKO_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
+#define MOKO_IS_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_GSMD_CONNECTION))
+#define MOKO_IS_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_GSMD_CONNECTION))
+#define MOKO_GSMD_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
+
+typedef struct {
+ GObject parent;
+} MokoGsmdConnection;
+
+typedef struct {
+ GObjectClass parent_class;
+} MokoGsmdConnectionClass;
+
+GType moko_gsmd_connection_get_type();
+MokoGsmdConnection* moko_gsmd_connection_new();
+
+G_END_DECLS
+
+#endif // _MOKO_GSMD_CONNECTION_H_
+
Property changes on: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pro 2007-04-12 21:52:30 UTC (rev 1732)
+++ trunk/src/target/OM-2007/openmoko-libs/openmoko-libs.pro 2007-04-12 21:54:34 UTC (rev 1733)
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS = libmokocore libmokonet libmokoui libmokojournal
+SUBDIRS = libmokocore libmokogsmd libmokonet libmokoui libmokojournal
More information about the commitlog
mailing list
