diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2012-01-11 06:49:46 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2012-01-11 06:49:46 -0600 |
| commit | 60890653e3eb7f003c978ca3745ba641949bc652 (patch) | |
| tree | 2ed58db2e8144217aa2cc84e42471983d0a0b847 /plugins/huawei.c | |
| parent | b1eb2209ab3795cb9ccb2094b375a1ee6f4a27c7 (diff) | |
| download | ofono-60890653e3eb7f003c978ca3745ba641949bc652.tar.gz | |
huawei: Refactor logic slightly
Diffstat (limited to 'plugins/huawei.c')
| -rw-r--r-- | plugins/huawei.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/plugins/huawei.c b/plugins/huawei.c index e4deb767..05ee0c2f 100644 --- a/plugins/huawei.c +++ b/plugins/huawei.c @@ -744,33 +744,25 @@ static void huawei_set_online(struct ofono_modem *modem, ofono_bool_t online, static void huawei_pre_sim(struct ofono_modem *modem) { struct huawei_data *data = ofono_modem_get_data(modem); + struct ofono_sim *sim = NULL; DBG("%p", modem); if (data->have_gsm == TRUE) { - struct ofono_sim *sim; - ofono_devinfo_create(modem, 0, "atmodem", data->pcui); sim = ofono_sim_create(modem, OFONO_VENDOR_HUAWEI, "atmodem", data->pcui); - - if (sim && data->have_sim == TRUE) - ofono_sim_inserted_notify(sim, TRUE); } else if (data->have_cdma == TRUE) { ofono_devinfo_create(modem, 0, "cdmamodem", data->pcui); /* Create SIM atom only if SIM is not embedded */ - if (data->sim_state != SIM_STATE_ROMSIM) { - struct ofono_sim *sim; - - /* Use sim drivers without Elementary File entries */ + if (data->sim_state != SIM_STATE_ROMSIM) sim = ofono_sim_create(modem, OFONO_VENDOR_HUAWEI, "atmodem-noef", data->pcui); - - if (sim && data->have_sim == TRUE) - ofono_sim_inserted_notify(sim, TRUE); - } } + + if (sim && data->have_sim == TRUE) + ofono_sim_inserted_notify(sim, TRUE); } static void huawei_post_sim(struct ofono_modem *modem) |