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

cbs: Use __ofono_atom_find macro

This commit is contained in:
Denis Kenzior 2012-01-18 11:29:12 -06:00
parent 12e481104d
commit dc93f5dbe0
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cbs.c
View File

@ -1085,8 +1085,6 @@ void ofono_cbs_register(struct ofono_cbs *cbs)
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(cbs->atom); struct ofono_modem *modem = __ofono_atom_get_modem(cbs->atom);
const char *path = __ofono_atom_get_path(cbs->atom); const char *path = __ofono_atom_get_path(cbs->atom);
struct ofono_atom *sim_atom;
struct ofono_atom *stk_atom;
if (!g_dbus_register_interface(conn, path, if (!g_dbus_register_interface(conn, path,
OFONO_CELL_BROADCAST_INTERFACE, OFONO_CELL_BROADCAST_INTERFACE,
@ -1099,20 +1097,15 @@ void ofono_cbs_register(struct ofono_cbs *cbs)
ofono_modem_add_interface(modem, OFONO_CELL_BROADCAST_INTERFACE); ofono_modem_add_interface(modem, OFONO_CELL_BROADCAST_INTERFACE);
sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM); cbs->sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem);
if (cbs->sim) {
if (sim_atom) {
cbs->sim = __ofono_atom_get_data(sim_atom);
cbs->sim_context = ofono_sim_context_create(cbs->sim); cbs->sim_context = ofono_sim_context_create(cbs->sim);
if (ofono_sim_get_state(cbs->sim) == OFONO_SIM_STATE_READY) if (ofono_sim_get_state(cbs->sim) == OFONO_SIM_STATE_READY)
cbs_got_imsi(cbs); cbs_got_imsi(cbs);
} }
stk_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_STK); cbs->stk = __ofono_atom_find(OFONO_ATOM_TYPE_STK, modem);
if (stk_atom)
cbs->stk = __ofono_atom_get_data(stk_atom);
cbs->netreg_watch = __ofono_modem_add_atom_watch(modem, cbs->netreg_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_NETREG, OFONO_ATOM_TYPE_NETREG,