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

Move CALL_METER_INTERFACE define to dbus.h

This commit is contained in:
Denis Kenzior 2009-08-14 16:06:34 -05:00
parent f82b9a32fd
commit b82042c5e9
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dbus.h
View File

@ -34,7 +34,7 @@ extern "C" {
#define OFONO_MODEM_INTERFACE "org.ofono.Modem" #define OFONO_MODEM_INTERFACE "org.ofono.Modem"
#define OFONO_CALL_BARRING_INTERFACE "org.ofono.CallBarring" #define OFONO_CALL_BARRING_INTERFACE "org.ofono.CallBarring"
#define OFONO_CALL_FORWARDING_INTERFACE "org.ofono.CallForwarding" #define OFONO_CALL_FORWARDING_INTERFACE "org.ofono.CallForwarding"
#define OFONO_CALL_METER_INTERFACE "org.ofono.CallMeter"
/* Essentially a{sv} */ /* Essentially a{sv} */
#define OFONO_PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \ #define OFONO_PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \

31
src/call-meter.c
View File

@ -36,8 +36,6 @@
#include "driver.h" #include "driver.h"
#include "common.h" #include "common.h"
#define CALL_METER_INTERFACE "org.ofono.CallMeter"
#define CALL_METER_FLAG_CACHED 0x1 #define CALL_METER_FLAG_CACHED 0x1
#define CALL_METER_FLAG_HAVE_PUCT 0x2 #define CALL_METER_FLAG_HAVE_PUCT 0x2
@ -69,7 +67,8 @@ static void set_call_meter(struct ofono_call_meter *cm, int value)
conn = ofono_dbus_get_connection(); conn = ofono_dbus_get_connection();
path = __ofono_atom_get_path(cm->atom); path = __ofono_atom_get_path(cm->atom);
ofono_dbus_signal_property_changed(conn, path, CALL_METER_INTERFACE, ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_METER_INTERFACE,
"CallMeter", DBUS_TYPE_UINT32, "CallMeter", DBUS_TYPE_UINT32,
&cm->call_meter); &cm->call_meter);
} }
@ -87,7 +86,8 @@ static void set_acm(struct ofono_call_meter *cm, int value)
conn = ofono_dbus_get_connection(); conn = ofono_dbus_get_connection();
path = __ofono_atom_get_path(cm->atom); path = __ofono_atom_get_path(cm->atom);
ofono_dbus_signal_property_changed(conn, path, CALL_METER_INTERFACE, ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_METER_INTERFACE,
"AccumulatedCallMeter", "AccumulatedCallMeter",
DBUS_TYPE_UINT32, &cm->acm); DBUS_TYPE_UINT32, &cm->acm);
} }
@ -105,7 +105,8 @@ static void set_acm_max(struct ofono_call_meter *cm, int value)
conn = ofono_dbus_get_connection(); conn = ofono_dbus_get_connection();
path = __ofono_atom_get_path(cm->atom); path = __ofono_atom_get_path(cm->atom);
ofono_dbus_signal_property_changed(conn, path, CALL_METER_INTERFACE, ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_METER_INTERFACE,
"AccumulatedCallMeterMaximum", "AccumulatedCallMeterMaximum",
DBUS_TYPE_UINT32, &cm->acm_max); DBUS_TYPE_UINT32, &cm->acm_max);
} }
@ -123,7 +124,8 @@ static void set_ppu(struct ofono_call_meter *cm, double value)
conn = ofono_dbus_get_connection(); conn = ofono_dbus_get_connection();
path = __ofono_atom_get_path(cm->atom); path = __ofono_atom_get_path(cm->atom);
ofono_dbus_signal_property_changed(conn, path, CALL_METER_INTERFACE, ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_METER_INTERFACE,
"PricePerUnit", "PricePerUnit",
DBUS_TYPE_DOUBLE, &cm->ppu); DBUS_TYPE_DOUBLE, &cm->ppu);
} }
@ -149,7 +151,8 @@ static void set_currency(struct ofono_call_meter *cm, const char *value)
path = __ofono_atom_get_path(cm->atom); path = __ofono_atom_get_path(cm->atom);
dbusval = cm->currency; dbusval = cm->currency;
ofono_dbus_signal_property_changed(conn, path, CALL_METER_INTERFACE, ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_METER_INTERFACE,
"Currency", DBUS_TYPE_STRING, "Currency", DBUS_TYPE_STRING,
&dbusval); &dbusval);
} }
@ -658,11 +661,11 @@ void ofono_call_meter_maximum_notify(struct ofono_call_meter *cm)
DBusMessage *signal; DBusMessage *signal;
const char *path = __ofono_atom_get_path(cm->atom); const char *path = __ofono_atom_get_path(cm->atom);
signal = dbus_message_new_signal(path, CALL_METER_INTERFACE, signal = dbus_message_new_signal(path, OFONO_CALL_METER_INTERFACE,
"NearMaximumWarning"); "NearMaximumWarning");
if (!signal) { if (!signal) {
ofono_error("Unable to allocate new %s.NearMaximumWarning " ofono_error("Unable to allocate new %s.NearMaximumWarning "
"signal", CALL_METER_INTERFACE); "signal", OFONO_CALL_METER_INTERFACE);
return; return;
} }
@ -695,8 +698,8 @@ static void call_meter_unregister(struct ofono_atom *atom)
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(cm->atom); struct ofono_modem *modem = __ofono_atom_get_modem(cm->atom);
ofono_modem_remove_interface(modem, CALL_METER_INTERFACE); ofono_modem_remove_interface(modem, OFONO_CALL_METER_INTERFACE);
g_dbus_unregister_interface(conn, path, CALL_METER_INTERFACE); g_dbus_unregister_interface(conn, path, OFONO_CALL_METER_INTERFACE);
} }
static void call_meter_remove(struct ofono_atom *atom) static void call_meter_remove(struct ofono_atom *atom)
@ -756,16 +759,16 @@ void ofono_call_meter_register(struct ofono_call_meter *cm)
const char *path = __ofono_atom_get_path(cm->atom); const char *path = __ofono_atom_get_path(cm->atom);
struct ofono_modem *modem = __ofono_atom_get_modem(cm->atom); struct ofono_modem *modem = __ofono_atom_get_modem(cm->atom);
if (!g_dbus_register_interface(conn, path, CALL_METER_INTERFACE, if (!g_dbus_register_interface(conn, path, OFONO_CALL_METER_INTERFACE,
cm_methods, cm_signals, NULL, cm, cm_methods, cm_signals, NULL, cm,
NULL)) { NULL)) {
ofono_error("Could not create %s interface", ofono_error("Could not create %s interface",
CALL_METER_INTERFACE); OFONO_CALL_METER_INTERFACE);
return; return;
} }
ofono_modem_add_interface(modem, CALL_METER_INTERFACE); ofono_modem_add_interface(modem, OFONO_CALL_METER_INTERFACE);
__ofono_atom_register(cm->atom, call_meter_unregister); __ofono_atom_register(cm->atom, call_meter_unregister);
} }