diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/plugin.c | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 91449599..15285c5c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 ofonod_LDADD = $(top_builddir)/plugins/libbuiltin.la \ + $(top_builddir)/drivers/libbuiltin.la \ @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl ofonod_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=ofono.ver diff --git a/src/plugin.c b/src/plugin.c index 27c2a929..017ebad5 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -89,6 +89,7 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc, } #include "plugins/builtin.h" +#include "drivers/builtin.h" 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(""); - for (i = 0; __ofono_builtin[i]; i++) { - if (check_plugin(__ofono_builtin[i], - pattern, exclude) == FALSE) + for (i = 0; __ofono_plugins[i]; i++) { + if (check_plugin(__ofono_plugins[i], + pattern, exclude) == FALSE) 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); |