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

Move radio settings interface definition to dbus.h

This commit is contained in:
Denis Kenzior 2010-03-22 15:29:03 -05:00
parent 5ab70ab5f2
commit 6425706c9d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dbus.h
View File

@ -36,6 +36,7 @@ extern "C" {
#define OFONO_CALL_FORWARDING_INTERFACE "org.ofono.CallForwarding"
#define OFONO_CALL_METER_INTERFACE "org.ofono.CallMeter"
#define OFONO_PHONEBOOK_INTERFACE "org.ofono.Phonebook"
#define OFONO_RADIO_SETTINGS_INTERFACE "org.ofono.RadioSettings"
#define OFONO_SMS_MANAGER_INTERFACE "org.ofono.SmsManager"
#define OFONO_CALL_SETTINGS_INTERFACE "org.ofono.CallSettings"
#define OFONO_VOICECALL_INTERFACE "org.ofono.VoiceCall"

14
src/radio-settings.c
View File

@ -33,8 +33,6 @@
#include "ofono.h"
#include "common.h"
#define RADIO_SETTINGS_INTERFACE "org.ofono.RadioSettings"
#define RADIO_SETTINGS_MODE_CACHED 0x1
static GSList *g_drivers = NULL;
@ -123,7 +121,7 @@ static void radio_set_rat_mode(struct ofono_radio_settings *rs,
str_mode = radio_access_mode_to_string(rs->mode);
ofono_dbus_signal_property_changed(conn, path,
RADIO_SETTINGS_INTERFACE,
OFONO_RADIO_SETTINGS_INTERFACE,
"TechnologyPreference", DBUS_TYPE_STRING,
&str_mode);
}
@ -284,8 +282,8 @@ static void radio_settings_unregister(struct ofono_atom *atom)
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(rs->atom);
ofono_modem_remove_interface(modem, RADIO_SETTINGS_INTERFACE);
g_dbus_unregister_interface(conn, path, RADIO_SETTINGS_INTERFACE);
ofono_modem_remove_interface(modem, OFONO_RADIO_SETTINGS_INTERFACE);
g_dbus_unregister_interface(conn, path, OFONO_RADIO_SETTINGS_INTERFACE);
}
static void radio_settings_remove(struct ofono_atom *atom)
@ -346,16 +344,16 @@ void ofono_radio_settings_register(struct ofono_radio_settings *rs)
const char *path = __ofono_atom_get_path(rs->atom);
if (!g_dbus_register_interface(conn, path,
RADIO_SETTINGS_INTERFACE,
OFONO_RADIO_SETTINGS_INTERFACE,
radio_methods, radio_signals,
NULL, rs, NULL)) {
ofono_error("Could not create %s interface",
RADIO_SETTINGS_INTERFACE);
OFONO_RADIO_SETTINGS_INTERFACE);
return;
}
ofono_modem_add_interface(modem, RADIO_SETTINGS_INTERFACE);
ofono_modem_add_interface(modem, OFONO_RADIO_SETTINGS_INTERFACE);
__ofono_atom_register(rs->atom, radio_settings_unregister);
}