6:27 p.m.
This patch series handles the multi-SIM case for HFP in the emulator,
for incoming calls. This means that calls can be accepted, rejected, and
hung from a headset with HFP support regardless of the modem in which
the call is received.
In case a call is initiated from the headset, we use the first SIM in
the list of modems with HFP atoms. In the future this should be handled
via a system setting.
The patches change the emulator interface to use the atom instead of the
emulator instance as token to identify which modem is sending an event.
The concept of preferred modem is introduced to route events between
headset and modems: there is a default modem that is used unless an
incoming call arrives in any modem, at that moment the modem with the
active call is the preferred modem until the call is over.
Finally, the patches have still some rough edges but I think it is worth
sharing to gather comments, regardless of whether this gets merged or
not.
Alfonso Sanchez-Beato (5):
include: Support for multiple SIM in emulator
emulator: Add multi-sim support
plugins: Adapt to emulator changes
examples: Adapt to emulator changes
src: Adapt to emulator changes
examples/emulator.c | 12 ++-
include/emulator.h | 11 +-
plugins/dun_gw_bluez4.c | 12 ++-
plugins/dun_gw_bluez5.c | 12 ++-
plugins/hfp_ag_bluez4.c | 12 ++-
plugins/hfp_ag_bluez5.c | 8 +-
plugins/phonesim.c | 3 +-
src/emulator.c | 266 +++++++++++++++++++++++++++++++++++++++++++-----
src/modem.c | 10 +-
src/network.c | 30 +++---
src/ofono.h | 2 +-
src/sim.c | 10 +-
src/voicecall.c | 35 +++----
13 files changed, 323 insertions(+), 100 deletions(-)
--
2.1.4
6:27 p.m.
New subject: [PATCH 1/5] include: Support for multiple SIM in emulator
Change declarations for emulator so it is possible to handle multiple
modems in the emulator.
---
include/emulator.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/emulator.h b/include/emulator.h
index 4b2bc98..1bb80e6 100644
--- a/include/emulator.h
+++ b/include/emulator.h
@@ -51,6 +51,7 @@ extern "C" {
struct ofono_emulator;
struct ofono_emulator_request;
struct ofono_handsfree_card;
+struct ofono_atom;
enum ofono_emulator_type {
OFONO_EMULATOR_TYPE_DUN,
@@ -68,7 +69,7 @@ typedef void (*ofono_emulator_request_cb_t)(struct ofono_emulator *em,
struct ofono_emulator_request *req,
void *data);
-struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
+struct ofono_emulator *ofono_emulator_create(GList *modems,
enum ofono_emulator_type type);
void ofono_emulator_register(struct ofono_emulator *em, int fd);
@@ -84,11 +85,11 @@ void ofono_emulator_send_intermediate(struct ofono_emulator *em,
void ofono_emulator_send_info(struct ofono_emulator *em, const char *line,
ofono_bool_t last);
-ofono_bool_t ofono_emulator_add_handler(struct ofono_emulator *em,
+ofono_bool_t ofono_emulator_add_handler(struct ofono_atom *atom,
const char *prefix,
ofono_emulator_request_cb_t cb,
void *data, ofono_destroy_func destroy);
-ofono_bool_t ofono_emulator_remove_handler(struct ofono_emulator *em,
+ofono_bool_t ofono_emulator_remove_handler(struct ofono_atom *atom,
const char *prefix);
ofono_bool_t ofono_emulator_request_next_string(
@@ -103,8 +104,8 @@ const char *ofono_emulator_request_get_raw(struct
ofono_emulator_request *req);
enum ofono_emulator_request_type ofono_emulator_request_get_type(
struct ofono_emulator_request *req);
-void ofono_emulator_set_indicator(struct ofono_emulator *em,
- const char *name, int value);
+void ofono_emulator_set_indicator(struct ofono_atom *atom,
+ const char *name, int value);
void ofono_emulator_set_hf_indicator_active(struct ofono_emulator *em,
int indicator,
ofono_bool_t active);
--
2.1.4
6:27 p.m.
New subject: [PATCH 2/5] emulator: Add multi-sim support
Add multi-sim support in the emulator.
---
src/emulator.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 241 insertions(+), 25 deletions(-)
diff --git a/src/emulator.c b/src/emulator.c
index ccb26dc..d194aa5 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -50,8 +50,16 @@ struct hfp_codec_info {
ofono_bool_t supported;
};
-struct ofono_emulator {
+struct atom_callback {
struct ofono_atom *atom;
+ ofono_emulator_request_cb_t cb;
+ void *data;
+ ofono_destroy_func destroy;
+};
+
+struct ofono_emulator {
+ GSList *atoms;
+ struct ofono_atom *active_atom;
enum ofono_emulator_type type;
GAtServer *server;
GAtPPP *ppp;
@@ -68,6 +76,8 @@ struct ofono_emulator {
ofono_emulator_codec_negotiation_cb codec_negotiation_cb;
void *codec_negotiation_data;
ofono_bool_t bac_received;
+ /* Table of atom_callback, using prefixes as key */
+ GHashTable *prefixes;
bool slc : 1;
unsigned int events_mode : 2;
bool events_ind : 1;
@@ -355,9 +365,14 @@ static struct indicator *find_indicator(struct ofono_emulator *em,
static struct ofono_call *find_call_with_status(struct ofono_emulator *em,
int status)
{
- struct ofono_modem *modem = __ofono_atom_get_modem(em->atom);
+ struct ofono_modem *modem;
struct ofono_voicecall *vc;
+ if (em->active_atom == NULL)
+ return NULL;
+
+ modem = __ofono_atom_get_modem(em->active_atom);
+
vc = __ofono_atom_find(OFONO_ATOM_TYPE_VOICECALL, modem);
if (vc == NULL)
return NULL;
@@ -1148,12 +1163,35 @@ static void emulator_add_indicator(struct ofono_emulator *em,
const char* name,
em->indicators = g_slist_append(em->indicators, ind);
}
+static void free_atom_callback(gpointer data)
+{
+ struct atom_callback *atom_cb = data;
+
+ if (atom_cb->destroy)
+ atom_cb->destroy(atom_cb->data);
+
+ g_free(atom_cb);
+}
+
+static void atom_cbs_destroy(gpointer key, gpointer value, gpointer user_data)
+{
+ GSList *atom_cbs = value;
+
+ g_slist_free_full(atom_cbs, free_atom_callback);
+}
+
static void emulator_unregister(struct ofono_atom *atom)
{
struct ofono_emulator *em = __ofono_atom_get_data(atom);
GSList *l;
- DBG("%p", em);
+ DBG("%p %p", em, atom);
+
+ /* Do the clean up when this is the last remaining atom */
+ if (em->atoms != NULL && em->atoms->next != NULL)
+ return;
+
+ DBG("Last atom unregistering");
if (em->callsetup_source) {
g_source_remove(em->callsetup_source);
@@ -1181,6 +1219,10 @@ static void emulator_unregister(struct ofono_atom *atom)
g_at_server_unref(em->server);
em->server = NULL;
+ g_hash_table_foreach(em->prefixes, atom_cbs_destroy, NULL);
+ g_hash_table_destroy(em->prefixes);
+ em->prefixes = NULL;
+
ofono_handsfree_card_remove(em->card);
em->card = NULL;
}
@@ -1188,6 +1230,7 @@ static void emulator_unregister(struct ofono_atom *atom)
void ofono_emulator_register(struct ofono_emulator *em, int fd)
{
GIOChannel *io;
+ GSList *l;
DBG("%p, %d", em, fd);
@@ -1240,7 +1283,11 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
g_at_server_register(em->server, "+BCS", bcs_cb, em, NULL);
}
- __ofono_atom_register(em->atom, emulator_unregister);
+ for (l = em->atoms; l; l = l->next) {
+ struct ofono_atom *atom = l->data;
+
+ __ofono_atom_register(atom, emulator_unregister);
+ }
switch (em->type) {
case OFONO_EMULATOR_TYPE_DUN:
@@ -1260,18 +1307,23 @@ static void emulator_remove(struct ofono_atom *atom)
{
struct ofono_emulator *em = __ofono_atom_get_data(atom);
- DBG("atom: %p", atom);
+ DBG("em: %p, atom: %p", em, atom);
+
+ em->atoms = g_slist_remove(em->atoms, atom);
+ if (em->atoms != NULL)
+ return;
+
+ DBG("Removing emulator");
g_free(em);
}
-struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
+struct ofono_emulator *ofono_emulator_create(GList *modems,
enum ofono_emulator_type type)
{
struct ofono_emulator *em;
enum ofono_atom_type atom_t;
-
- DBG("modem: %p, type: %d", modem, type);
+ GList *l;
if (type == OFONO_EMULATOR_TYPE_DUN)
atom_t = OFONO_ATOM_TYPE_EMULATOR_DUN;
@@ -1296,15 +1348,39 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem
*modem,
em->events_mode = 3; /* default mode is forwarding events */
em->cmee_mode = 0; /* CME ERROR disabled by default */
- em->atom = __ofono_modem_add_atom_offline(modem, atom_t,
+ em->prefixes = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
+
+ for (l = modems; l; l = l->next) {
+ struct ofono_atom *atom;
+ struct ofono_modem *modem = l->data;
+
+ DBG("modem: %p, type: %d", modem, type);
+
+ atom = __ofono_modem_add_atom_offline(modem, atom_t,
emulator_remove, em);
+ em->atoms = g_slist_prepend(em->atoms, atom);
+ }
return em;
}
+static void free_atom(gpointer data)
+{
+ struct ofono_atom *atom = data;
+
+ __ofono_atom_free(atom);
+}
+
void ofono_emulator_remove(struct ofono_emulator *em)
{
- __ofono_atom_free(em->atom);
+ /*
+ * emulator_remove removes the atom from the list and eventually removes
+ * the emulator too, so we need to make this copy for a safe removal.
+ */
+ GSList *atoms = g_slist_copy(em->atoms);
+
+ g_slist_free_full(atoms, free_atom);
}
void ofono_emulator_send_final(struct ofono_emulator *em,
@@ -1371,10 +1447,37 @@ void ofono_emulator_send_info(struct ofono_emulator *em, const
char *line,
g_at_server_send_info(em->server, line, last);
}
+static struct ofono_atom *get_preferred_atom(struct ofono_emulator *em)
+{
+ if (em->active_atom)
+ return em->active_atom;
+
+ /*
+ * TODO For the moment we just take the first on the list, we need to
+ * ask the modem and have something configurable from settings.
+ */
+ return em->atoms->data;
+}
+
+static struct atom_callback *find_atom_callback(GSList *prefix_cbs,
+ const struct ofono_atom *atom)
+{
+ GSList *l;
+
+ for (l = prefix_cbs; l; l = prefix_cbs->next) {
+ struct atom_callback *atom_cb = l->data;
+
+ if (atom_cb->atom != atom)
+ continue;
+
+ return atom_cb;
+ }
+
+ return NULL;
+}
+
struct handler {
- ofono_emulator_request_cb_t cb;
- void *data;
- ofono_destroy_func destroy;
+ char *prefix;
struct ofono_emulator *em;
};
@@ -1386,8 +1489,19 @@ struct ofono_emulator_request {
static void handler_proxy(GAtServer *server, GAtServerRequestType type,
GAtResult *result, gpointer userdata)
{
+ GSList *prefix_cbs;
+ struct atom_callback *atom_cb;
struct handler *h = userdata;
struct ofono_emulator_request req;
+ struct ofono_atom *atom;
+
+ atom = get_preferred_atom(h->em);
+ prefix_cbs = g_hash_table_lookup(h->em->prefixes, h->prefix);
+ atom_cb = find_atom_callback(prefix_cbs, atom);
+ if (atom_cb == NULL) {
+ ofono_error("%s: No atom for prefix %s", __func__, h->prefix);
+ return;
+ }
switch (type) {
case G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY:
@@ -1406,7 +1520,7 @@ static void handler_proxy(GAtServer *server, GAtServerRequestType
type,
g_at_result_iter_init(&req.iter, result);
g_at_result_iter_next(&req.iter, "");
- h->cb(h->em, &req, h->data);
+ atom_cb->cb(h->em, &req, atom_cb->data);
}
static void handler_proxy_need_slc(GAtServer *server,
@@ -1440,24 +1554,52 @@ static void handler_destroy(gpointer userdata)
{
struct handler *h = userdata;
- if (h->destroy)
- h->destroy(h->data);
-
+ g_free(h->prefix);
g_free(h);
}
-ofono_bool_t ofono_emulator_add_handler(struct ofono_emulator *em,
+ofono_bool_t ofono_emulator_add_handler(struct ofono_atom *atom,
const char *prefix,
ofono_emulator_request_cb_t cb,
void *data, ofono_destroy_func destroy)
{
struct handler *h;
+ GSList *prefix_cbs;
+ struct atom_callback *atom_cb;
GAtServerNotifyFunc func = handler_proxy;
+ struct ofono_emulator *em = __ofono_atom_get_data(atom);
+ gboolean already_registered;
+
+ DBG("%p %s cb %p", atom, prefix, cb);
+
+ prefix_cbs = g_hash_table_lookup(em->prefixes, prefix);
+ already_registered = prefix_cbs ? TRUE : FALSE;
+
+ if (find_atom_callback(prefix_cbs, atom)) {
+ ofono_info("%s: Atom %p already registered for prefix %s",
+ __func__, atom, prefix);
+ return FALSE;
+ }
+
+ atom_cb = g_malloc0(sizeof(*atom_cb));
+ atom_cb->atom = atom;
+ atom_cb->cb = cb;
+ atom_cb->data = data;
+ atom_cb->destroy = destroy;
+
+ /*
+ * Append to avoid modifying the head, which is the value in the hash
+ * table. We refresh it for the case of the first insertion though.
+ */
+ prefix_cbs = g_slist_append(prefix_cbs, atom_cb);
+
+ if (already_registered)
+ return TRUE;
+
+ g_hash_table_insert(em->prefixes, g_strdup(prefix), prefix_cbs);
h = g_new0(struct handler, 1);
- h->cb = cb;
- h->data = data;
- h->destroy = destroy;
+ h->prefix = g_strdup(prefix);
h->em = em;
if (em->type == OFONO_EMULATOR_TYPE_HFP) {
@@ -1476,9 +1618,31 @@ ofono_bool_t ofono_emulator_add_handler(struct ofono_emulator *em,
return FALSE;
}
-ofono_bool_t ofono_emulator_remove_handler(struct ofono_emulator *em,
+ofono_bool_t ofono_emulator_remove_handler(struct ofono_atom *atom,
const char *prefix)
{
+ struct ofono_emulator *em = __ofono_atom_get_data(atom);
+ GSList *prefix_cbs;
+ struct atom_callback *atom_cb;
+
+ prefix_cbs = g_hash_table_lookup(em->prefixes, prefix);
+ atom_cb = find_atom_callback(prefix_cbs, atom);
+
+ if (atom_cb == NULL)
+ return FALSE;
+
+ prefix_cbs = g_slist_remove(prefix_cbs, atom_cb);
+
+ free_atom_callback(atom_cb);
+
+ if (prefix_cbs != NULL) {
+ g_hash_table_replace(em->prefixes,
+ g_strdup(prefix), prefix_cbs);
+ return TRUE;
+ }
+
+ g_hash_table_remove(em->prefixes, prefix);
+
return g_at_server_unregister(em->server, prefix);
}
@@ -1507,8 +1671,38 @@ enum ofono_emulator_request_type ofono_emulator_request_get_type(
return req->type;
}
-void ofono_emulator_set_indicator(struct ofono_emulator *em,
- const char *name, int value)
+static gboolean valid_indication(struct ofono_emulator *em,
+ struct ofono_atom *atom, const char *name)
+{
+ struct ofono_atom *preferred;
+
+ if (g_strcmp0(name, OFONO_EMULATOR_IND_BATTERY) == 0)
+ return TRUE;
+
+ if (em->active_atom) {
+ if (em->active_atom == atom)
+ return TRUE;
+ else
+ return FALSE;
+ } else if (g_strcmp0(name, OFONO_EMULATOR_IND_CALL) == 0
+ || g_strcmp0(name, OFONO_EMULATOR_IND_CALLSETUP) == 0) {
+ return TRUE;
+ }
+
+ /* Return FALSE if the modem is not the preferred one */
+ /*
+ * TODO For the moment we just take the first on the list, we need to
+ * ask the modem and have some configurable from settings.
+ */
+ preferred = em->atoms->data;
+ if (preferred == atom)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+void ofono_emulator_set_indicator(struct ofono_atom *atom,
+ const char *name, int value)
{
int i;
char buf[20];
@@ -1518,6 +1712,12 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
gboolean call;
gboolean callsetup;
gboolean waiting;
+ struct ofono_emulator *em = __ofono_atom_get_data(atom);
+
+ if (!valid_indication(em, atom, name))
+ return;
+
+ DBG("%s\t%d", name, value);
ind = find_indicator(em, name, &i);
@@ -1533,6 +1733,18 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
call = ind == call_ind;
callsetup = ind == cs_ind;
+ if (call || callsetup) {
+ if (call_ind->value == OFONO_EMULATOR_CALL_INACTIVE
+ && cs_ind->value ==
+ OFONO_EMULATOR_CALLSETUP_INACTIVE) {
+ DBG("Call finished for HFP atom %p", atom);
+ em->active_atom = NULL;
+ } else if (em->active_atom == NULL) {
+ DBG("New call from HFP atom %p", atom);
+ em->active_atom = atom;
+ }
+ }
+
/*
* When callsetup indicator goes to Incoming and there is an active
* call a +CCWA should be sent before +CIEV
@@ -1586,12 +1798,16 @@ start_ring:
notify_ring, em);
}
-void __ofono_emulator_set_indicator_forced(struct ofono_emulator *em,
+void __ofono_emulator_set_indicator_forced(struct ofono_atom *atom,
const char *name, int value)
{
int i;
struct indicator *ind;
char buf[20];
+ struct ofono_emulator *em = __ofono_atom_get_data(atom);
+
+ if (!valid_indication(em, atom, name))
+ return;
ind = find_indicator(em, name, &i);
--
2.1.4
6:27 p.m.
New subject: [PATCH 3/5] plugins: Adapt to emulator changes
Adapt to emulator changes for supporting multiple modems.
---
plugins/dun_gw_bluez4.c | 12 +++++++++---
plugins/dun_gw_bluez5.c | 12 +++++++++---
plugins/hfp_ag_bluez4.c | 12 +++++++++---
plugins/hfp_ag_bluez5.c | 8 +-------
plugins/phonesim.c | 3 +--
5 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/plugins/dun_gw_bluez4.c b/plugins/dun_gw_bluez4.c
index a1de7a4..6034790 100644
--- a/plugins/dun_gw_bluez4.c
+++ b/plugins/dun_gw_bluez4.c
@@ -81,6 +81,7 @@ static void dun_gw_connect_cb(GIOChannel *io, GError *err, gpointer
user_data)
struct ofono_emulator *em = user_data;
struct ofono_modem *modem;
int fd;
+ GList *last;
DBG("");
@@ -90,11 +91,16 @@ static void dun_gw_connect_cb(GIOChannel *io, GError *err, gpointer
user_data)
return;
}
- /* Pick the first powered modem */
- modem = modems->data;
+ /*
+ * Pick the last one to avoid creating a new list with one modem just
+ * for the call to ofono_emulator_create() (for this plugin we only
+ * support registering one modem in the emulator)
+ */
+ last = g_list_last(modems);
+ modem = last->data;
DBG("Picked modem %p for emulator", modem);
- em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_DUN);
+ em = ofono_emulator_create(last, OFONO_EMULATOR_TYPE_DUN);
if (em == NULL) {
g_io_channel_shutdown(io, TRUE, NULL);
return;
diff --git a/plugins/dun_gw_bluez5.c b/plugins/dun_gw_bluez5.c
index faea12b..6719b27 100644
--- a/plugins/dun_gw_bluez5.c
+++ b/plugins/dun_gw_bluez5.c
@@ -57,6 +57,7 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
int fd;
struct ofono_emulator *em;
struct ofono_modem *modem;
+ GList *last;
DBG("Profile handler NewConnection");
@@ -80,7 +81,6 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
DBG("%s", device);
- /* Pick the first powered modem */
if (modems == NULL) {
close(fd);
return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE
@@ -88,10 +88,16 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
"No GPRS capable modem");
}
- modem = modems->data;
+ /*
+ * Pick the last one to avoid creating a new list with one modem just
+ * for the call to ofono_emulator_create() (for this plugin we only
+ * support registering one modem in the emulator)
+ */
+ last = g_list_last(modems);
+ modem = last->data;
DBG("Picked modem %p for emulator", modem);
- em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_DUN);
+ em = ofono_emulator_create(last, OFONO_EMULATOR_TYPE_DUN);
if (em == NULL) {
close(fd);
return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE
diff --git a/plugins/hfp_ag_bluez4.c b/plugins/hfp_ag_bluez4.c
index 039b665..69f6e7e 100644
--- a/plugins/hfp_ag_bluez4.c
+++ b/plugins/hfp_ag_bluez4.c
@@ -91,6 +91,7 @@ static void hfp_ag_connect_cb(GIOChannel *io, GError *err, gpointer
user_data)
struct ofono_modem *modem;
struct ofono_emulator *em;
int fd;
+ GList *last;
DBG("");
@@ -99,14 +100,19 @@ static void hfp_ag_connect_cb(GIOChannel *io, GError *err, gpointer
user_data)
return;
}
- /* Pick the first voicecall capable modem */
- modem = modems->data;
+ /*
+ * Pick the last one to avoid creating a new list with one modem just
+ * for the call to ofono_emulator_create() (for this plugin we only
+ * support registering one modem in the emulator)
+ */
+ last = g_list_last(modems);
+ modem = last->data;
if (modem == NULL)
return;
DBG("Picked modem %p for emulator", modem);
- em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_HFP);
+ em = ofono_emulator_create(last, OFONO_EMULATOR_TYPE_HFP);
if (em == NULL)
return;
diff --git a/plugins/hfp_ag_bluez5.c b/plugins/hfp_ag_bluez5.c
index 22faeb7..f80d1d5 100644
--- a/plugins/hfp_ag_bluez5.c
+++ b/plugins/hfp_ag_bluez5.c
@@ -172,7 +172,6 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
struct sockaddr_rc saddr;
socklen_t optlen;
struct ofono_emulator *em;
- struct ofono_modem *modem;
char local[BT_ADDR_SIZE], remote[BT_ADDR_SIZE];
struct ofono_handsfree_card *card;
int err;
@@ -202,7 +201,6 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
goto invalid;
}
- /* Pick the first voicecall capable modem */
if (modems == NULL) {
close(fd);
return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE
@@ -210,10 +208,6 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
"No voice call capable modem");
}
- modem = modems->data;
-
- DBG("Picked modem %p for emulator", modem);
-
memset(&saddr, 0, sizeof(saddr));
optlen = sizeof(saddr);
@@ -240,7 +234,7 @@ static DBusMessage *profile_new_connection(DBusConnection *conn,
bt_ba2str(&saddr.rc_bdaddr, remote);
- em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_HFP);
+ em = ofono_emulator_create(modems, OFONO_EMULATOR_TYPE_HFP);
if (em == NULL) {
close(fd);
return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 16bccd5..4290d84 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -545,13 +545,12 @@ static void crst_notify(GAtResult *result, gpointer user_data)
static void emulator_battery_cb(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
int val = 0;
if (GPOINTER_TO_INT(data) > 0)
val = (GPOINTER_TO_INT(data) - 1) / 20 + 1;
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_BATTERY, val);
+ ofono_emulator_set_indicator(atom, OFONO_EMULATOR_IND_BATTERY, val);
}
static void cbc_notify(GAtResult *result, gpointer user_data)
--
2.1.4
6:27 p.m.
New subject: [PATCH 4/5] examples: Adapt to emulator changes
Adapt to emulator changes for supporting multiple modems.
---
examples/emulator.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/examples/emulator.c b/examples/emulator.c
index 5c92bd6..63499ec 100644
--- a/examples/emulator.c
+++ b/examples/emulator.c
@@ -54,6 +54,7 @@ static gboolean on_socket_connected(GIOChannel *chan, GIOCondition
cond,
unsigned int len = sizeof(saddr);
int fd;
struct ofono_emulator *em;
+ GList *last;
struct ofono_modem *modem;
if (cond != G_IO_IN)
@@ -63,11 +64,16 @@ static gboolean on_socket_connected(GIOChannel *chan, GIOCondition
cond,
if (fd == -1)
return FALSE;
- /* Pick the first powered modem */
- modem = modems->data;
+ /*
+ * Pick the last one to avoid creating a new list with one modem just
+ * for the call to ofono_emulator_create() (in this case we only support
+ * registering one modem in the emulator)
+ */
+ last = g_list_last(modems);
+ modem = last->data;
DBG("Picked modem %p for emulator", modem);
- em = ofono_emulator_create(modem, GPOINTER_TO_INT(user));
+ em = ofono_emulator_create(last, GPOINTER_TO_INT(user));
if (em == NULL)
close(fd);
else
--
2.1.4
6:27 p.m.
New subject: [PATCH 5/5] src: Adapt to emulator changes
Adapt to emulator changes for supporting multiple modems.
---
src/modem.c | 10 ++++------
src/network.c | 30 +++++++++++++++---------------
src/ofono.h | 2 +-
src/sim.c | 10 +++-------
src/voicecall.c | 35 +++++++++++++++--------------------
5 files changed, 38 insertions(+), 49 deletions(-)
diff --git a/src/modem.c b/src/modem.c
index 01b0e35..684274b 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -1528,15 +1528,13 @@ static void gcap_cb(struct ofono_emulator *em,
static void dun_watch(struct ofono_atom *atom,
enum ofono_atom_watch_condition cond, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
-
if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED)
return;
- ofono_emulator_add_handler(em, "+GMI", gmi_cb, data, NULL);
- ofono_emulator_add_handler(em, "+GMM", gmm_cb, data, NULL);
- ofono_emulator_add_handler(em, "+GMR", gmr_cb, data, NULL);
- ofono_emulator_add_handler(em, "+GCAP", gcap_cb, data, NULL);
+ ofono_emulator_add_handler(atom, "+GMI", gmi_cb, data, NULL);
+ ofono_emulator_add_handler(atom, "+GMM", gmm_cb, data, NULL);
+ ofono_emulator_add_handler(atom, "+GMR", gmr_cb, data, NULL);
+ ofono_emulator_add_handler(atom, "+GCAP", gcap_cb, data, NULL);
}
int ofono_devinfo_driver_register(const struct ofono_devinfo_driver *d)
diff --git a/src/network.c b/src/network.c
index 1dddcac..c98ff9a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1314,20 +1314,24 @@ static void signal_strength_callback(const struct ofono_error
*error,
static void notify_emulator_status(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
-
switch (GPOINTER_TO_INT(data)) {
case NETWORK_REGISTRATION_STATUS_REGISTERED:
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_SERVICE, 1);
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_ROAMING, 0);
+ ofono_emulator_set_indicator(atom,
+ OFONO_EMULATOR_IND_SERVICE, 1);
+ ofono_emulator_set_indicator(atom,
+ OFONO_EMULATOR_IND_ROAMING, 0);
break;
case NETWORK_REGISTRATION_STATUS_ROAMING:
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_SERVICE, 1);
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_ROAMING, 1);
+ ofono_emulator_set_indicator(atom,
+ OFONO_EMULATOR_IND_SERVICE, 1);
+ ofono_emulator_set_indicator(atom,
+ OFONO_EMULATOR_IND_ROAMING, 1);
break;
default:
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_SERVICE, 0);
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_ROAMING, 0);
+ ofono_emulator_set_indicator(atom,
+ OFONO_EMULATOR_IND_SERVICE, 0);
+ ofono_emulator_set_indicator(atom,
+ OFONO_EMULATOR_IND_ROAMING, 0);
}
}
@@ -1500,13 +1504,12 @@ static void init_registration_status(const struct ofono_error
*error,
static void notify_emulator_strength(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
int val = 0;
if (GPOINTER_TO_INT(data) > 0)
val = (GPOINTER_TO_INT(data) - 1) / 20 + 1;
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_SIGNAL, val);
+ ofono_emulator_set_indicator(atom, OFONO_EMULATOR_IND_SIGNAL, val);
}
void ofono_netreg_strength_notify(struct ofono_netreg *netreg, int strength)
@@ -1745,9 +1748,7 @@ void ofono_netreg_driver_unregister(const struct ofono_netreg_driver
*d)
static void emulator_remove_handler(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
-
- ofono_emulator_remove_handler(em, data);
+ ofono_emulator_remove_handler(atom, data);
}
static void netreg_unregister(struct ofono_atom *atom)
@@ -2024,13 +2025,12 @@ fail:
static void emulator_hfp_init(struct ofono_atom *atom, void *data)
{
struct ofono_netreg *netreg = data;
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
notify_emulator_status(atom, GINT_TO_POINTER(netreg->status));
notify_emulator_strength(atom,
GINT_TO_POINTER(netreg->signal_strength));
- ofono_emulator_add_handler(em, "+COPS", emulator_cops_cb, data, NULL);
+ ofono_emulator_add_handler(atom, "+COPS", emulator_cops_cb, data, NULL);
}
static void emulator_hfp_watch(struct ofono_atom *atom,
diff --git a/src/ofono.h b/src/ofono.h
index bfcb58f..a46f458 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -512,7 +512,7 @@ enum ofono_emulator_slc_condition {
OFONO_EMULATOR_SLC_CONDITION_BIND,
};
-void __ofono_emulator_set_indicator_forced(struct ofono_emulator *em,
+void __ofono_emulator_set_indicator_forced(struct ofono_atom *atom,
const char *name, int value);
void __ofono_emulator_slc_condition(struct ofono_emulator *em,
enum ofono_emulator_slc_condition cond);
diff --git a/src/sim.c b/src/sim.c
index 7614b33..2eb524e 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2847,9 +2847,7 @@ void ofono_sim_driver_unregister(const struct ofono_sim_driver *d)
static void emulator_remove_handler(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
-
- ofono_emulator_remove_handler(em, data);
+ ofono_emulator_remove_handler(atom, data);
}
static void sim_unregister(struct ofono_atom *atom)
@@ -2973,11 +2971,9 @@ static void emulator_hfp_watch(struct ofono_atom *atom,
enum ofono_atom_watch_condition cond,
void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
-
if (cond == OFONO_ATOM_WATCH_CONDITION_REGISTERED)
- ofono_emulator_add_handler(em, "+CNUM", emulator_cnum_cb, data,
- NULL);
+ ofono_emulator_add_handler(atom, "+CNUM",
+ emulator_cnum_cb, data, NULL);
}
void ofono_sim_register(struct ofono_sim *sim)
diff --git a/src/voicecall.c b/src/voicecall.c
index b088239..1d4a3b8 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -754,36 +754,33 @@ static void emulator_set_indicator_forced(struct ofono_voicecall
*vc,
const char *name, int value)
{
struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom);
- struct ofono_emulator *em;
+ struct ofono_atom *atom;
- em = __ofono_atom_find(OFONO_ATOM_TYPE_EMULATOR_HFP, modem);
- if (em)
- __ofono_emulator_set_indicator_forced(em, name, value);
+ atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP);
+ if (atom)
+ __ofono_emulator_set_indicator_forced(atom, name, value);
}
static void emulator_call_status_cb(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
struct emulator_status *s = data;
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_CALL, s->status);
+ ofono_emulator_set_indicator(atom, OFONO_EMULATOR_IND_CALL, s->status);
}
static void emulator_callsetup_status_cb(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
struct emulator_status *s = data;
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_CALLSETUP,
+ ofono_emulator_set_indicator(atom, OFONO_EMULATOR_IND_CALLSETUP,
s->status);
}
static void emulator_callheld_status_cb(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
struct emulator_status *s = data;
- ofono_emulator_set_indicator(em, OFONO_EMULATOR_IND_CALLHELD,
+ ofono_emulator_set_indicator(atom, OFONO_EMULATOR_IND_CALLHELD,
s->status);
}
@@ -2655,9 +2652,7 @@ void ofono_voicecall_driver_unregister(const struct
ofono_voicecall_driver *d)
static void emulator_remove_handler(struct ofono_atom *atom, void *data)
{
- struct ofono_emulator *em = __ofono_atom_get_data(atom);
-
- ofono_emulator_remove_handler(em, data);
+ ofono_emulator_remove_handler(atom, data);
}
static void emulator_hfp_unregister(struct ofono_atom *atom)
@@ -3541,13 +3536,13 @@ static void emulator_hfp_watch(struct ofono_atom *atom,
notify_emulator_call_status(vc);
- ofono_emulator_add_handler(em, "A", emulator_ata_cb, vc, NULL);
- ofono_emulator_add_handler(em, "+CHUP", emulator_chup_cb, vc, NULL);
- ofono_emulator_add_handler(em, "+CLCC", emulator_clcc_cb, vc, NULL);
- ofono_emulator_add_handler(em, "+CHLD", emulator_chld_cb, vc, NULL);
- ofono_emulator_add_handler(em, "+VTS", emulator_vts_cb, vc, NULL);
- ofono_emulator_add_handler(em, "D", emulator_atd_cb, vc, NULL);
- ofono_emulator_add_handler(em, "+BLDN", emulator_bldn_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "A", emulator_ata_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "+CHUP", emulator_chup_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "+CLCC", emulator_clcc_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "+CHLD", emulator_chld_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "+VTS", emulator_vts_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "D", emulator_atd_cb, vc, NULL);
+ ofono_emulator_add_handler(atom, "+BLDN", emulator_bldn_cb, vc, NULL);
}
void ofono_voicecall_register(struct ofono_voicecall *vc)
--
2.1.4
1905
days inactive
1905
days old
5 comments
1 participants
participants (1)
-
Alfonso Sanchez-Beato