Skip to content

backport fixes to make the modem remember the settings #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzanetti wants to merge 2 commits into
base: master
Choose a base branch
from
Open

backport fixes to make the modem remember the settings #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8113c4d
backport radio settings
mzanetti Nov 8, 2016
555057b
backport also: rilmodem: fix WCDMA only in query rat mode
mzanetti Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drivers/rilmodem/radio-settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)
*/

switch (pref) {
+ case PREF_NET_TYPE_WCDMA:
case PREF_NET_TYPE_GSM_WCDMA:
case PREF_NET_TYPE_GSM_WCDMA_AUTO:
mode = OFONO_RADIO_ACCESS_MODE_UMTS;
Expand Down
172 changes: 159 additions & 13 deletions src/radio-settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@

#include "ofono.h"
#include "common.h"
#include "storage.h"

#define SETTINGS_STORE "radiosetting"
#define SETTINGS_GROUP "Settings"
#define RADIO_SETTINGS_FLAG_CACHED 0x1

static GSList *g_drivers = NULL;
Expand All @@ -50,6 +53,8 @@ struct ofono_radio_settings {
enum ofono_radio_band_umts pending_band_umts;
ofono_bool_t fast_dormancy_pending;
uint32_t available_rats;
GKeyFile *settings;
char *imsi;
const struct ofono_radio_settings_driver *driver;
void *driver_data;
struct ofono_atom *atom;
Expand Down Expand Up @@ -306,6 +311,12 @@ static void radio_set_band(struct ofono_radio_settings *rs)
OFONO_RADIO_SETTINGS_INTERFACE,
"GsmBand", DBUS_TYPE_STRING,
&str_band);

if (rs->settings) {
g_key_file_set_integer(rs->settings, SETTINGS_GROUP,
"GsmBand", rs->band_gsm);
storage_sync(rs->imsi, SETTINGS_STORE, rs->settings);
}
}

if (rs->band_umts != rs->pending_band_umts) {
Expand All @@ -316,6 +327,13 @@ static void radio_set_band(struct ofono_radio_settings *rs)
OFONO_RADIO_SETTINGS_INTERFACE,
"UmtsBand", DBUS_TYPE_STRING,
&str_band);

if (rs->settings) {
g_key_file_set_integer(rs->settings, SETTINGS_GROUP,
"UmtsBand", rs->band_umts);
storage_sync(rs->imsi, SETTINGS_STORE, rs->settings);
}

}

}
Expand Down Expand Up @@ -363,6 +381,12 @@ void ofono_radio_settings_set_rat_mode(struct ofono_radio_settings *rs,
OFONO_RADIO_SETTINGS_INTERFACE,
"TechnologyPreference",
DBUS_TYPE_STRING, &str_mode);

if (rs->settings) {
g_key_file_set_integer(rs->settings, SETTINGS_GROUP,
"TechnologyPreference", rs->mode);
storage_sync(rs->imsi, SETTINGS_STORE, rs->settings);
}
}

static void radio_mode_set_callback(const struct ofono_error *error, void *data)
Expand Down Expand Up @@ -697,6 +721,14 @@ static void radio_settings_unregister(struct ofono_atom *atom)

ofono_modem_remove_interface(modem, OFONO_RADIO_SETTINGS_INTERFACE);
g_dbus_unregister_interface(conn, path, OFONO_RADIO_SETTINGS_INTERFACE);

if (rs->settings) {
storage_close(rs->imsi, SETTINGS_STORE, rs->settings, TRUE);

g_free(rs->imsi);
rs->imsi = NULL;
rs->settings = NULL;
}
}

static void radio_settings_remove(struct ofono_atom *atom)
Expand Down Expand Up @@ -750,24 +782,138 @@ struct ofono_radio_settings *ofono_radio_settings_create(struct ofono_modem *mod
return rs;
}

static void ofono_radio_finish_register(struct ofono_radio_settings *rs)
{
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(rs->atom);
const char *path = __ofono_atom_get_path(rs->atom);

if (!g_dbus_register_interface(conn, path,
OFONO_RADIO_SETTINGS_INTERFACE,
radio_methods, radio_signals,
NULL, rs, NULL)) {
ofono_error("Could not create %s interface",
OFONO_RADIO_SETTINGS_INTERFACE);
return;
}

ofono_modem_add_interface(modem, OFONO_RADIO_SETTINGS_INTERFACE);

__ofono_atom_register(rs->atom, radio_settings_unregister);
}

static void radio_mode_set_callback_at_reg(const struct ofono_error *error,
void *data)
{
struct ofono_radio_settings *rs = data;

if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
DBG("Error setting radio access mode register time");

/*
* Continue with atom register even if request fail at modem
*/
ofono_radio_finish_register(rs);
}

static void radio_band_set_callback_at_reg(const struct ofono_error *error,
void *data)
{
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
DBG("Error setting radio access mode register time");
/*
* Continue with atom register even if request fail at modem
* ofono_radio_finish_register called by radio_mode_set_callback_at_reg
*/
}

static void radio_load_settings(struct ofono_radio_settings *rs,
const char *imsi)
{
GError *error;

rs->settings = storage_open(imsi, SETTINGS_STORE);

/*
* If no settings present or error; Set default.
* Default RAT mode: ANY (LTE > UMTS > GSM)
*/
if (rs->settings == NULL) {
DBG("radiosetting storage open failed");
rs->mode = OFONO_RADIO_ACCESS_MODE_ANY;
rs->band_gsm = OFONO_RADIO_BAND_GSM_ANY;
rs->band_umts = OFONO_RADIO_BAND_UMTS_ANY;
return;
}

rs->imsi = g_strdup(imsi);

error = NULL;
rs->band_gsm = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
"GsmBand", &error);

if (error || radio_band_gsm_to_string(rs->band_gsm) == NULL) {
rs->band_gsm = OFONO_RADIO_BAND_GSM_ANY;
g_key_file_set_integer(rs->settings, SETTINGS_GROUP,
"GsmBand", rs->band_gsm);
}

rs->pending_band_gsm = rs->band_gsm;

error = NULL;
rs->band_umts = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
"UmtsBand", &error);

if (error || radio_band_umts_to_string(rs->band_umts) == NULL) {
rs->band_umts = OFONO_RADIO_BAND_UMTS_ANY;
g_key_file_set_integer(rs->settings, SETTINGS_GROUP,
"UmtsBand", rs->band_umts);
}

rs->pending_band_umts = rs->band_umts;

error = NULL;
rs->mode = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
"TechnologyPreference", &error);

if (error || radio_access_mode_to_string(rs->mode) == NULL) {
rs->mode = OFONO_RADIO_ACCESS_MODE_ANY;
g_key_file_set_integer(rs->settings, SETTINGS_GROUP,
"TechnologyPreference", rs->mode);
}

DBG("TechnologyPreference: %d", rs->mode);
DBG("GsmBand: %d", rs->band_gsm);
DBG("UmtsBand: %d", rs->band_umts);
}

void ofono_radio_settings_register(struct ofono_radio_settings *rs)
{
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(rs->atom);
const char *path = __ofono_atom_get_path(rs->atom);
struct ofono_modem *modem = __ofono_atom_get_modem(rs->atom);
struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);

if (!g_dbus_register_interface(conn, path,
OFONO_RADIO_SETTINGS_INTERFACE,
radio_methods, radio_signals,
NULL, rs, NULL)) {
ofono_error("Could not create %s interface",
OFONO_RADIO_SETTINGS_INTERFACE);
if (sim == NULL)
goto finish;

return;
}
radio_load_settings(rs, ofono_sim_get_imsi(sim));

if (rs->driver->set_band != NULL)
rs->driver->set_band(rs, rs->band_gsm, rs->band_umts,
radio_band_set_callback_at_reg, rs);

if (rs->driver->set_rat_mode == NULL)
goto finish;

/*
* Diff callback used. No need of using DBUS pending concept.
* As its atom registration time - no DBUS clients.
*/
rs->driver->set_rat_mode(rs, rs->mode,
radio_mode_set_callback_at_reg, rs);
return;

ofono_modem_add_interface(modem, OFONO_RADIO_SETTINGS_INTERFACE);
__ofono_atom_register(rs->atom, radio_settings_unregister);
finish:
ofono_radio_finish_register(rs);
}

void ofono_radio_settings_remove(struct ofono_radio_settings *rs)
Expand Down