diff options
| -rw-r--r-- | doc/cbs-api.txt | 8 | ||||
| -rw-r--r-- | include/dbus.h | 2 | ||||
| -rw-r--r-- | src/cbs.c | 27 | ||||
| -rwxr-xr-x | test/enable-cbs | 2 | ||||
| -rwxr-xr-x | test/set-cbs-topics | 2 |
5 files changed, 20 insertions, 21 deletions
diff --git a/doc/cbs-api.txt b/doc/cbs-api.txt index f244b37f..8c6ef1b5 100644 --- a/doc/cbs-api.txt +++ b/doc/cbs-api.txt @@ -1,13 +1,13 @@ -CbsManager hierarchy -=============== +Cell broadcast hierarchy +======================== Service org.ofono -Interface org.ofono.CbsManager +Interface org.ofono.CellBroadcast Object path [variable prefix]/{modem0,modem1,...} Methods dict GetProperties() - Returns properties for the CbsManager object. See + Returns properties for the cell broadcast object. See the properties section for available properties. Possible Errors: [service].Error.InvalidArguments diff --git a/include/dbus.h b/include/dbus.h index 5bf0505f..059232fc 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -37,7 +37,7 @@ extern "C" { #define OFONO_CALL_METER_INTERFACE "org.ofono.CallMeter" #define OFONO_CALL_SETTINGS_INTERFACE "org.ofono.CallSettings" #define OFONO_CALL_VOLUME_INTERFACE OFONO_SERVICE ".CallVolume" -#define OFONO_CBS_MANAGER_INTERFACE "org.ofono.CbsManager" +#define OFONO_CELL_BROADCAST_INTERFACE "org.ofono.CellBroadcast" #define OFONO_MESSAGE_WAITING_INTERFACE "org.ofono.MessageWaiting" #define OFONO_NETWORK_REGISTRATION_INTERFACE "org.ofono.NetworkRegistration" #define OFONO_NETWORK_OPERATOR_INTERFACE "org.ofono.NetworkOperator" @@ -129,7 +129,7 @@ static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char *message, return; }; - signal = dbus_message_new_signal(path, OFONO_CBS_MANAGER_INTERFACE, + signal = dbus_message_new_signal(path, OFONO_CELL_BROADCAST_INTERFACE, "EmergencyBroadcast"); if (!signal) @@ -163,7 +163,7 @@ static void cbs_dispatch_text(struct ofono_cbs *cbs, enum sms_class cls, DBusConnection *conn = ofono_dbus_get_connection(); const char *path = __ofono_atom_get_path(cbs->atom); - g_dbus_emit_signal(conn, path, OFONO_CBS_MANAGER_INTERFACE, + g_dbus_emit_signal(conn, path, OFONO_CELL_BROADCAST_INTERFACE, "IncomingBroadcast", DBUS_TYPE_STRING, &message, DBUS_TYPE_UINT16, &channel, @@ -347,7 +347,7 @@ static void cbs_set_topics_cb(const struct ofono_error *error, void *data) topics = cbs_topic_ranges_to_string(cbs->topics); ofono_dbus_signal_property_changed(conn, path, - OFONO_CBS_MANAGER_INTERFACE, + OFONO_CELL_BROADCAST_INTERFACE, "Topics", DBUS_TYPE_STRING, &topics); @@ -418,7 +418,7 @@ static void cbs_set_powered_cb(const struct ofono_error *error, void *data) } ofono_dbus_signal_property_changed(conn, path, - OFONO_CBS_MANAGER_INTERFACE, + OFONO_CELL_BROADCAST_INTERFACE, "Powered", DBUS_TYPE_BOOLEAN, &cbs->powered); @@ -467,7 +467,7 @@ done: } ofono_dbus_signal_property_changed(conn, path, - OFONO_CBS_MANAGER_INTERFACE, + OFONO_CELL_BROADCAST_INTERFACE, "Powered", DBUS_TYPE_BOOLEAN, &cbs->powered); @@ -529,14 +529,14 @@ static DBusMessage *cbs_set_property(DBusConnection *conn, DBusMessage *msg, return __ofono_error_invalid_args(msg); } -static GDBusMethodTable cbs_manager_methods[] = { +static GDBusMethodTable cbs_methods[] = { { "GetProperties", "", "a{sv}", cbs_get_properties }, { "SetProperty", "sv", "", cbs_set_property, G_DBUS_METHOD_FLAG_ASYNC }, { } }; -static GDBusSignalTable cbs_manager_signals[] = { +static GDBusSignalTable cbs_signals[] = { { "PropertyChanged", "sv" }, { "IncomingBroadcast", "sq" }, { "EmergencyBroadcast", "sa{sv}" }, @@ -569,8 +569,8 @@ static void cbs_unregister(struct ofono_atom *atom) struct ofono_modem *modem = __ofono_atom_get_modem(atom); const char *path = __ofono_atom_get_path(atom); - g_dbus_unregister_interface(conn, path, OFONO_CBS_MANAGER_INTERFACE); - ofono_modem_remove_interface(modem, OFONO_CBS_MANAGER_INTERFACE); + g_dbus_unregister_interface(conn, path, OFONO_CELL_BROADCAST_INTERFACE); + ofono_modem_remove_interface(modem, OFONO_CELL_BROADCAST_INTERFACE); if (cbs->topics) { g_slist_foreach(cbs->topics, (GFunc)g_free, NULL); @@ -1034,16 +1034,15 @@ void ofono_cbs_register(struct ofono_cbs *cbs) struct ofono_atom *netreg_atom; if (!g_dbus_register_interface(conn, path, - OFONO_CBS_MANAGER_INTERFACE, - cbs_manager_methods, - cbs_manager_signals, + OFONO_CELL_BROADCAST_INTERFACE, + cbs_methods, cbs_signals, NULL, cbs, NULL)) { ofono_error("Could not create %s interface", - OFONO_CBS_MANAGER_INTERFACE); + OFONO_CELL_BROADCAST_INTERFACE); return; } - ofono_modem_add_interface(modem, OFONO_CBS_MANAGER_INTERFACE); + ofono_modem_add_interface(modem, OFONO_CELL_BROADCAST_INTERFACE); sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM); diff --git a/test/enable-cbs b/test/enable-cbs index 2da57e93..67356a90 100755 --- a/test/enable-cbs +++ b/test/enable-cbs @@ -15,6 +15,6 @@ else: print "Enabling cell broadcast on modem %s..." % path cbs = dbus.Interface(bus.get_object('org.ofono', path), - 'org.ofono.CbsManager') + 'org.ofono.CellBroadcast') cbs.SetProperty("Powered", dbus.Boolean(1)) diff --git a/test/set-cbs-topics b/test/set-cbs-topics index 7cb0f46e..ff56e75d 100755 --- a/test/set-cbs-topics +++ b/test/set-cbs-topics @@ -19,6 +19,6 @@ else: print "Setting cell broadcast topics for modem %s..." % path cbs = dbus.Interface(bus.get_object('org.ofono', path), - 'org.ofono.CbsManager') + 'org.ofono.CellBroadcast') cbs.SetProperty("Topics", topics); |