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

rilmodem: Get rid of ril_radio_settings_driver_data

This commit is contained in:
Denis Kenzior 2015-11-05 20:56:13 -06:00
parent b7af1278cb
commit 8a01d8aced
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/rilmodem/radio-settings.c
View File

@ -47,7 +47,6 @@
struct radio_data { struct radio_data {
GRil *ril; GRil *ril;
struct ofono_modem *modem;
gboolean fast_dormancy; gboolean fast_dormancy;
gboolean pending_fd; gboolean pending_fd;
}; };
@ -221,12 +220,12 @@ static ofono_bool_t query_available_rats_cb(gpointer user_data)
struct cb_data *cbd = user_data; struct cb_data *cbd = user_data;
ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb; ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb;
struct ofono_radio_settings *rs = cbd->user; struct ofono_radio_settings *rs = cbd->user;
struct radio_data *rd = ofono_radio_settings_get_data(rs); struct ofono_modem *modem = ofono_radio_settings_get_modem(rs);
available_rats = OFONO_RADIO_ACCESS_MODE_GSM available_rats = OFONO_RADIO_ACCESS_MODE_GSM
| OFONO_RADIO_ACCESS_MODE_UMTS; | OFONO_RADIO_ACCESS_MODE_UMTS;
if (ofono_modem_get_boolean(rd->modem, MODEM_PROP_LTE_CAPABLE)) if (ofono_modem_get_boolean(modem, MODEM_PROP_LTE_CAPABLE))
available_rats |= OFONO_RADIO_ACCESS_MODE_LTE; available_rats |= OFONO_RADIO_ACCESS_MODE_LTE;
CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data); CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data);
@ -259,11 +258,10 @@ static void ril_delayed_register(const struct ofono_error *error,
static int ril_radio_settings_probe(struct ofono_radio_settings *rs, static int ril_radio_settings_probe(struct ofono_radio_settings *rs,
unsigned int vendor, void *user) unsigned int vendor, void *user)
{ {
struct ril_radio_settings_driver_data *rs_init_data = user; GRil *ril = user;
struct radio_data *rsd = g_new0(struct radio_data, 1); struct radio_data *rsd = g_new0(struct radio_data, 1);
rsd->ril = g_ril_clone(rs_init_data->gril); rsd->ril = g_ril_clone(ril);
rsd->modem = rs_init_data->modem;
ofono_radio_settings_set_data(rs, rsd); ofono_radio_settings_set_data(rs, rsd);

5
drivers/rilmodem/rilutil.h
View File

@ -89,11 +89,6 @@ struct ril_gprs_driver_data {
struct ofono_modem *modem; struct ofono_modem *modem;
}; };
struct ril_radio_settings_driver_data {
GRil *gril;
struct ofono_modem *modem;
};
typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata); typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata);
void decode_ril_error(struct ofono_error *error, const char *final); void decode_ril_error(struct ofono_error *error, const char *final);