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

broadband-modem: use new common method to check if modem is 3GPP

Browse Source
This commit is contained in:
Aleksander Morgado
2011-12-22 20:42:50 +01:00
parent 473ca46ad9
commit 4387fa183c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mm-broadband-modem.c
View File

@@ -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,

6
src/mm-modem-helpers.h
View File

@@ -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;