diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-01-13 11:26:28 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:50 +0100 |
| commit | 8adc9cd699503885d9878403834d2a7f674cc661 (patch) | |
| tree | 97f42a47cf57ae707ea58ab88a2e984eb9a728c2 | |
| parent | c0e0649a821d7370087931af9546c506248f4530 (diff) | |
broadband-modem: we can expect non-LTE 3GPP+CDMA modems
| -rw-r--r-- | src/mm-broadband-modem.c | 19 | ||||
| -rw-r--r-- | src/mm-iface-modem-simple.c | 4 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index af71f24b..1d4d1a4d 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -239,12 +239,12 @@ modem_create_bearer (MMIfaceModem *self, return; } - /* On mixed LTE and CDMA modems, we'll build a 3GPP bearer if 'apn' was + /* On mixed 3GPP and CDMA modems, we'll build a 3GPP bearer if 'apn' was * given, and a CDMA bearer otherwise. - * Plugins supporting mixed LTE+CDMA modems can override this and provide + * Plugins supporting mixed 3GPP+CDMA modems can override this method and provide * their own specific and detailed logic. */ if (mm_iface_modem_is_cdma (self) && - mm_iface_modem_is_3gpp_lte (self)) { + mm_iface_modem_is_3gpp (self)) { if (mm_common_bearer_properties_get_apn (properties)) { mm_dbg ("Creating 3GPP Bearer in mixed CDMA+LTE modem"); mm_iface_modem_3gpp_create_bearer (MM_IFACE_MODEM_3GPP (self), @@ -261,17 +261,8 @@ modem_create_bearer (MMIfaceModem *self, return; } - g_simple_async_result_set_error ( - result, - MM_CORE_ERROR, - MM_CORE_ERROR_UNSUPPORTED, - "Cannot create bearer in modem of unknown type. " - "CDMA: %s, 3GPP: %s (LTE: %s)", - mm_iface_modem_is_cdma (self) ? "yes" : "no", - mm_iface_modem_is_3gpp (self) ? "yes" : "no", - mm_iface_modem_is_3gpp_lte (self) ? "yes" : "no"); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + /* POTS modems are not expected yet. */ + g_assert_not_reached (); } /*****************************************************************************/ diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c index dfcc176f..65e9356e 100644 --- a/src/mm-iface-modem-simple.c +++ b/src/mm-iface-modem-simple.c @@ -158,7 +158,7 @@ register_in_3gpp_or_cdma_network (MMIfaceModemSimple *self, ctx->remaining_tries_cdma = 1; ctx->remaining_tries_3gpp = 0; } - /* Mixed 3GPP(LTE)+CDMA modems... */ + /* Mixed 3GPP+CDMA modems... */ else { ctx->max_try_time = 10; ctx->remaining_tries_cdma = 6; @@ -301,7 +301,7 @@ create_3gpp_and_cdma_bearers (MMIfaceModemSimple *self, /* CDMA-only modems... */ else if (mm_iface_modem_is_cdma_only (MM_IFACE_MODEM (ctx->self))) ctx->create_cdma_bearer = TRUE; - /* Mixed CDMA+3GPP(LTE) modems */ + /* Mixed CDMA+3GPP modems */ else { /* If we have APN, we'll create both 3GPP and CDMA bearers. * Otherwise we'll only create a CDMA bearer. */ |