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

rilmodem: Get rid of ril_sim_data

This commit is contained in:
Denis Kenzior 2015-12-13 21:29:57 -06:00
parent 32516c4844
commit 5896f792e5
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rilmodem/rilutil.h
View File

@ -67,12 +67,6 @@ enum at_util_charset {
RIL_UTIL_CHARSET_8859_H = 0x10000,
};
struct ril_sim_data {
struct ofono_modem *modem;
GRil *gril;
ofono_sim_state_event_cb_t ril_state_watch;
};
struct ril_gprs_context_data {
GRil *gril;
struct ofono_modem *modem;

11
drivers/rilmodem/sim.c
View File

@ -1353,17 +1353,11 @@ static gboolean listen_and_get_sim_status(gpointer user)
static gboolean ril_sim_register(gpointer user)
{
struct ofono_sim *sim = user;
struct sim_data *sd = ofono_sim_get_data(sim);
DBG("");
ofono_sim_register(sim);
if (sd->ril_state_watch != NULL &&
!ofono_sim_add_state_watch(sim, sd->ril_state_watch,
sd->modem, NULL))
ofono_error("Error registering ril sim watch");
/*
* We use g_idle_add here to make sure that the presence of the SIM
* interface is signalled before signalling anything else from the said
@ -1377,8 +1371,7 @@ static gboolean ril_sim_register(gpointer user)
static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
void *data)
{
struct ril_sim_data *ril_data = data;
GRil *ril = ril_data->gril;
GRil *ril = data;
struct sim_data *sd;
int i;
@ -1391,8 +1384,6 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
sd->app_type = RIL_APPTYPE_UNKNOWN;
sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
sd->passwd_type = OFONO_SIM_PASSWORD_NONE;
sd->modem = ril_data->modem;
sd->ril_state_watch = ril_data->ril_state_watch;
for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
sd->retries[i] = -1;