sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Add directory for driver plugins

This commit is contained in:
Marcel Holtmann 2009-05-10 22:44:37 -07:00
parent f2e2cd7787
commit 0acaee5e1e
7 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ src/ofonod
src/ofono.exp src/ofono.exp
src/ofono.ver src/ofono.ver
plugins/builtin.h plugins/builtin.h
drivers/builtin.h

2
Makefile.am
View File

@ -1,5 +1,5 @@
SUBDIRS = gdbus gatchat include plugins src doc SUBDIRS = gdbus gatchat include plugins drivers src doc
DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles

4
configure.ac
View File

@ -86,5 +86,5 @@ AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile AC_OUTPUT(Makefile gdbus/Makefile gatchat/Makefile
include/Makefile include/version.h include/Makefile include/version.h src/Makefile
src/Makefile plugins/Makefile doc/Makefile) plugins/Makefile drivers/Makefile doc/Makefile)

28
drivers/Makefile.am Normal file
View File

@ -0,0 +1,28 @@
builtin_modules =
builtin_sources =
builtin_cflags =
noinst_LTLIBRARIES = libbuiltin.la
libbuiltin_la_SOURCES = $(builtin_sources)
libbuiltin_la_LDFLAGS =
libbuiltin_la_CFLAGS = $(AM_CFLAGS) $(builtin_cflags) -DOFONO_PLUGIN_BUILTIN
BUILT_SOURCES = builtin.h
nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = $(BUILT_SOURCES)
MAINTAINERCLEANFILES = Makefile.in
builtin.h:
echo "" > $@
list='$(builtin_modules)'; for i in $$list; \
do echo "extern struct ofono_plugin_desc __ofono_builtin_$$i;" >> $@; done
echo "" >> $@
echo "static struct ofono_plugin_desc *__ofono_drivers[] = {" >> $@
list='$(builtin_modules)'; for i in $$list; \
do echo "&__ofono_builtin_$$i," >> $@; done
echo "NULL };" >> $@

2
plugins/Makefile.am
View File

@ -22,7 +22,7 @@ builtin.h:
list='$(builtin_modules)'; for i in $$list; \ list='$(builtin_modules)'; for i in $$list; \
do echo "extern struct ofono_plugin_desc __ofono_builtin_$$i;" >> $@; done do echo "extern struct ofono_plugin_desc __ofono_builtin_$$i;" >> $@; done
echo "" >> $@ echo "" >> $@
echo "static struct ofono_plugin_desc *__ofono_builtin[] = {" >> $@ echo "static struct ofono_plugin_desc *__ofono_plugins[] = {" >> $@
list='$(builtin_modules)'; for i in $$list; \ list='$(builtin_modules)'; for i in $$list; \
do echo "&__ofono_builtin_$$i," >> $@; done do echo "&__ofono_builtin_$$i," >> $@; done
echo "NULL };" >> $@ echo "NULL };" >> $@

1
src/Makefile.am
View File

@ -14,6 +14,7 @@ ofonod_SOURCES = main.c ofono.h log.c plugin.c \
call-settings.c call-waiting.c call-forwarding.c call-meter.c call-settings.c call-waiting.c call-forwarding.c call-meter.c
ofonod_LDADD = $(top_builddir)/plugins/libbuiltin.la \ ofonod_LDADD = $(top_builddir)/plugins/libbuiltin.la \
$(top_builddir)/drivers/libbuiltin.la \
@GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl
ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver

17
src/plugin.c
View File

@ -89,6 +89,7 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc,
} }
#include "plugins/builtin.h" #include "plugins/builtin.h"
#include "drivers/builtin.h"
int __ofono_plugin_init(const char *pattern, const char *exclude) int __ofono_plugin_init(const char *pattern, const char *exclude)
{ {
@ -100,12 +101,20 @@ int __ofono_plugin_init(const char *pattern, const char *exclude)
DBG(""); DBG("");
for (i = 0; __ofono_builtin[i]; i++) { for (i = 0; __ofono_plugins[i]; i++) {
if (check_plugin(__ofono_builtin[i], if (check_plugin(__ofono_plugins[i],
pattern, exclude) == FALSE) pattern, exclude) == FALSE)
continue; continue;
add_plugin(NULL, __ofono_builtin[i]); add_plugin(NULL, __ofono_plugins[i]);
}
for (i = 0; __ofono_drivers[i]; i++) {
if (check_plugin(__ofono_drivers[i],
pattern, exclude) == FALSE)
continue;
add_plugin(NULL, __ofono_drivers[i]);
} }
dir = g_dir_open(PLUGINDIR, 0, NULL); dir = g_dir_open(PLUGINDIR, 0, NULL);