SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem: we can expect non-LTE 3GPP+CDMA modems

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-15 14:14:50 +01:00
parent c0e0649a82
commit 8adc9cd699
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem.c
+5 -14
View File
@@ -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 ();
}
/*****************************************************************************/
src/mm-iface-modem-simple.c
+2 -2
View File
@@ -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. */