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

modem: Fix entering offline mode prematurely 

A contextual change to __ofono_modem_find_atom has caused us to enter
into offline mode prematurely.  find_atom was changed to return only the
atoms that were registered, however the modem really has to know whether
the sim atom is created (not registered) in order to know whether to
wait for the SIM to be initialized or not.
This commit is contained in:
Denis Kenzior 2011-04-14 14:39:55 -05:00
parent d26a3fd67b
commit 240a01260f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modem.c
View File

@ -564,6 +564,20 @@ void __ofono_modem_remove_powered_watch(struct ofono_modem *modem,
__ofono_watchlist_remove_item(modem->powered_watches, id);
}
static gboolean modem_has_sim(struct ofono_modem *modem)
{
GSList *l;
struct ofono_atom *atom;
for (l = modem->atoms; l; l = l->next) {
atom = l->data;
if (atom->type == OFONO_ATOM_TYPE_SIM)
return TRUE;
}
return FALSE;
}
static void common_online_cb(const struct ofono_error *error, void *data)
{
struct ofono_modem *modem = data;
@ -1074,8 +1088,7 @@ static DBusMessage *modem_set_property(DBusConnection *conn,
modem_change_state(modem, MODEM_STATE_PRE_SIM);
/* Force SIM Ready for devies with no sim atom */
if (__ofono_modem_find_atom(modem,
OFONO_ATOM_TYPE_SIM) == NULL)
if (modem_has_sim(modem) == FALSE)
sim_state_watch(OFONO_SIM_STATE_READY, modem);
} else {
set_online(modem, FALSE);
@ -1155,8 +1168,7 @@ void ofono_modem_set_powered(struct ofono_modem *modem, ofono_bool_t powered)
modem_change_state(modem, MODEM_STATE_PRE_SIM);
/* Force SIM Ready for devices with no sim atom */
if (__ofono_modem_find_atom(modem,
OFONO_ATOM_TYPE_SIM) == NULL)
if (modem_has_sim(modem) == FALSE)
sim_state_watch(OFONO_SIM_STATE_READY, modem);
} else {
set_online(modem, FALSE);