ubports-cn/ofono
1
0
Fork 0
forked from sailfishos/ofono
Code Issues Pull Requests Projects Releases Wiki Activity

[ril] Some events triggering caps switch, were missed. Fixes JB#41583

Browse Source 
As a result, the data slot could be left with GSM caps and the other
slot (possibly empty) would keep enjoying LTE caps which it doesn't
really need.
This commit is contained in:
Slava Monich
2018-04-18 18:16:35 +03:00
parent 60193032f5
commit 598acaa1a8
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ofono/drivers/ril/ril_network.c
View File

@@ -47,6 +47,12 @@ enum ril_network_radio_event {
RADIO_EVENT_COUNT
};
enum ril_network_sim_events {
SIM_EVENT_STATUS_CHANGED,
SIM_EVENT_IO_ACTIVE_CHANGED,
SIM_EVENT_COUNT
};
enum ril_network_unsol_event {
UNSOL_EVENT_NETWORK_STATE,
UNSOL_EVENT_RADIO_CAPABILITY,
@@ -57,7 +63,7 @@ struct ril_network_priv {
GRilIoChannel *io;
GRilIoQueue *q;
struct ril_radio *radio;
struct ril_sim_card *sim_card;
struct ril_sim_card *simcard;
int rat;
char *log_prefix;
guint operator_poll_id;
@@ -68,8 +74,8 @@ struct ril_network_priv {
gulong set_rat_id;
gulong unsol_event_id[UNSOL_EVENT_COUNT];
gulong settings_event_id;
gulong sim_status_event_id;
gulong radio_event_id[RADIO_EVENT_COUNT];
gulong simcard_event_id[SIM_EVENT_COUNT];
struct ofono_network_operator operator;
gboolean assert_rat;
};
@@ -497,7 +503,12 @@ static gboolean ril_network_can_set_pref_mode(struct ril_network *self)
{
struct ril_network_priv *priv = self->priv;
return priv->radio->online && ril_sim_card_ready(priv->sim_card);
/*
* With some modems an attempt to set rat significantly slows
* down SIM I/O, let's avoid that.
*/
return priv->radio->online && ril_sim_card_ready(priv->simcard) &&
!priv->simcard->sim_io_active;
}
static gboolean ril_network_set_rat_holdoff_cb(gpointer user_data)
@@ -826,7 +837,7 @@ static void ril_network_sim_status_changed_cb(struct ril_sim_card *sc,
struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
const char *log_prefix, struct ril_radio *radio,
struct ril_sim_card *sim_card,
struct ril_sim_card *simcard,
struct ril_sim_settings *settings)
{
struct ril_network *self = g_object_new(RIL_NETWORK_TYPE, NULL);
@@ -836,7 +847,7 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
priv->io = grilio_channel_ref(io);
priv->q = grilio_queue_new(priv->io);
priv->radio = ril_radio_ref(radio);
priv->sim_card = ril_sim_card_ref(sim_card);
priv->simcard = ril_sim_card_ref(simcard);
priv->log_prefix = (log_prefix && log_prefix[0]) ?
g_strconcat(log_prefix, " ", NULL) : g_strdup("");
DBG_(self, "");
@@ -854,13 +865,15 @@ struct ril_network *ril_network_new(const char *path, GRilIoChannel *io,
priv->radio_event_id[RADIO_EVENT_ONLINE_CHANGED] =
ril_radio_add_online_changed_handler(priv->radio,
ril_network_radio_online_cb, self);
priv->simcard_event_id[SIM_EVENT_STATUS_CHANGED] =
ril_sim_card_add_status_changed_handler(priv->simcard,
ril_network_sim_status_changed_cb, self);
priv->simcard_event_id[SIM_EVENT_IO_ACTIVE_CHANGED] =
ril_sim_card_add_sim_io_active_changed_handler(priv->simcard,
ril_network_sim_status_changed_cb, self);
priv->settings_event_id =
ril_sim_settings_add_pref_mode_changed_handler(settings,
ril_network_pref_mode_changed_cb, self);
priv->sim_status_event_id =
ril_sim_card_add_status_changed_handler(priv->sim_card,
ril_network_sim_status_changed_cb, self);
/*
* Query the initial state. Querying network state before the radio
* has been turned on makes RIL unhappy.
@@ -916,16 +929,13 @@ static void ril_network_finalize(GObject *object)
}
grilio_queue_cancel_all(priv->q, FALSE);
grilio_channel_remove_handlers(priv->io, priv->unsol_event_id,
G_N_ELEMENTS(priv->unsol_event_id));
grilio_channel_remove_all_handlers(priv->io, priv->unsol_event_id);
grilio_channel_unref(priv->io);
grilio_queue_unref(priv->q);
ril_radio_remove_all_handlers(priv->radio, priv->radio_event_id);
ril_radio_unref(priv->radio);
ril_sim_card_remove_handler(priv->sim_card,
priv->sim_status_event_id);
ril_sim_card_unref(priv->sim_card);
ril_sim_card_remove_all_handlers(priv->simcard, priv->simcard_event_id);
ril_sim_card_unref(priv->simcard);
ril_sim_settings_remove_handler(self->settings,
priv->settings_event_id);
ril_sim_settings_unref(self->settings);

7
ofono/drivers/ril/ril_radio_caps.c
View File

@@ -1,7 +1,7 @@
/*
* oFono - Open Source Telephony - RIL-based devices
*
* Copyright (C) 2017 Jolla Ltd.
* Copyright (C) 2017-2018 Jolla 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
@@ -471,13 +471,16 @@ struct ril_radio_caps *ril_radio_caps_new(struct ril_radio_caps_manager *mgr,
self->simcard_event_id[SIM_EVENT_STATE_CHANGED] =
ril_sim_card_add_state_changed_handler(sim,
ril_radio_caps_simcard_event, self);
self->simcard_event_id[SIM_EVENT_IO_ACTIVE_CHANGED] =
ril_sim_card_add_sim_io_active_changed_handler(sim,
ril_radio_caps_simcard_event, self);
self->network = ril_network_ref(net);
self->settings_event_id[SETTINGS_EVENT_PREF_MODE] =
ril_sim_settings_add_pref_mode_changed_handler(
settings, ril_radio_caps_settings_event, self);
self->settings_event_id[SETTINGS_EVENT_IMSI] =
ril_sim_settings_add_pref_mode_changed_handler(
ril_sim_settings_add_imsi_changed_handler(
settings, ril_radio_caps_settings_event, self);
self->max_pref_mode_event_id =

3
ofono/drivers/ril/ril_sim_card.h
View File

@@ -81,6 +81,9 @@ static inline enum ril_app_type
ril_sim_card_app_type(struct ril_sim_card *sc)
{ return (sc && sc->app) ? sc->app->app_type : RIL_APPTYPE_UNKNOWN; }
#define ril_sim_card_remove_all_handlers(net, ids) \
ril_sim_card_remove_handlers(net, ids, G_N_ELEMENTS(ids))
#endif /* RIL_SIM_CARD_H */
/*