diff options
| author | Andrzej Zaborowski <andrew.zaborowski@intel.com> | 2011-02-03 08:37:37 +0100 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2011-02-03 13:13:37 -0600 |
| commit | a7a0cb1ed04bb75c8ee29f990fb818b806ace825 (patch) | |
| tree | 721b04e5c3b268cc382d507591d2632fce43ec94 /src/call-forwarding.c | |
| parent | 0ecc99973a2ccafcacd1c24c976d85950fb6cbae (diff) | |
| download | ofono-a7a0cb1ed04bb75c8ee29f990fb818b806ace825.tar.bz2 | |
simfs: implement ofono_sim_context api
Diffstat (limited to 'src/call-forwarding.c')
| -rw-r--r-- | src/call-forwarding.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/call-forwarding.c b/src/call-forwarding.c index d300c699..ca6dad9e 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -61,6 +61,7 @@ struct ofono_call_forwarding { int query_end; struct cf_ss_request *ss_req; struct ofono_sim *sim; + struct ofono_sim_context *sim_context; unsigned char cfis_record_id; struct ofono_ussd *ussd; unsigned int ussd_watch; @@ -276,7 +277,7 @@ static void sim_set_cf_indicator(struct ofono_call_forwarding *cf) data[3] = 128; } - ofono_sim_write(cf->sim, SIM_EFCFIS_FILEID, + ofono_sim_write(cf->sim_context, SIM_EFCFIS_FILEID, sim_cfis_update_cb, OFONO_SIM_FILE_STRUCTURE_FIXED, cf->cfis_record_id, data, @@ -287,7 +288,7 @@ static void sim_set_cf_indicator(struct ofono_call_forwarding *cf) if (cf->flags & CALL_FORWARDING_FLAG_CPHS_CFF) { unsigned char cff_voice = cfu_voice ? 0x0A : 0x05; - ofono_sim_write(cf->sim, SIM_EF_CPHS_CFF_FILEID, + ofono_sim_write(cf->sim_context, SIM_EF_CPHS_CFF_FILEID, sim_cphs_cff_update_cb, OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, 0, &cff_voice, sizeof(cff_voice), cf); @@ -1362,11 +1363,11 @@ static void sim_read_cf_indicator(struct ofono_call_forwarding *cf) if (__ofono_sim_service_available(cf->sim, SIM_UST_SERVICE_CFIS, SIM_SST_SERVICE_CFIS) == TRUE) - ofono_sim_read(cf->sim, SIM_EFCFIS_FILEID, + ofono_sim_read(cf->sim_context, SIM_EFCFIS_FILEID, OFONO_SIM_FILE_STRUCTURE_FIXED, sim_cfis_read_cb, cf); else - ofono_sim_read(cf->sim, SIM_EF_CPHS_CFF_FILEID, + ofono_sim_read(cf->sim_context, SIM_EF_CPHS_CFF_FILEID, OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, sim_cphs_cff_read_cb, cf); } @@ -1401,6 +1402,11 @@ static void call_forwarding_unregister(struct ofono_atom *atom) g_dbus_unregister_interface(conn, path, OFONO_CALL_FORWARDING_INTERFACE); + if (cf->sim_context) { + ofono_sim_context_free(cf->sim_context); + cf->sim_context = NULL; + } + if (cf->ussd) cf_unregister_ss_controls(cf); @@ -1499,6 +1505,8 @@ void ofono_call_forwarding_register(struct ofono_call_forwarding *cf) if (sim_atom) { cf->sim = __ofono_atom_get_data(sim_atom); + cf->sim_context = ofono_sim_context_create(cf->sim); + sim_read_cf_indicator(cf); } |