[PATCH] network: Add NetworkRegistration.OperatorsChanged signal
by Slava Monich
This signal gets emitted when operator list has changed.
It contains the current list of operators.
---
doc/network-api.txt | 5 +++++
src/network.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/doc/network-api.txt b/doc/network-api.txt
index 83a2bc0..d635ba7 100644
--- a/doc/network-api.txt
+++ b/doc/network-api.txt
@@ -57,6 +57,11 @@ Signals PropertyChanged(string property, variant value)
This signal indicates a changed value of the given
property.
+ OperatorsChanged(array{object,dict})
+
+ Signal that gets emitted when operator list has
+ changed. It contains the current list of operators.
+
Properties string Mode [readonly]
The current registration mode. The default of this
diff --git a/src/network.c b/src/network.c
index d1bfca6..1b8b759 100644
--- a/src/network.c
+++ b/src/network.c
@@ -934,6 +934,40 @@ static void append_operator_struct_list(struct ofono_netreg *netreg,
dbus_free_string_array(children);
}
+static void network_signal_operators_changed(struct ofono_netreg *netreg)
+{
+ const char *path = __ofono_atom_get_path(netreg->atom);
+ DBusConnection *conn = ofono_dbus_get_connection();
+ DBusMessage *signal;
+ DBusMessageIter iter;
+ DBusMessageIter array;
+
+ signal = dbus_message_new_signal(path,
+ OFONO_NETWORK_REGISTRATION_INTERFACE, "OperatorsChanged");
+ if (signal == NULL) {
+ ofono_error("Unable to allocate new "
+ OFONO_NETWORK_REGISTRATION_INTERFACE
+ ".OperatorsChanged signal");
+ return;
+ }
+
+ dbus_message_iter_init_append(signal, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_OBJECT_PATH_AS_STRING
+ DBUS_TYPE_ARRAY_AS_STRING
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING
+ DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING
+ DBUS_STRUCT_END_CHAR_AS_STRING,
+ &array);
+ append_operator_struct_list(netreg, &array);
+ dbus_message_iter_close_container(&iter, &array);
+
+ g_dbus_send_message(conn, signal);
+}
+
static void operator_list_callback(const struct ofono_error *error, int total,
const struct ofono_network_operator *list,
void *data)
@@ -942,6 +976,7 @@ static void operator_list_callback(const struct ofono_error *error, int total,
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter array;
+ gboolean changed;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
DBG("Error occurred during operator list");
@@ -950,7 +985,7 @@ static void operator_list_callback(const struct ofono_error *error, int total,
return;
}
- update_operator_list(netreg, total, list);
+ changed = update_operator_list(netreg, total, list);
reply = dbus_message_new_method_return(netreg->pending);
@@ -970,6 +1005,11 @@ static void operator_list_callback(const struct ofono_error *error, int total,
dbus_message_iter_close_container(&iter, &array);
__ofono_dbus_pending_reply(&netreg->pending, reply);
+
+ DBG("operator list %schanged", changed ? "" : "not ");
+
+ if (changed)
+ network_signal_operators_changed(netreg);
}
static DBusMessage *network_scan(DBusConnection *conn,
@@ -1041,6 +1081,8 @@ static const GDBusMethodTable network_registration_methods[] = {
static const GDBusSignalTable network_registration_signals[] = {
{ GDBUS_SIGNAL("PropertyChanged",
GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+ { GDBUS_SIGNAL("OperatorsChanged",
+ GDBUS_ARGS({ "operators", "a(oa{sv})"})) },
{ }
};
--
1.8.3.2
5 years, 4 months
[help] automatic data reconnection in case of signal loss
by Mylene JOSSERAND
Hi everyone,
I am doing some tests with Ofono.
Currently, I am trying to see if Ofono can handle an automatic data
reconnection in case of signal loss.
I am doing the following test :
- Connect the modem to data connection via atmodem driver (so PPP link)
- Disconnect the antenna to lose signal
- Reconnect the antenna to get signal back
- Try to get data connection back
The atmodem driver is notified that the signal is lost so it disconnects
ppp with "gprs-context.c:ppp_disconnect() Reason: 6".
After re-connecting the antenna and that the network is back, in the
Ofono interfaces, it did not changed, I always have the
ConnectionManager interface. The difference is that the context is not
activated. So, I try to re-activate it but it failed with error :
gprs.c:pri_activate_callback() Activating context failed with error:
Unknown error type
I guess that someone should have test it before me. If it is the case,
is there something I am doing wrong ? I do not know how Ofono should
react in this case. Maybe it should remove some interfaces ? Go in
"offline" mode ?
If nobody tested it before, what should I look for ?
Thank you in advance for any help and Merry Christmas :)
Mylène
5 years, 5 months
add gtk-doc support
by vicamo＠gmail.com
Hi there,
Merry Christmas!
I'm working on adding gtk-doc support to oFono and is available publicly on
github [1]. This job is currently based on my previous patches to clean up
Makefile.am.
So far the biggest problem is that it's going to add yet another
Makefile.am inside doc/, which breaks no-recursive make rule that is
currently enforced. However, that seems to be an inevitable side effect
when somebody is going to include gtk-doc in his project. I'd like to know
if you has other concerns before going ahead and posting the patches. For
me, oFono has done a great job in implementing core functions and bringing
support to various hardware. It just needs some more refactoring and
polishments to lower the effort to use it, and documentation is one of the
most important tasks on my list. What do you think?
[1]: https://github.com/vicamo/ofono/tree/for/upstream/gtk-doc
Regards,
Vicamo Yang
5 years, 5 months
[PATCH 1/3] build: sort Makefile assignment list entries
by You-Sheng Yang
Sort Makefile assignment list entries so that it's easier to track
what's added, removed, or missing.
Signed-off-by: You-Sheng Yang <vicamo(a)gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 22249c4..6729e9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,58 @@
AM_MAKEFLAGS = --no-print-directory
noinst_LTLIBRARIES =
-pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
- include/dbus.h include/modem.h include/types.h \
- include/call-barring.h include/call-forwarding.h \
- include/call-meter.h include/call-settings.h \
- include/phonebook.h include/ussd.h \
- include/sms.h include/sim.h include/message-waiting.h \
- include/netreg.h include/voicecall.h include/devinfo.h \
- include/cbs.h include/call-volume.h \
- include/gprs.h include/gprs-context.h \
- include/radio-settings.h include/stk.h \
- include/audio-settings.h include/nettime.h \
- include/ctm.h include/cdma-voicecall.h \
- include/cdma-sms.h include/sim-auth.h \
- include/gprs-provision.h include/emulator.h \
- include/location-reporting.h \
- include/cdma-connman.h include/gnss.h \
- include/private-network.h include/cdma-netreg.h \
- include/cdma-provision.h include/handsfree.h \
- include/handsfree-audio.h include/siri.h
-
-nodist_pkginclude_HEADERS = include/version.h
+pkginclude_HEADERS = \
+ include/audio-settings.h \
+ include/call-barring.h \
+ include/call-forwarding.h \
+ include/call-meter.h \
+ include/call-settings.h \
+ include/call-volume.h \
+ include/cbs.h \
+ include/cdma-connman.h \
+ include/cdma-netreg.h \
+ include/cdma-provision.h \
+ include/cdma-sms.h \
+ include/cdma-voicecall.h \
+ include/ctm.h \
+ include/dbus.h \
+ include/devinfo.h \
+ include/emulator.h \
+ include/gnss.h \
+ include/gprs-context.h \
+ include/gprs-provision.h \
+ include/gprs.h \
+ include/handsfree-audio.h \
+ include/handsfree.h \
+ include/history.h \
+ include/location-reporting.h \
+ include/log.h \
+ include/message-waiting.h \
+ include/modem.h \
+ include/netreg.h \
+ include/nettime.h \
+ include/phonebook.h \
+ include/plugin.h \
+ include/private-network.h \
+ include/radio-settings.h \
+ include/sim-auth.h \
+ include/sim.h \
+ include/siri.h \
+ include/sms.h \
+ include/stk.h \
+ include/types.h \
+ include/ussd.h \
+ include/voicecall.h
+
+nodist_pkginclude_HEADERS = \
+ include/version.h
local_headers = $(foreach file,$(pkginclude_HEADERS) \
$(nodist_pkginclude_HEADERS), \
include/ofono/$(notdir $(file)))
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ofono.pc
@@ -55,302 +79,361 @@ endif
builtin_modules =
builtin_sources =
builtin_libadd =
builtin_cflags =
noinst_LTLIBRARIES += gdbus/libgdbus-internal.la
-gdbus_libgdbus_internal_la_SOURCES = gdbus/gdbus.h \
- gdbus/mainloop.c gdbus/watch.c \
- gdbus/object.c gdbus/client.c gdbus/polkit.c
-
-gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
- gatchat/gatresult.h gatchat/gatresult.c \
- gatchat/gatsyntax.h gatchat/gatsyntax.c \
- gatchat/ringbuffer.h gatchat/ringbuffer.c \
- gatchat/gatio.h gatchat/gatio.c \
- gatchat/crc-ccitt.h gatchat/crc-ccitt.c \
- gatchat/gatmux.h gatchat/gatmux.c \
- gatchat/gsm0710.h gatchat/gsm0710.c \
- gatchat/gattty.h gatchat/gattty.c \
- gatchat/gatutil.h gatchat/gatutil.c \
- gatchat/gat.h \
- gatchat/gatserver.h gatchat/gatserver.c \
- gatchat/gatrawip.h gatchat/gatrawip.c \
- gatchat/gathdlc.c gatchat/gathdlc.h \
- gatchat/gatppp.c gatchat/gatppp.h \
- gatchat/ppp.h gatchat/ppp_cp.h \
- gatchat/ppp_cp.c gatchat/ppp_lcp.c \
- gatchat/ppp_auth.c gatchat/ppp_net.c \
- gatchat/ppp_ipcp.c gatchat/ppp_ipv6cp.c
-
-gisi_sources = gisi/client.c gisi/client.h gisi/common.h \
- gisi/iter.c gisi/iter.h \
- gisi/message.c gisi/message.h \
- gisi/modem.c gisi/modem.h \
- gisi/netlink.c gisi/netlink.h \
- gisi/pep.c gisi/pep.h \
- gisi/phonet.h \
- gisi/pipe.c gisi/pipe.h \
- gisi/server.c gisi/server.h \
- gisi/socket.c gisi/socket.h
-
-btio_sources = btio/btio.h btio/btio.c
+gdbus_libgdbus_internal_la_SOURCES = \
+ gdbus/client.c \
+ gdbus/gdbus.h \
+ gdbus/mainloop.c \
+ gdbus/object.c \
+ gdbus/polkit.c \
+ gdbus/watch.c
+
+gatchat_sources = \
+ gatchat/crc-ccitt.c \
+ gatchat/crc-ccitt.h \
+ gatchat/gat.h \
+ gatchat/gatchat.c \
+ gatchat/gatchat.h \
+ gatchat/gathdlc.c \
+ gatchat/gathdlc.h \
+ gatchat/gatio.c \
+ gatchat/gatio.h \
+ gatchat/gatmux.c \
+ gatchat/gatmux.h \
+ gatchat/gatppp.c \
+ gatchat/gatppp.h \
+ gatchat/gatrawip.c \
+ gatchat/gatrawip.h \
+ gatchat/gatresult.c \
+ gatchat/gatresult.h \
+ gatchat/gatserver.c \
+ gatchat/gatserver.h \
+ gatchat/gatsyntax.c \
+ gatchat/gatsyntax.h \
+ gatchat/gattty.c \
+ gatchat/gattty.h \
+ gatchat/gatutil.c \
+ gatchat/gatutil.h \
+ gatchat/gsm0710.c \
+ gatchat/gsm0710.h \
+ gatchat/ppp.h \
+ gatchat/ppp_auth.c \
+ gatchat/ppp_cp.c \
+ gatchat/ppp_cp.h \
+ gatchat/ppp_ipcp.c \
+ gatchat/ppp_ipv6cp.c \
+ gatchat/ppp_lcp.c \
+ gatchat/ppp_net.c \
+ gatchat/ringbuffer.c \
+ gatchat/ringbuffer.h
+
+gisi_sources = \
+ gisi/client.c \
+ gisi/client.h \
+ gisi/common.h \
+ gisi/iter.c \
+ gisi/iter.h \
+ gisi/message.c \
+ gisi/message.h \
+ gisi/modem.c \
+ gisi/modem.h \
+ gisi/netlink.c \
+ gisi/netlink.h \
+ gisi/pep.c \
+ gisi/pep.h \
+ gisi/phonet.h \
+ gisi/pipe.c \
+ gisi/pipe.h \
+ gisi/server.c \
+ gisi/server.h \
+ gisi/socket.c \
+ gisi/socket.h
+
+btio_sources = \
+ btio/btio.c \
+ btio/btio.h
if UDEV
builtin_modules += udev
builtin_sources += plugins/udev.c
builtin_cflags += @UDEV_CFLAGS@
builtin_libadd += @UDEV_LIBS@
builtin_modules += udevng
builtin_sources += plugins/udevng.c
endif
if ISIMODEM
builtin_modules += isimodem
-builtin_sources += $(gisi_sources) \
- drivers/isimodem/isimodem.h \
- drivers/isimodem/isimodem.c \
- drivers/isimodem/mtc.h \
- drivers/isimodem/debug.h \
- drivers/isimodem/isiutil.h \
- drivers/isimodem/debug.c \
- drivers/isimodem/phonebook.c \
- drivers/isimodem/devinfo.c \
- drivers/isimodem/info.h \
- drivers/isimodem/network-registration.c \
- drivers/isimodem/network.h \
- drivers/isimodem/infoserver.h \
- drivers/isimodem/infoserver.c \
- drivers/isimodem/voicecall.c \
- drivers/isimodem/call.h \
- drivers/isimodem/sms.c \
- drivers/isimodem/sms.h \
- drivers/isimodem/cbs.c \
- drivers/isimodem/sim.c \
- drivers/isimodem/sim.h \
- drivers/isimodem/ussd.c \
- drivers/isimodem/call-forwarding.c \
- drivers/isimodem/call-settings.c \
- drivers/isimodem/call-barring.c \
- drivers/isimodem/call-meter.c \
- drivers/isimodem/ss.h \
- drivers/isimodem/radio-settings.c \
- drivers/isimodem/gss.h \
- drivers/isimodem/gprs.c \
- drivers/isimodem/gprs-context.c \
- drivers/isimodem/gpds.h \
- drivers/isimodem/audio-settings.c \
- drivers/isimodem/uicc.h \
- drivers/isimodem/uicc.c \
- drivers/isimodem/uicc-util.h \
- drivers/isimodem/uicc-util.c
+builtin_sources += \
+ $(gisi_sources) \
+ drivers/isimodem/audio-settings.c \
+ drivers/isimodem/call-barring.c \
+ drivers/isimodem/call-forwarding.c \
+ drivers/isimodem/call-meter.c \
+ drivers/isimodem/call-settings.c \
+ drivers/isimodem/call.h \
+ drivers/isimodem/cbs.c \
+ drivers/isimodem/debug.c \
+ drivers/isimodem/debug.h \
+ drivers/isimodem/devinfo.c \
+ drivers/isimodem/gpds.h \
+ drivers/isimodem/gprs-context.c \
+ drivers/isimodem/gprs.c \
+ drivers/isimodem/gss.h \
+ drivers/isimodem/info.h \
+ drivers/isimodem/infoserver.c \
+ drivers/isimodem/infoserver.h \
+ drivers/isimodem/isimodem.c \
+ drivers/isimodem/isimodem.h \
+ drivers/isimodem/isiutil.h \
+ drivers/isimodem/mtc.h \
+ drivers/isimodem/network-registration.c \
+ drivers/isimodem/network.h \
+ drivers/isimodem/phonebook.c \
+ drivers/isimodem/radio-settings.c \
+ drivers/isimodem/sim.c \
+ drivers/isimodem/sim.h \
+ drivers/isimodem/sms.c \
+ drivers/isimodem/sms.h \
+ drivers/isimodem/ss.h \
+ drivers/isimodem/uicc-util.c \
+ drivers/isimodem/uicc-util.h \
+ drivers/isimodem/uicc.c \
+ drivers/isimodem/uicc.h \
+ drivers/isimodem/ussd.c \
+ drivers/isimodem/voicecall.c
builtin_modules += isiusb
builtin_sources += plugins/isiusb.c
builtin_modules += n900
-builtin_sources += plugins/n900.c plugins/nokia-gpio.h plugins/nokia-gpio.c
+builtin_sources += \
+ plugins/n900.c \
+ plugins/nokia-gpio.c \
+ plugins/nokia-gpio.h
builtin_modules += u8500
builtin_sources += plugins/u8500.c
endif
if QMIMODEM
-qmi_sources = drivers/qmimodem/qmi.h drivers/qmimodem/qmi.c \
- drivers/qmimodem/ctl.h \
- drivers/qmimodem/dms.h \
- drivers/qmimodem/nas.h \
- drivers/qmimodem/uim.h \
- drivers/qmimodem/wms.h \
- drivers/qmimodem/wds.h \
- drivers/qmimodem/pds.h \
- drivers/qmimodem/common.h
+qmi_sources = \
+ drivers/qmimodem/common.h \
+ drivers/qmimodem/ctl.h \
+ drivers/qmimodem/dms.h \
+ drivers/qmimodem/nas.h \
+ drivers/qmimodem/pds.h \
+ drivers/qmimodem/qmi.c \
+ drivers/qmimodem/qmi.h \
+ drivers/qmimodem/uim.h \
+ drivers/qmimodem/wds.h \
+ drivers/qmimodem/wms.h
builtin_modules += qmimodem
-builtin_sources += $(qmi_sources) \
- drivers/qmimodem/util.h \
- drivers/qmimodem/qmimodem.h \
- drivers/qmimodem/qmimodem.c \
- drivers/qmimodem/devinfo.c \
- drivers/qmimodem/voicecall.c \
- drivers/qmimodem/network-registration.c \
- drivers/qmimodem/sim-legacy.c \
- drivers/qmimodem/sim.c \
- drivers/qmimodem/sms.c \
- drivers/qmimodem/ussd.c \
- drivers/qmimodem/gprs.c \
- drivers/qmimodem/gprs-context.c \
- drivers/qmimodem/radio-settings.c \
- drivers/qmimodem/location-reporting.c
+builtin_sources += \
+ $(qmi_sources) \
+ drivers/qmimodem/devinfo.c \
+ drivers/qmimodem/gprs-context.c \
+ drivers/qmimodem/gprs.c \
+ drivers/qmimodem/location-reporting.c \
+ drivers/qmimodem/network-registration.c \
+ drivers/qmimodem/qmimodem.c \
+ drivers/qmimodem/qmimodem.h \
+ drivers/qmimodem/radio-settings.c \
+ drivers/qmimodem/sim-legacy.c \
+ drivers/qmimodem/sim.c \
+ drivers/qmimodem/sms.c \
+ drivers/qmimodem/ussd.c \
+ drivers/qmimodem/util.h \
+ drivers/qmimodem/voicecall.c
builtin_modules += gobi
builtin_sources += plugins/gobi.c
endif
if ATMODEM
builtin_modules += atmodem
-builtin_sources += $(gatchat_sources) \
- drivers/atmodem/atmodem.h \
- drivers/atmodem/atmodem.c \
- drivers/atmodem/call-settings.c \
- drivers/atmodem/sms.c \
- drivers/atmodem/cbs.c \
- drivers/atmodem/call-forwarding.c \
- drivers/atmodem/call-meter.c \
- drivers/atmodem/network-registration.c \
- drivers/atmodem/sim.c \
- drivers/atmodem/stk.c \
- drivers/atmodem/stk.h \
- drivers/atmodem/ussd.c \
- drivers/atmodem/voicecall.c \
- drivers/atmodem/call-barring.c \
- drivers/atmodem/phonebook.c \
- drivers/atmodem/devinfo.c \
- drivers/atmodem/call-volume.c \
- drivers/atmodem/vendor.h \
- drivers/atmodem/atutil.h \
- drivers/atmodem/atutil.c \
- drivers/atmodem/gprs.c \
- drivers/atmodem/gprs-context.c \
- drivers/atmodem/sim-auth.c \
- drivers/atmodem/gnss.c
+builtin_sources += \
+ $(gatchat_sources) \
+ drivers/atmodem/atmodem.c \
+ drivers/atmodem/atmodem.h \
+ drivers/atmodem/atutil.c \
+ drivers/atmodem/atutil.h \
+ drivers/atmodem/call-barring.c \
+ drivers/atmodem/call-forwarding.c \
+ drivers/atmodem/call-meter.c \
+ drivers/atmodem/call-settings.c \
+ drivers/atmodem/call-volume.c \
+ drivers/atmodem/cbs.c \
+ drivers/atmodem/devinfo.c \
+ drivers/atmodem/gnss.c \
+ drivers/atmodem/gprs-context.c \
+ drivers/atmodem/gprs.c \
+ drivers/atmodem/network-registration.c \
+ drivers/atmodem/phonebook.c \
+ drivers/atmodem/sim-auth.c \
+ drivers/atmodem/sim.c \
+ drivers/atmodem/sms.c \
+ drivers/atmodem/stk.c \
+ drivers/atmodem/stk.h \
+ drivers/atmodem/ussd.c \
+ drivers/atmodem/vendor.h \
+ drivers/atmodem/voicecall.c
builtin_modules += nwmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/nwmodem/nwmodem.h \
- drivers/nwmodem/nwmodem.c \
- drivers/nwmodem/radio-settings.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/nwmodem/nwmodem.c \
+ drivers/nwmodem/nwmodem.h \
+ drivers/nwmodem/radio-settings.c
builtin_modules += swmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/swmodem/swmodem.h \
- drivers/swmodem/swmodem.c \
- drivers/swmodem/gprs-context.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/swmodem/gprs-context.c \
+ drivers/swmodem/swmodem.c \
+ drivers/swmodem/swmodem.h
builtin_modules += ztemodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/ztemodem/ztemodem.h \
- drivers/ztemodem/ztemodem.c \
- drivers/ztemodem/radio-settings.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/ztemodem/radio-settings.c \
+ drivers/ztemodem/ztemodem.c \
+ drivers/ztemodem/ztemodem.h
builtin_modules += iceramodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/iceramodem/iceramodem.h \
- drivers/iceramodem/iceramodem.c \
- drivers/iceramodem/gprs-context.c \
- drivers/iceramodem/radio-settings.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/iceramodem/gprs-context.c \
+ drivers/iceramodem/iceramodem.c \
+ drivers/iceramodem/iceramodem.h \
+ drivers/iceramodem/radio-settings.c
builtin_modules += huaweimodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/huaweimodem/huaweimodem.h \
- drivers/huaweimodem/huaweimodem.c \
- drivers/huaweimodem/ussd.c \
- drivers/huaweimodem/voicecall.c \
- drivers/huaweimodem/audio-settings.c \
- drivers/huaweimodem/gprs-context.c \
- drivers/huaweimodem/radio-settings.c \
- drivers/huaweimodem/cdma-netreg.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/huaweimodem/audio-settings.c \
+ drivers/huaweimodem/cdma-netreg.c \
+ drivers/huaweimodem/gprs-context.c \
+ drivers/huaweimodem/huaweimodem.c \
+ drivers/huaweimodem/huaweimodem.h \
+ drivers/huaweimodem/radio-settings.c \
+ drivers/huaweimodem/ussd.c \
+ drivers/huaweimodem/voicecall.c
builtin_modules += calypsomodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/calypsomodem/calypsomodem.h \
- drivers/calypsomodem/calypsomodem.c \
- drivers/calypsomodem/voicecall.c \
- drivers/calypsomodem/stk.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/calypsomodem/calypsomodem.c \
+ drivers/calypsomodem/calypsomodem.h \
+ drivers/calypsomodem/stk.c \
+ drivers/calypsomodem/voicecall.c
builtin_modules += mbmmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/mbmmodem/mbmmodem.h \
- drivers/mbmmodem/mbmmodem.c \
- drivers/mbmmodem/gprs-context.c \
- drivers/mbmmodem/stk.c \
- drivers/mbmmodem/location-reporting.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/mbmmodem/gprs-context.c \
+ drivers/mbmmodem/location-reporting.c \
+ drivers/mbmmodem/mbmmodem.c \
+ drivers/mbmmodem/mbmmodem.h \
+ drivers/mbmmodem/stk.c
builtin_modules += telitmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/telitmodem/telitmodem.h \
- drivers/telitmodem/telitmodem.c \
- drivers/telitmodem/location-reporting.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/telitmodem/location-reporting.c \
+ drivers/telitmodem/telitmodem.c \
+ drivers/telitmodem/telitmodem.h
builtin_modules += hsomodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/hsomodem/hsomodem.h \
- drivers/hsomodem/hsomodem.c \
- drivers/hsomodem/gprs-context.c \
- drivers/hsomodem/radio-settings.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/hsomodem/gprs-context.c \
+ drivers/hsomodem/hsomodem.c \
+ drivers/hsomodem/hsomodem.h \
+ drivers/hsomodem/radio-settings.c
builtin_modules += ifxmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/ifxmodem/ifxmodem.h \
- drivers/ifxmodem/ifxmodem.c \
- drivers/ifxmodem/voicecall.c \
- drivers/ifxmodem/audio-settings.c \
- drivers/ifxmodem/radio-settings.c \
- drivers/ifxmodem/gprs-context.c \
- drivers/ifxmodem/stk.c \
- drivers/ifxmodem/ctm.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/ifxmodem/audio-settings.c \
+ drivers/ifxmodem/ctm.c \
+ drivers/ifxmodem/gprs-context.c \
+ drivers/ifxmodem/ifxmodem.c \
+ drivers/ifxmodem/ifxmodem.h \
+ drivers/ifxmodem/radio-settings.c \
+ drivers/ifxmodem/stk.c \
+ drivers/ifxmodem/voicecall.c
builtin_modules += stemodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/stemodem/stemodem.h \
- drivers/stemodem/stemodem.c \
- drivers/stemodem/voicecall.c \
- drivers/stemodem/radio-settings.c \
- drivers/stemodem/caif_rtnl.c \
- drivers/stemodem/caif_rtnl.h \
- drivers/stemodem/gprs-context.c \
- drivers/stemodem/caif_socket.h \
- drivers/stemodem/if_caif.h
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/stemodem/caif_rtnl.c \
+ drivers/stemodem/caif_rtnl.h \
+ drivers/stemodem/caif_socket.h \
+ drivers/stemodem/gprs-context.c \
+ drivers/stemodem/if_caif.h \
+ drivers/stemodem/radio-settings.c \
+ drivers/stemodem/stemodem.c \
+ drivers/stemodem/stemodem.h \
+ drivers/stemodem/voicecall.c
builtin_modules += dunmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/dunmodem/dunmodem.h \
- drivers/dunmodem/dunmodem.c \
- drivers/dunmodem/network-registration.c \
- drivers/dunmodem/gprs.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/dunmodem/dunmodem.c \
+ drivers/dunmodem/dunmodem.h \
+ drivers/dunmodem/gprs.c \
+ drivers/dunmodem/network-registration.c
builtin_modules += hfpmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/hfpmodem/hfpmodem.h \
- drivers/hfpmodem/hfpmodem.c \
- drivers/hfpmodem/slc.h \
- drivers/hfpmodem/slc.c \
- drivers/hfpmodem/voicecall.c \
- drivers/hfpmodem/network-registration.c \
- drivers/hfpmodem/call-volume.c \
- drivers/hfpmodem/devinfo.c \
- drivers/hfpmodem/handsfree.c \
- drivers/hfpmodem/siri.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/hfpmodem/call-volume.c \
+ drivers/hfpmodem/devinfo.c \
+ drivers/hfpmodem/handsfree.c \
+ drivers/hfpmodem/hfpmodem.c \
+ drivers/hfpmodem/hfpmodem.h \
+ drivers/hfpmodem/network-registration.c \
+ drivers/hfpmodem/siri.c \
+ drivers/hfpmodem/slc.c \
+ drivers/hfpmodem/slc.h \
+ drivers/hfpmodem/voicecall.c
builtin_modules += speedupmodem
-builtin_sources += drivers/atmodem/atutil.h \
- drivers/speedupmodem/speedupmodem.h \
- drivers/speedupmodem/speedupmodem.c \
- drivers/speedupmodem/ussd.c
+builtin_sources += \
+ drivers/atmodem/atutil.h \
+ drivers/speedupmodem/speedupmodem.c \
+ drivers/speedupmodem/speedupmodem.h \
+ drivers/speedupmodem/ussd.c
if PHONESIM
builtin_modules += phonesim
builtin_sources += plugins/phonesim.c
if DATAFILES
dist_conf_DATA += plugins/phonesim.conf
endif
endif
if CDMAMODEM
builtin_modules += cdmamodem
-builtin_sources += drivers/cdmamodem/cdmamodem.h \
- drivers/cdmamodem/cdmamodem.c \
- drivers/cdmamodem/voicecall.c \
- drivers/cdmamodem/devinfo.c \
- drivers/cdmamodem/connman.c
+builtin_sources += \
+ drivers/cdmamodem/cdmamodem.c \
+ drivers/cdmamodem/cdmamodem.h \
+ drivers/cdmamodem/connman.c \
+ drivers/cdmamodem/devinfo.c \
+ drivers/cdmamodem/voicecall.c
endif
builtin_modules += g1
builtin_sources += plugins/g1.c
builtin_modules += wavecom
builtin_sources += plugins/wavecom.c
@@ -430,54 +513,76 @@ builtin_modules += quectel
builtin_sources += plugins/quectel.c
builtin_modules += ublox
builtin_sources += plugins/ublox.c
if BLUETOOTH
if BLUEZ4
builtin_modules += bluez4
-builtin_sources += plugins/bluez4.c plugins/bluez4.h
+builtin_sources += \
+ plugins/bluez4.c \
+ plugins/bluez4.h
builtin_modules += telit
-builtin_sources += plugins/telit.c plugins/bluez4.h
+builtin_sources += \
+ plugins/bluez4.h \
+ plugins/telit.c
builtin_modules += sap
-builtin_sources += plugins/sap.c plugins/bluez4.h
+builtin_sources += \
+ plugins/bluez4.h \
+ plugins/sap.c
builtin_modules += hfp_bluez4
-builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h
+builtin_sources += \
+ plugins/bluez4.h \
+ plugins/hfp_hf_bluez4.c
builtin_modules += hfp_ag_bluez4
-builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
+builtin_sources += \
+ plugins/bluez4.h \
+ plugins/hfp_ag_bluez4.c
builtin_modules += dun_gw_bluez4
-builtin_sources += plugins/dun_gw_bluez4.c plugins/bluez4.h
+builtin_sources += \
+ plugins/bluez4.h \
+ plugins/dun_gw_bluez4.c
builtin_sources += $(btio_sources)
builtin_cflags += @BLUEZ_CFLAGS@
builtin_libadd += @BLUEZ_LIBS@
else
builtin_modules += bluez5
-builtin_sources += plugins/bluez5.c plugins/bluez5.h
+builtin_sources += \
+ plugins/bluez5.c \
+ plugins/bluez5.h
builtin_modules += hfp_bluez5
-builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
+builtin_sources += \
+ plugins/bluez5.h \
+ plugins/hfp_hf_bluez5.c
builtin_modules += hfp_ag_bluez5
-builtin_sources += plugins/hfp_ag_bluez5.c plugins/bluez5.h
+builtin_sources += \
+ plugins/bluez5.h \
+ plugins/hfp_ag_bluez5.c
builtin_modules += dun_gw_bluez5
-builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
+builtin_sources += \
+ plugins/bluez5.h \
+ plugins/dun_gw_bluez5.c
endif
endif
endif
if PROVISION
-builtin_sources += plugins/mbpi.h plugins/mbpi.c
+builtin_sources += \
+ plugins/mbpi.c \
+ plugins/mbpi.h
builtin_modules += provision
builtin_sources += plugins/provision.c
builtin_modules += cdma_provision
builtin_sources += plugins/cdma-provision.c
endif
@@ -507,338 +612,521 @@ endif
builtin_modules += smart_messaging
builtin_sources += plugins/smart-messaging.c
builtin_modules += push_notification
builtin_sources += plugins/push-notification.c
sbin_PROGRAMS = src/ofonod
-src_ofonod_SOURCES = $(builtin_sources) src/ofono.ver \
- src/main.c src/ofono.h src/log.c src/plugin.c \
- src/modem.c src/common.h src/common.c \
- src/manager.c src/dbus.c src/util.h src/util.c \
- src/network.c src/voicecall.c src/ussd.c src/sms.c \
- src/call-settings.c src/call-forwarding.c \
- src/call-meter.c src/smsutil.h src/smsutil.c \
- src/call-barring.c src/sim.c src/stk.c \
- src/phonebook.c src/history.c src/message-waiting.c \
- src/simutil.h src/simutil.c src/storage.h \
- src/storage.c src/cbs.c src/watch.c src/call-volume.c \
- src/gprs.c src/idmap.h src/idmap.c \
- src/radio-settings.c src/stkutil.h src/stkutil.c \
- src/nettime.c src/stkagent.c src/stkagent.h \
- src/simfs.c src/simfs.h src/audio-settings.c \
- src/smsagent.c src/smsagent.h src/ctm.c \
- src/cdma-voicecall.c src/sim-auth.c \
- src/message.h src/message.c src/gprs-provision.c \
- src/emulator.c src/location-reporting.c \
- src/cdma-connman.c src/gnss.c \
- src/gnssagent.c src/gnssagent.h \
- src/cdma-smsutil.h src/cdma-smsutil.c \
- src/cdma-sms.c src/private-network.c src/cdma-netreg.c \
- src/cdma-provision.c src/handsfree.c \
- src/handsfree-audio.c src/bluetooth.h \
- src/hfp.h src/siri.c
-
-src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
- @GLIB_LIBS@ @DBUS_LIBS@ -ldl
-
-src_ofonod_LDFLAGS = -Wl,--export-dynamic \
- -Wl,--version-script=$(srcdir)/src/ofono.ver
-
-BUILT_SOURCES = $(local_headers) src/builtin.h
-
-CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
+src_ofonod_SOURCES = \
+ $(builtin_sources) \
+ src/audio-settings.c \
+ src/bluetooth.h \
+ src/call-barring.c \
+ src/call-forwarding.c \
+ src/call-meter.c \
+ src/call-settings.c \
+ src/call-volume.c \
+ src/cbs.c \
+ src/cdma-connman.c \
+ src/cdma-netreg.c \
+ src/cdma-provision.c \
+ src/cdma-sms.c \
+ src/cdma-smsutil.c \
+ src/cdma-smsutil.h \
+ src/cdma-voicecall.c \
+ src/common.c \
+ src/common.h \
+ src/ctm.c \
+ src/dbus.c \
+ src/emulator.c \
+ src/gnss.c \
+ src/gnssagent.c \
+ src/gnssagent.h \
+ src/gprs-provision.c \
+ src/gprs.c \
+ src/handsfree-audio.c \
+ src/handsfree.c \
+ src/hfp.h \
+ src/history.c \
+ src/idmap.c \
+ src/idmap.h \
+ src/location-reporting.c \
+ src/log.c \
+ src/main.c \
+ src/manager.c \
+ src/message-waiting.c \
+ src/message.c \
+ src/message.h \
+ src/modem.c \
+ src/nettime.c \
+ src/network.c \
+ src/ofono.h \
+ src/ofono.ver \
+ src/phonebook.c \
+ src/plugin.c \
+ src/private-network.c \
+ src/radio-settings.c \
+ src/sim-auth.c \
+ src/sim.c \
+ src/simfs.c \
+ src/simfs.h \
+ src/simutil.c \
+ src/simutil.h \
+ src/siri.c \
+ src/sms.c \
+ src/smsagent.c \
+ src/smsagent.h \
+ src/smsutil.c \
+ src/smsutil.h \
+ src/stk.c \
+ src/stkagent.c \
+ src/stkagent.h \
+ src/stkutil.c \
+ src/stkutil.h \
+ src/storage.c \
+ src/storage.h \
+ src/ussd.c \
+ src/util.c \
+ src/util.h \
+ src/voicecall.c \
+ src/watch.c
+
+src_ofonod_LDADD = \
+ gdbus/libgdbus-internal.la \
+ $(builtin_libadd) \
+ @GLIB_LIBS@ \
+ @DBUS_LIBS@ \
+ -ldl
+
+src_ofonod_LDFLAGS = \
+ -Wl,--export-dynamic \
+ -Wl,--version-script=$(srcdir)/src/ofono.ver
+
+BUILT_SOURCES = \
+ $(local_headers) \
+ src/builtin.h
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(rules_DATA)
plugindir = $(pkglibdir)/plugins
if MAINTAINER_MODE
build_plugindir = $(abs_top_srcdir)/plugins/.libs
else
build_plugindir = $(plugindir)
endif
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ $(builtin_cflags) \
- -DOFONO_PLUGIN_BUILTIN \
- -DPLUGINDIR=\""$(build_plugindir)"\"
-
-AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
- -I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
- -I$(srcdir)/btio
-
-doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
- doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
- doc/voicecallmanager-api.txt doc/voicecall-api.txt \
- doc/call-forwarding-api.txt doc/call-settings-api.txt \
- doc/call-meter-api.txt doc/call-barring-api.txt \
- doc/supplementaryservices-api.txt \
- doc/connman-api.txt doc/features.txt \
- doc/pushnotification-api.txt \
- doc/smartmessaging-api.txt \
- doc/call-volume-api.txt doc/cell-broadcast-api.txt \
- doc/messagemanager-api.txt doc/message-waiting-api.txt \
- doc/phonebook-api.txt doc/radio-settings-api.txt \
- doc/sim-api.txt doc/stk-api.txt \
- doc/audio-settings-api.txt doc/text-telephony-api.txt \
- doc/calypso-modem.txt doc/message-api.txt \
- doc/location-reporting-api.txt \
- doc/certification.txt doc/siri-api.txt \
- doc/telit-modem.txt
-
-
-test_scripts = test/backtrace \
- test/create-internet-context \
- test/create-mms-context \
- test/activate-context \
- test/deactivate-context \
- test/deactivate-all \
- test/dial-number \
- test/list-calls \
- test/answer-calls \
- test/reject-calls \
- test/create-multiparty \
- test/private-chat \
- test/disable-modem \
- test/enable-modem \
- test/enter-pin \
- test/reset-pin \
- test/hangup-all \
- test/hangup-active \
- test/set-mms-details \
- test/set-roaming-allowed \
- test/list-contexts \
- test/list-modems \
- test/list-operators \
- test/scan-for-operators \
- test/get-operators\
- test/monitor-ofono \
- test/process-context-settings \
- test/receive-sms \
- test/remove-contexts \
- test/send-sms \
- test/set-mic-volume \
- test/set-speaker-volume \
- test/test-stk-menu \
- test/test-advice-of-charge \
- test/test-call-barring \
- test/test-call-forwarding \
- test/test-call-settings \
- test/test-modem \
- test/test-network-registration \
- test/test-phonebook \
- test/test-cbs \
- test/test-ss \
- test/test-ss-control-cb \
- test/test-ss-control-cf \
- test/test-ss-control-cs \
- test/send-ussd \
- test/cancel-ussd \
- test/initiate-ussd \
- test/offline-modem \
- test/online-modem \
- test/get-tech-preference \
- test/set-tech-preference \
- test/set-use-sms-reports \
- test/set-cbs-topics \
- test/enable-cbs \
- test/lock-pin \
- test/unlock-pin \
- test/change-pin \
- test/enable-gprs \
- test/disable-gprs \
- test/get-icon \
- test/set-fast-dormancy \
- test/test-push-notification \
- test/test-smart-messaging \
- test/send-vcard \
- test/send-vcal \
- test/set-tty \
- test/set-gsm-band \
- test/set-umts-band \
- test/lockdown-modem \
- test/set-call-forwarding \
- test/cdma-list-call \
- test/cdma-dial-number \
- test/cdma-hangup \
- test/cdma-set-credentials \
- test/disable-call-forwarding \
- test/list-messages \
- test/test-sms \
- test/test-message-waiting \
- test/cdma-connman-disable \
- test/cdma-connman-enable \
- test/set-context-property \
- test/test-gnss \
- test/swap-calls \
- test/release-and-answer \
- test/release-and-swap \
- test/hold-and-answer \
- test/hangup-multiparty \
- test/hangup-call \
- test/display-icon \
- test/set-msisdn \
- test/set-ddr
+AM_CFLAGS = \
+ @DBUS_CFLAGS@ \
+ @GLIB_CFLAGS@ \
+ $(builtin_cflags) \
+ -DOFONO_PLUGIN_BUILTIN \
+ -DPLUGINDIR=\""$(build_plugindir)"\"
+
+AM_CPPFLAGS = \
+ -I$(builddir)/include \
+ -I$(builddir)/src \
+ -I$(srcdir)/src \
+ -I$(srcdir)/gdbus \
+ -I$(srcdir)/gisi \
+ -I$(srcdir)/gatchat \
+ -I$(srcdir)/btio
+
+doc_files = \
+ doc/audio-settings-api.txt \
+ doc/call-barring-api.txt \
+ doc/call-forwarding-api.txt \
+ doc/call-meter-api.txt \
+ doc/call-settings-api.txt \
+ doc/call-volume-api.txt \
+ doc/calypso-modem.txt \
+ doc/cell-broadcast-api.txt \
+ doc/certification.txt \
+ doc/connman-api.txt \
+ doc/features.txt \
+ doc/location-reporting-api.txt \
+ doc/manager-api.txt \
+ doc/message-api.txt \
+ doc/message-waiting-api.txt \
+ doc/messagemanager-api.txt \
+ doc/modem-api.txt \
+ doc/network-api.txt \
+ doc/ofono-paper.txt \
+ doc/overview.txt \
+ doc/phonebook-api.txt \
+ doc/pushnotification-api.txt \
+ doc/radio-settings-api.txt \
+ doc/release-faq.txt \
+ doc/sim-api.txt \
+ doc/siri-api.txt \
+ doc/smartmessaging-api.txt \
+ doc/stk-api.txt \
+ doc/supplementaryservices-api.txt \
+ doc/telit-modem.txt \
+ doc/text-telephony-api.txt \
+ doc/voicecall-api.txt \
+ doc/voicecallmanager-api.txt
+
+
+test_scripts = \
+ test/activate-context \
+ test/answer-calls \
+ test/backtrace \
+ test/cancel-ussd \
+ test/cdma-connman-disable \
+ test/cdma-connman-enable \
+ test/cdma-dial-number \
+ test/cdma-hangup \
+ test/cdma-list-call \
+ test/cdma-set-credentials \
+ test/change-pin \
+ test/create-internet-context \
+ test/create-mms-context \
+ test/create-multiparty \
+ test/deactivate-all \
+ test/deactivate-context \
+ test/dial-number \
+ test/disable-call-forwarding \
+ test/disable-gprs \
+ test/disable-modem \
+ test/display-icon \
+ test/enable-cbs \
+ test/enable-gprs \
+ test/enable-modem \
+ test/enter-pin \
+ test/get-icon \
+ test/get-operators \
+ test/get-tech-preference \
+ test/hangup-active \
+ test/hangup-all \
+ test/hangup-call \
+ test/hangup-multiparty \
+ test/hold-and-answer \
+ test/initiate-ussd \
+ test/list-calls \
+ test/list-contexts \
+ test/list-messages \
+ test/list-modems \
+ test/list-operators \
+ test/lock-pin \
+ test/lockdown-modem \
+ test/monitor-ofono \
+ test/offline-modem \
+ test/online-modem \
+ test/private-chat \
+ test/process-context-settings \
+ test/receive-sms \
+ test/reject-calls \
+ test/release-and-answer \
+ test/release-and-swap \
+ test/remove-contexts \
+ test/reset-pin \
+ test/scan-for-operators \
+ test/send-sms \
+ test/send-ussd \
+ test/send-vcal \
+ test/send-vcard \
+ test/set-call-forwarding \
+ test/set-cbs-topics \
+ test/set-context-property \
+ test/set-ddr \
+ test/set-fast-dormancy \
+ test/set-gsm-band \
+ test/set-mic-volume \
+ test/set-mms-details \
+ test/set-msisdn \
+ test/set-roaming-allowed \
+ test/set-speaker-volume \
+ test/set-tech-preference \
+ test/set-tty \
+ test/set-umts-band \
+ test/set-use-sms-reports \
+ test/swap-calls \
+ test/test-advice-of-charge \
+ test/test-call-barring \
+ test/test-call-forwarding \
+ test/test-call-settings \
+ test/test-cbs \
+ test/test-gnss \
+ test/test-message-waiting \
+ test/test-modem \
+ test/test-network-registration \
+ test/test-phonebook \
+ test/test-push-notification \
+ test/test-smart-messaging \
+ test/test-sms \
+ test/test-ss \
+ test/test-ss-control-cb \
+ test/test-ss-control-cf \
+ test/test-ss-control-cs \
+ test/test-stk-menu \
+ test/unlock-pin
if TEST
testdir = $(pkglibdir)/test
test_SCRIPTS = $(test_scripts)
endif
-EXTRA_DIST = src/genbuiltin plugins/ofono.rules plugins/ofono-speedup.rules \
- $(doc_files) $(test_scripts)
+EXTRA_DIST = \
+ src/genbuiltin \
+ plugins/ofono.rules \
+ plugins/ofono-speedup.rules \
+ $(doc_files) \
+ $(test_scripts)
dist_man_MANS = doc/ofonod.8
unit_objects =
-unit_tests = unit/test-common unit/test-util unit/test-idmap \
- unit/test-simutil unit/test-stkutil \
- unit/test-sms unit/test-cdmasms
-
-noinst_PROGRAMS = $(unit_tests) \
- unit/test-sms-root unit/test-mux unit/test-caif
-
-unit_test_common_SOURCES = unit/test-common.c src/common.c src/util.c
+unit_tests = \
+ unit/test-cdmasms \
+ unit/test-common \
+ unit/test-idmap \
+ unit/test-simutil \
+ unit/test-sms \
+ unit/test-stkutil \
+ unit/test-util
+
+noinst_PROGRAMS = \
+ $(unit_tests) \
+ unit/test-caif \
+ unit/test-mux \
+ unit/test-sms-root
+
+unit_test_common_SOURCES = \
+ src/common.c \
+ src/util.c \
+ unit/test-common.c
unit_test_common_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_common_OBJECTS)
-unit_test_util_SOURCES = unit/test-util.c src/util.c
+unit_test_util_SOURCES = \
+ src/util.c \
+ unit/test-util.c
unit_test_util_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_utils_OBJECTS)
-unit_test_idmap_SOURCES = unit/test-idmap.c src/idmap.c
+unit_test_idmap_SOURCES = \
+ src/idmap.c \
+ unit/test-idmap.c
unit_test_idmap_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_idmap_OBJECTS)
-unit_test_simutil_SOURCES = unit/test-simutil.c src/util.c \
- src/simutil.c src/smsutil.c src/storage.c
+unit_test_simutil_SOURCES = \
+ src/simutil.c \
+ src/smsutil.c \
+ src/storage.c \
+ src/util.c \
+ unit/test-simutil.c
unit_test_simutil_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_simutil_OBJECTS)
-unit_test_stkutil_SOURCES = unit/test-stkutil.c unit/stk-test-data.h \
- src/util.c \
- src/storage.c src/smsutil.c \
- src/simutil.c src/stkutil.c
+unit_test_stkutil_SOURCES = \
+ src/simutil.c \
+ src/smsutil.c \
+ src/stkutil.c \
+ src/storage.c \
+ src/util.c \
+ unit/stk-test-data.h \
+ unit/test-stkutil.c
unit_test_stkutil_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_stkutil_OBJECTS)
-unit_test_sms_SOURCES = unit/test-sms.c src/util.c src/smsutil.c src/storage.c
+unit_test_sms_SOURCES = \
+ src/smsutil.c \
+ src/storage.c \
+ src/util.c \
+ unit/test-sms.c
unit_test_sms_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_sms_OBJECTS)
-unit_test_cdmasms_SOURCES = unit/test-cdmasms.c src/cdma-smsutil.c
+unit_test_cdmasms_SOURCES = \
+ src/cdma-smsutil.c \
+ unit/test-cdmasms.c
unit_test_cdmasms_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_cdmasms_OBJECTS)
-unit_test_sms_root_SOURCES = unit/test-sms-root.c \
- src/util.c src/smsutil.c src/storage.c
+unit_test_sms_root_SOURCES = \
+ src/smsutil.c \
+ src/storage.c \
+ src/util.c \
+ unit/test-sms-root.c
unit_test_sms_root_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_sms_root_OBJECTS)
-unit_test_mux_SOURCES = unit/test-mux.c $(gatchat_sources)
+unit_test_mux_SOURCES = \
+ $(gatchat_sources) \
+ unit/test-mux.c
unit_test_mux_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_mux_OBJECTS)
-unit_test_caif_SOURCES = unit/test-caif.c $(gatchat_sources) \
- drivers/stemodem/caif_socket.h \
- drivers/stemodem/if_caif.h
+unit_test_caif_SOURCES = \
+ $(gatchat_sources) \
+ drivers/stemodem/caif_socket.h \
+ drivers/stemodem/if_caif.h \
+ unit/test-caif.c
unit_test_caif_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_caif_OBJECTS)
TESTS = $(unit_tests)
if TOOLS
-noinst_PROGRAMS += tools/huawei-audio tools/auto-enable \
- tools/get-location tools/lookup-apn \
- tools/lookup-provider-name tools/tty-redirector
+noinst_PROGRAMS += \
+ tools/auto-enable \
+ tools/get-location \
+ tools/huawei-audio \
+ tools/lookup-apn \
+ tools/lookup-provider-name \
+ tools/tty-redirector
tools_huawei_audio_SOURCES = tools/huawei-audio.c
-tools_huawei_audio_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+tools_huawei_audio_LDADD = \
+ gdbus/libgdbus-internal.la \
+ @GLIB_LIBS@ \
+ @DBUS_LIBS@
tools_auto_enable_SOURCES = tools/auto-enable.c
-tools_auto_enable_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+tools_auto_enable_LDADD = \
+ gdbus/libgdbus-internal.la \
+ @GLIB_LIBS@ \
+ @DBUS_LIBS@
tools_get_location_SOURCES = tools/get-location.c
-tools_get_location_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
-
-tools_lookup_apn_SOURCES = plugins/mbpi.c plugins/mbpi.h tools/lookup-apn.c
+tools_get_location_LDADD = \
+ @GLIB_LIBS@ \
+ @DBUS_LIBS@
+
+tools_lookup_apn_SOURCES = \
+ plugins/mbpi.c \
+ plugins/mbpi.h \
+ tools/lookup-apn.c
tools_lookup_apn_LDADD = @GLIB_LIBS@
-tools_lookup_provider_name_SOURCES = plugins/mbpi.c plugins/mbpi.h \
- tools/lookup-provider-name.c
+tools_lookup_provider_name_SOURCES = \
+ plugins/mbpi.c \
+ plugins/mbpi.h \
+ tools/lookup-provider-name.c
tools_lookup_provider_name_LDADD = @GLIB_LIBS@
tools_tty_redirector_SOURCES = tools/tty-redirector.c
tools_tty_redirector_LDADD = @GLIB_LIBS@
if QMIMODEM
noinst_PROGRAMS += tools/qmi
-tools_qmi_SOURCES = $(qmi_sources) tools/qmi.c
+tools_qmi_SOURCES = \
+ $(qmi_sources) \
+ tools/qmi.c
tools_qmi_LDADD = @GLIB_LIBS@
endif
if MAINTAINER_MODE
noinst_PROGRAMS += tools/stktest
-tools_stktest_SOURCES = $(gatchat_sources) tools/stktest.c \
- unit/stk-test-data.h
-tools_stktest_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+tools_stktest_SOURCES = \
+ $(gatchat_sources) \
+ tools/stktest.c \
+ unit/stk-test-data.h
+tools_stktest_LDADD = \
+ gdbus/libgdbus-internal.la \
+ @GLIB_LIBS@ \
+ @DBUS_LIBS@
endif
endif
if BLUETOOTH
if DUNDEE
sbin_PROGRAMS += dundee/dundee
-dundee_common_sources = $(gatchat_sources) \
- src/log.c src/dbus.c dundee/dundee.h dundee/main.c \
- dundee/dbus.c dundee/manager.c dundee/device.c
-
-dundee_dundee_LDADD = $(builtin_libadd) gdbus/libgdbus-internal.la \
- @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+dundee_common_sources = \
+ $(gatchat_sources) \
+ dundee/dbus.c \
+ dundee/device.c \
+ dundee/dundee.h \
+ dundee/main.c \
+ dundee/manager.c \
+ src/dbus.c \
+ src/log.c
+
+dundee_dundee_LDADD = \
+ $(builtin_libadd) \
+ gdbus/libgdbus-internal.la \
+ @GLIB_LIBS@ \
+ @DBUS_LIBS@ \
+ -ldl
if DATAFILES
dist_dbusconf_DATA += dundee/dundee.conf
if SYSTEMD
systemdunit_DATA += dundee/dundee.service
endif
endif
if BLUEZ4
-dundee_dundee_SOURCES = $(dundee_common_sources) $(btio_sources) \
- plugins/bluez4.c dundee/bluez4.c
+dundee_dundee_SOURCES = \
+ $(dundee_common_sources) \
+ $(btio_sources) \
+ dundee/bluez4.c \
+ plugins/bluez4.c
else
-dundee_dundee_SOURCES = $(dundee_common_sources) plugins/bluez5.c \
- dundee/bluez5.c
+dundee_dundee_SOURCES = \
+ $(dundee_common_sources) \
+ dundee/bluez5.c \
+ plugins/bluez5.c
endif
endif
endif
-noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm
+noinst_PROGRAMS += \
+ gatchat/gsmdial \
+ gatchat/test-qcdm \
+ gatchat/test-server
-gatchat_gsmdial_SOURCES = gatchat/gsmdial.c $(gatchat_sources)
+gatchat_gsmdial_SOURCES = \
+ $(gatchat_sources) \
+ gatchat/gsmdial.c
gatchat_gsmdial_LDADD = @GLIB_LIBS@
-gatchat_test_server_SOURCES = gatchat/test-server.c $(gatchat_sources)
-gatchat_test_server_LDADD = @GLIB_LIBS@ -lutil
+gatchat_test_server_SOURCES = \
+ $(gatchat_sources) \
+ gatchat/test-server.c
+gatchat_test_server_LDADD = \
+ @GLIB_LIBS@ \
+ -lutil
-gatchat_test_qcdm_SOURCES = gatchat/test-qcdm.c $(gatchat_sources)
+gatchat_test_qcdm_SOURCES = \
+ $(gatchat_sources) \
+ gatchat/test-qcdm.c
gatchat_test_qcdm_LDADD = @GLIB_LIBS@
-DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles \
- --enable-dundee --enable-tools
-
-MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 configure config.h.in config.sub config.guess \
- ltmain.sh depcomp compile missing install-sh mkinstalldirs
+DISTCHECK_CONFIGURE_FLAGS = \
+ --disable-datafiles \
+ --enable-dundee \
+ --enable-tools
+
+MAINTAINERCLEANFILES = \
+ Makefile.in \
+ aclocal.m4 \
+ compile \
+ config.guess \
+ config.h.in \
+ config.sub \
+ configure \
+ depcomp \
+ install-sh \
+ ltmain.sh \
+ missing \
+ mkinstalldirs
src/builtin.h: src/genbuiltin config.status
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
plugins/%.rules:
$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
--
2.1.4
5 years, 5 months
AT commands timeout
by Enrico Sau
Hi everyone,
Is there any way to set a timeout on AT commands send?
I'm experiencing some problems because in some situation my modem does not
answer to some AT command and I don't want for that to block my application.
The best solution would be to have a timeout parameter on at command send
to avoid this kind of problems.
Any idea?
Thank you!
Enrico
Sau
5 years, 5 months
[PATCH] radio-settings: Show all available technologies
by Alfonso Sanchez-Beato
Not all possible futures technologies were being showed on the DBus
interface.
---
src/radio-settings.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/radio-settings.c b/src/radio-settings.c
index 0a49305..1a511dc 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -225,12 +225,12 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
}
if (rs->available_rats) {
- const char *rats[sizeof(uint32_t) + 1];
+ const char *rats[sizeof(uint32_t) * CHAR_BIT + 1];
const char **dbus_rats = rats;
int n = 0;
unsigned int i;
- for (i = 0; i < sizeof(uint32_t); i++) {
+ for (i = 0; i < sizeof(uint32_t) * CHAR_BIT; i++) {
int tech = 1 << i;
if (!(rs->available_rats & tech))
--
2.1.0
5 years, 5 months
[PATCH 0/4] Add AvailableTechnologies property to RadioSettings
by Alfonso Sanchez-Beato
This patch series add the AvailableTechnologies property to the
RadioSettings interface. Its purpose is to show the list of valid
values for the TechnologyPreference property in the same interface.
The use case is letting a UI show the possible RATs so the user cannot
select an invalid value for a given modem.
Alfonso Sanchez-Beato (4):
doc: Add AvailableTechnologies property
include: Add method to list RATs to radio-settings
src: Implement RAT list property
test: Add AvailableTechnologies to list-modems
doc/radio-settings-api.txt | 5 +++++
include/radio-settings.h | 15 +++++++++++++++
src/radio-settings.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-
test/list-modems | 3 ++-
4 files changed, 68 insertions(+), 2 deletions(-)
--
2.1.0
5 years, 5 months
[PATCH 0/4] Add ModemTechnologies property to RadioSettings
by Alfonso Sanchez-Beato
This patch series add the ModemTechnologies property to the
RadioSettings interface. Its purpose is to show the list of valid
values for the TechnologyPreference property in the same interface.
The use case is letting a UI show the possible RATs so the user cannot
select an invalid value for a given modem.
Alfonso Sanchez-Beato (4):
doc: Add ModemTechnologies property
include: Add method to list RATs to radio-settings
src: Implement RAT list property
test: Add ModemTechnologies to list-modems
doc/radio-settings-api.txt | 5 ++++
include/radio-settings.h | 11 +++++++++
src/radio-settings.c | 61 +++++++++++++++++++++++++++++++++++++++++++++-
test/list-modems | 3 ++-
4 files changed, 78 insertions(+), 2 deletions(-)
--
2.1.0
5 years, 5 months
[help] connect 2 APN at the same time (PPP and QMI)
by Mylene Josserand
Hi everyone,
I am new to Ofono and I need some advices.
My modem has two interfaces : one interface on which I can do a PPP connection and another interface QMI to make wwan connection.
My SIM card has 2 APNs and I must connect to them simultaneously. So, I need to be connected in PPP with APN1 and in qmi/wwan with APN2.
The two ways of being connected work. I have successfully configured "2 ofonos" to make my modem works with "atmodem" for the PPP side and, by setting ofono driver to gobi in udevng (such as Huawei does) for wwan side. To sum up, Ofono works with PPP or with QMI. Now, I need to make it work with PPP _and_ QMI at the same time.
I tried to connect, on the same modem, in my plugin file, the interface "Device" to "qmimodem" driver (so what "gobi" plugin does) and the "Application" and "Modem" interfaces to "atmodem" driver but it failed because dbus interfaces already exist (created by the first called).
So I was wondering : what should be the best way to do it ? And is it possible ?
Should I create one modem with 2 drivers (with my own driver using atmodem and gobi driver) ?
Or should I create 2 modems with each one the driver needed (gobi/qmimodem and my own driver/atmodem) ?
I am using Ofono v1.15. If you need more information, do not hesitate.
Thank you in advance for any advices or help
Best regards,
Mylène
5 years, 6 months
