December 2015 - ofono

[PATCH] plugins: add upower battery monitor for bluetooth

by Tony Espy

--- plugins/upower.c | 476 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 476 insertions(+) create mode 100644 plugins/upower.c diff --git a/plugins/upower.c b/plugins/upower.c new file mode 100644 index 0000000..8babc2a --- /dev/null +++ b/plugins/upower.c @@ -0,0 +1,476 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2015 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <glib.h> +#include <gdbus.h> +#include <ofono.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/modem.h> +#include <ofono/log.h> +#include <ofono/emulator.h> + +#define DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" +#define UPOWER_SERVICE "org.freedesktop.UPower" +#define UPOWER_PATH "/org/freedesktop/UPower" +#define UPOWER_INTERFACE UPOWER_SERVICE +#define UPOWER_DEVICE_INTERFACE UPOWER_SERVICE ".Device" + +static guint modem_watch; +static guint upower_battery_watch; +static guint upower_daemon_watch; +static DBusConnection *connection; +static GHashTable *modem_hfp_watches; +static GList *modems; +static int last_battery_level; +static char *battery_device_path; + +static void emulator_battery_cb(struct ofono_atom *atom, void *data) +{ + struct ofono_emulator *em = __ofono_atom_get_data(atom); + int val = GPOINTER_TO_INT(data); + + DBG("calling set_indicator: %d", val); + ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_BATTERY, (int) val); +} + +static void update_battery_level(double percentage_val) +{ + GList *list; + int battery_level; + + if (percentage_val <= 1.00) { + battery_level = 0; + } else if (percentage_val > 1.00 && percentage_val <= 100.00) { + battery_level = ((int) percentage_val - 1) / 20 + 1; + } else { + ofono_error("%s: Invalid value for battery level: %f", + __func__, + percentage_val); + goto done; + } + + DBG("last_battery_level: %d battery_level: %d", last_battery_level, + battery_level); + + if (last_battery_level == battery_level) + goto done; + + last_battery_level = battery_level; + + for (list = modems; list; list = list->next) { + struct ofono_modem *modem = list->data; + + __ofono_modem_foreach_registered_atom(modem, + OFONO_ATOM_TYPE_EMULATOR_HFP, + emulator_battery_cb, + GINT_TO_POINTER(battery_level)); + } +done: + ; +} + +static gboolean battery_props_changed(DBusConnection *conn, DBusMessage *msg, + void *user_data) + +{ + const char *iface; + DBusMessageIter iter, dict; + double percentage_val; + gboolean percentage_found = FALSE; + gboolean retval = FALSE; + + DBG(""); + + dbus_message_iter_init(msg, &iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) { + ofono_error("%s: iface != TYPE_STRING!", __func__); + goto done; + } + + dbus_message_iter_get_basic(&iter, &iface); + + if (g_str_equal(iface, UPOWER_DEVICE_INTERFACE) != TRUE) { + ofono_error("%s: wrong iface: %s!", __func__, iface); + goto done; + } + + if (!dbus_message_iter_next(&iter)) { + ofono_error("%s: advance iter failed!", __func__); + goto done; + } + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) { + ofono_error("%s: type != ARRAY!", __func__); + goto done; + } + + dbus_message_iter_recurse(&iter, &dict); + + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry, val; + const char *key; + + dbus_message_iter_recurse(&dict, &entry); + + if (dbus_message_iter_get_arg_type(&entry) != + DBUS_TYPE_STRING) { + ofono_error("%s: key type != STRING!", __func__); + goto done; + } + + dbus_message_iter_get_basic(&entry, &key); + + if (g_str_equal(key, "Percentage") != TRUE) { + dbus_message_iter_next(&dict); + continue; + } + + dbus_message_iter_next(&entry); + if (dbus_message_iter_get_arg_type(&entry) != + DBUS_TYPE_VARIANT) { + ofono_error("%s: 'Percentage' val != VARIANT", + __func__); + goto done; + } + + dbus_message_iter_recurse(&entry, &val); + + if (dbus_message_iter_get_arg_type(&val) != DBUS_TYPE_DOUBLE) { + ofono_error("%s: 'Percentage' val != DOUBLE", __func__); + goto done; + } + + dbus_message_iter_get_basic(&val, &percentage_val); + percentage_found = TRUE; + break; + } + + /* No errors found during parsing, so don't trigger cb removal */ + retval = TRUE; + + if (percentage_found == FALSE) + goto done; + + update_battery_level(percentage_val); + +done: + return retval; +} + +static void get_property_reply(DBusPendingCall *call, void *user_data) +{ + double percentage_val; + DBusMessageIter iter, val; + DBusMessage *reply; + + DBG(""); + + reply = dbus_pending_call_steal_reply(call); + if (reply == NULL) { + ofono_error("%s: dbus_message_new_method failed", __func__); + goto done; + } + + if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { + ofono_error("%s: ERROR reply to Get('Percentage')", __func__); + goto done; + } + + if (dbus_message_iter_init(reply, &iter) == FALSE) { + ofono_error("%s: error initializing array iter", __func__); + goto done; + } + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) { + ofono_error("%s: type != VARIANT!", __func__); + goto done; + } + + dbus_message_iter_recurse(&iter, &val); + + if (dbus_message_iter_get_arg_type(&val) != DBUS_TYPE_DOUBLE) { + ofono_error("%s: type != DOUBLE!", __func__); + goto done; + } + + dbus_message_iter_get_basic(&val, &percentage_val); + + update_battery_level(percentage_val); + +done: + if (reply) + dbus_message_unref(reply); + + dbus_pending_call_unref(call); +} + +static void emulator_hfp_watch(struct ofono_atom *atom, + enum ofono_atom_watch_condition cond, + void *data) +{ + struct ofono_modem *modem = data; + DBusMessageIter iter; + DBusPendingCall *call; + DBusMessage *msg; + const char *iface = UPOWER_DEVICE_INTERFACE; + const char *property = "Percentage"; + + if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) { + DBG("UNREGISTERED"); + + modems = g_list_remove(modems, modem); + if (modems != NULL) + return; + + if (upower_battery_watch) { + g_dbus_remove_watch(connection, upower_battery_watch); + upower_battery_watch = 0; + } + + return; + } + + DBG("REGISTERED"); + + /* TODO: handle removable batteries */ + + modems = g_list_append(modems, modem); + + if (modems->next != NULL) + return; + + upower_battery_watch = g_dbus_add_signal_watch(connection, + UPOWER_SERVICE, + battery_device_path, + DBUS_INTERFACE_PROPERTIES, + "PropertiesChanged", + battery_props_changed, + NULL, NULL); + + /* Query current battery value */ + msg = dbus_message_new_method_call(UPOWER_SERVICE, battery_device_path, + DBUS_PROPERTIES_INTERFACE, + "Get"); + if (msg == NULL) { + ofono_error("%s: dbus_message_new_method failed", __func__); + return; + } + + dbus_message_iter_init_append(msg, &iter); + dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &iface); + dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &property); + + if (!dbus_connection_send_with_reply(connection, msg, &call, -1)) { + ofono_error("%s: Sending EnumerateDevices failed", __func__); + goto done; + } + + dbus_pending_call_set_notify(call, get_property_reply, NULL, NULL); +done: + dbus_message_unref(msg); +} + +static void modemwatch(struct ofono_modem *modem, gboolean added, void *user) +{ + + const char *path = ofono_modem_get_path(modem); + + DBG("modem: %s, added: %d", path, added); + + if (added) { + guint watch_id; + + watch_id = __ofono_modem_add_atom_watch(modem, + OFONO_ATOM_TYPE_EMULATOR_HFP, + emulator_hfp_watch, modem, NULL); + + g_hash_table_insert(modem_hfp_watches, g_strdup(path), + GINT_TO_POINTER(watch_id)); + + } else { + guint *watch_id = g_hash_table_lookup(modem_hfp_watches, path); + + if (watch_id != NULL) { + __ofono_modem_remove_atom_watch(modem, *watch_id); + g_hash_table_remove(modem_hfp_watches, path); + } + } +} + +static void call_modemwatch(struct ofono_modem *modem, void *user) +{ + modemwatch(modem, TRUE, user); +} + +static gboolean parse_devices_reply(DBusMessage *reply) +{ + DBusMessageIter array, iter; + const char *path; + + DBG(""); + + if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { + ofono_error("%s: ERROR reply to EnumerateDevices", __func__); + return FALSE; + } + + if (dbus_message_iter_init(reply, &array) == FALSE) { + ofono_error("%s: error initializing array iter", __func__); + return FALSE; + } + + if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY) { + ofono_error("%s: type != ARRAY!", __func__); + return FALSE; + } + + dbus_message_iter_recurse(&array, &iter); + + while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_OBJECT_PATH) { + + dbus_message_iter_get_basic(&iter, &path); + + if (g_strrstr(path, "/battery_")) { + ofono_info("%s: found 1st battery device: %s", __func__, + path); + battery_device_path = g_strdup(path); + break; + } + + if (!dbus_message_iter_next(&iter)) + break; + } + + return TRUE; +} + +static void enum_devices_reply(DBusPendingCall *call, void *user_data) +{ + DBusMessage *reply; + + DBG(""); + + reply = dbus_pending_call_steal_reply(call); + if (reply == NULL) { + ofono_error("%s: dbus_message_new_method failed", __func__); + goto done; + } + + if (parse_devices_reply(reply) == FALSE) + goto done; + + DBG("parse_devices_reply OK"); + + if (battery_device_path == NULL) { + ofono_error("%s: no battery detected", __func__); + goto done; + } + + modem_watch = __ofono_modemwatch_add(modemwatch, NULL, NULL); + __ofono_modem_foreach(call_modemwatch, NULL); +done: + if (reply) + dbus_message_unref(reply); + + dbus_pending_call_unref(call); +} + +static void upower_connect(DBusConnection *conn, void *user_data) +{ + DBusPendingCall *call; + DBusMessage *msg; + + DBG("upower connect"); + + msg = dbus_message_new_method_call(UPOWER_SERVICE, + UPOWER_PATH, + UPOWER_INTERFACE, + "EnumerateDevices"); + if (msg == NULL) { + ofono_error("%s: dbus_message_new_method failed", __func__); + return; + } + + if (!dbus_connection_send_with_reply(conn, msg, &call, -1)) { + ofono_error("%s: Sending EnumerateDevices failed", __func__); + goto done; + } + + dbus_pending_call_set_notify(call, enum_devices_reply, NULL, NULL); +done: + dbus_message_unref(msg); +} + +static void upower_disconnect(DBusConnection *conn, void *user_data) +{ + DBG("upower disconnect"); + + if (modem_watch) { + __ofono_modemwatch_remove(modem_watch); + modem_watch = 0; + } + + if (battery_device_path) { + g_free(battery_device_path); + battery_device_path = NULL; + } +} + +static int upower_init(void) +{ + DBG("upower init"); + + connection = ofono_dbus_get_connection(); + upower_daemon_watch = g_dbus_add_service_watch(connection, + UPOWER_SERVICE, + upower_connect, + upower_disconnect, + NULL, NULL); + + modem_hfp_watches = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, NULL); + + return 0; +} + +static void upower_exit(void) +{ + if (upower_daemon_watch) + g_dbus_remove_watch(connection, upower_daemon_watch); + + if (modem_watch) + __ofono_modemwatch_remove(modem_watch); + + if (battery_device_path) + g_free(battery_device_path); + + g_hash_table_destroy(modem_hfp_watches); +} + +OFONO_PLUGIN_DEFINE(upower, "upower battery monitor", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, upower_init, upower_exit) -- 2.1.4

6 years, 8 months

2
1
0 / 0

ofonod is removing the ppp0 interface on HE910

by Kallumari Nagaraja Rao, RammohanX

Hello All, After the boot, the ppp0 interface becomes active and no idea what reason the interface is getting removed. I could see the following set of activities, Dec 9 15:25:52 WR-IntelligentDevice ofonod[2439]: drivers/atmodem/gprs-context.c:cgev_notify() cid 1 Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: src/rtnl.c:rtnl_message() buf 0xbfacc4b0 len 988 Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: src/rtnl.c:rtnl_message() NEWLINK len 988 type 16 flags 0x0000 seq 0 pid 0 Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: src/ipconfig.c:__connman_ipconfig_newlink() index 8 Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: ppp0 {RX} 28 packets 2847 bytes Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: ppp0 {TX} 35 packets 2150 bytes Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: src/ipconfig.c:update_stats() service 0x8126db8 Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: src/service.c:stats_update() service 0x8126db8 Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: ppp0 {update} flags 4240 <DOWN> Dec 9 15:25:52 WR-IntelligentDevice connmand[1820]: src/service.c:service_lower_down() ppp0 lower down cgev_notify prints 1, no idea what this means. Attached if the syslog for more reference. Please respond. Regards, Ram.

6 years, 8 months

1
0
0 / 0

[PATCH] rilmodem: fix sim_status_cb debug logging

by Tony Espy

During the re-factoring of rilmodem's sim atom messaging code, the sim_status_cb function's RIL tracing code was converted to DBG calls. This change adds the same prefix to DBG/trace calls when a single message's parameters span more than one DBG call. This makes it easier to filter out trace messages when looking at a log file. --- drivers/rilmodem/sim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/rilmodem/sim.c b/drivers/rilmodem/sim.c index ada7c20..5307d67 100644 --- a/drivers/rilmodem/sim.c +++ b/drivers/rilmodem/sim.c @@ -777,9 +777,11 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data) message->serial_no, "RIL_REQUEST_GET_SIM_STATUS"); - DBG("card_state=%d,universal_pin_state=%d," + DBG("[%d,%04d]< card_state=%d,universal_pin_state=%d," "gsm_umts_index=%d,cdma_index=%d,ims_index=%d," "num_apps=%d", + g_ril_get_slot(sd->ril), + message->serial_no, card_state, universal_pin_state, gsm_umts_app_index, cdma_app_index, ims_app_index, num_apps); @@ -886,7 +888,8 @@ static void sim_status_cb(struct ril_msg *message, gpointer user_data) g_free(sd->aid_str); sd->aid_str = parcel_r_string(&rilp); /* AID */ - DBG("app_type: %d, passwd_state: %d, aid_str (AID): %s", + DBG("[%d,%04d]< app_type: %d, passwd_state: %d, aid_str (AID): %s", + g_ril_get_slot(sd->ril), message->serial_no, sd->app_type, sd->passwd_state, sd->aid_str); /* -- 2.1.4

6 years, 8 months

2
1
0 / 0

[PATCH 0/2] Fix rilmodem SMSC quoting

by Tony Espy

This changeset fixes the string formatting of the RIL_REQUEST_SET_SMSC_ADDRESS request, which requires the string to bracketed by quotation marks. Tony Espy (2): rilmodem: restore SET_SMSC_ADDRESS number format unit: update test-rilmodem-sms set_sca test case drivers/rilmodem/sms.c | 4 +++- unit/test-rilmodem-sms.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) -- 2.1.4

6 years, 8 months

2
3
0 / 0

U-Blox modem sends unprintable chars before "AT+CGMS=<seq>" reply: ofono (1.16) close the serial port ?

by Fabio

Hello, I'm using ofono 1.16 with some patch to add sms manager to the Ublox driver. Someone could confirm that ofono close the serial port when it receives some unexpected/unprintable character before the "AT+CGMS=<seq>" reply from the modem? If yes, is possible to discard these characters instead of hanging-up the serial port? Could I have some info about the source I have to patch ? Thanks in advance, FabioT -- **************************************************************************************************************************** "Solo due cose sono infinite: l'universo e la stupidità umana. Ma della prima non sono sicuro". [Albert Einstein] ****************************************************************************************************************************

6 years, 8 months

2
2
0 / 0

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

ofono December 2015