From 4387fa183cc96c7d853bddbd339fe4fecab4cb8d Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 22 Dec 2011 20:42:50 +0100 Subject: broadband-modem: use new common method to check if modem is 3GPP --- src/mm-broadband-modem.c | 7 +------ src/mm-modem-helpers.h | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 977b2980..01f819c1 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -36,11 +36,6 @@ #include "mm-modem-helpers.h" #include "mm-error-helpers.h" -#define MM_MODEM_CAPABILITY_3GPP \ - (MM_MODEM_CAPABILITY_GSM_UMTS | \ - MM_MODEM_CAPABILITY_LTE | \ - MM_MODEM_CAPABILITY_LTE_ADVANCED) - static void iface_modem_init (MMIfaceModem *iface); static void iface_modem_3gpp_init (MMIfaceModem3gpp *iface); static void iface_modem_simple_init (MMIfaceModemSimple *iface); @@ -2466,7 +2461,7 @@ initialize_step (InitializeContext *ctx) return; case INITIALIZE_STEP_IFACE_3GPP: - if (ctx->self->priv->modem_current_capabilities & MM_MODEM_CAPABILITY_3GPP) { + if (mm_iface_modem_is_3gpp (MM_IFACE_MODEM (ctx->self))) { /* Initialize the Modem interface */ mm_iface_modem_3gpp_initialize (MM_IFACE_MODEM_3GPP (ctx->self), ctx->port, diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 93295807..8f362e03 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -22,6 +22,12 @@ #include "mm-modem-cdma.h" #include "mm-charsets.h" +#define MM_MODEM_CAPABILITY_3GPP \ + (MM_MODEM_CAPABILITY_GSM_UMTS | \ + MM_MODEM_CAPABILITY_LTE | \ + MM_MODEM_CAPABILITY_LTE_ADVANCED) + + /* Network scan results expected */ typedef struct { MMModem3gppNetworkAvailability status; -- cgit v1.2.3-70-g09d2