diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-06-15 14:16:43 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-06-15 14:16:43 +0200 |
| commit | 74791ca805920bc5b086b2c60cd34b0505222735 (patch) | |
| tree | 95ed3b992f358e9b08b299e4c1d769fe0ab799f0 | |
| parent | 5a1c7eef086785cd665755617e132d1f0ac6b873 (diff) | |
| download | ofono-74791ca805920bc5b086b2c60cd34b0505222735.tar.bz2 | |
Remove all voice related atoms from MBM modem support
| -rw-r--r-- | plugins/mbm.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/plugins/mbm.c b/plugins/mbm.c index bb9e2120..00b55508 100644 --- a/plugins/mbm.c +++ b/plugins/mbm.c @@ -38,20 +38,13 @@ #include <ofono/netreg.h> #include <ofono/sim.h> #include <ofono/stk.h> -#include <ofono/sms.h> #include <ofono/cbs.h> -#include <ofono/ssn.h> +#include <ofono/sms.h> #include <ofono/ussd.h> -#include <ofono/voicecall.h> -#include <ofono/phonebook.h> -#include <ofono/message-waiting.h> -#include <ofono/call-meter.h> -#include <ofono/call-settings.h> -#include <ofono/call-volume.h> -#include <ofono/call-forwarding.h> #include <ofono/gprs.h> #include <ofono/gprs-context.h> #include <ofono/log.h> + #include <drivers/atmodem/vendor.h> static const char *cfun_prefix[] = { "+CFUN:", NULL }; @@ -325,7 +318,6 @@ static void mbm_pre_sim(struct ofono_modem *modem) ofono_devinfo_create(modem, 0, "atmodem", data->modem_port); sim = ofono_sim_create(modem, 0, "atmodem", data->modem_port); - ofono_voicecall_create(modem, 0, "atmodem", data->modem_port); ofono_stk_create(modem, 0, "mbmmodem", data->modem_port); if (data->have_sim && sim) @@ -335,34 +327,23 @@ static void mbm_pre_sim(struct ofono_modem *modem) static void mbm_post_sim(struct ofono_modem *modem) { struct mbm_data *data = ofono_modem_get_data(modem); - struct ofono_message_waiting *mw; struct ofono_gprs *gprs; struct ofono_gprs_context *gc; DBG("%p", modem); - ofono_call_forwarding_create(modem, 0, "atmodem", data->modem_port); - ofono_call_settings_create(modem, 0, "atmodem", data->modem_port); - ofono_call_meter_create(modem, 0, "atmodem", data->modem_port); - ofono_call_volume_create(modem, 0, "atmodem", data->modem_port); - - ofono_ussd_create(modem, 0, "atmodem", data->modem_port); ofono_netreg_create(modem, OFONO_VENDOR_MBM, "atmodem", data->modem_port); - ofono_phonebook_create(modem, 0, "atmodem", data->modem_port); - ofono_ssn_create(modem, 0, "atmodem", data->modem_port); + ofono_sms_create(modem, 0, "atmodem", data->modem_port); ofono_cbs_create(modem, 0, "atmodem", data->modem_port); + ofono_ussd_create(modem, 0, "atmodem", data->modem_port); gprs = ofono_gprs_create(modem, 0, "atmodem", data->modem_port); gc = ofono_gprs_context_create(modem, 0, "mbm", data->modem_port); if (gprs && gc) ofono_gprs_add_context(gprs, gc); - - mw = ofono_message_waiting_create(modem); - if (mw) - ofono_message_waiting_register(mw); } static struct ofono_modem_driver mbm_driver = { |