diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c index 1c834afb4a..39c42b6ec4 100644 --- a/src/modem-manager/nm-modem-manager.c +++ b/src/modem-manager/nm-modem-manager.c @@ -173,7 +173,7 @@ create_modem (NMModemManager *self, const char *path) { NMModem *modem = NULL; char *data_device = NULL, *driver = NULL, *master_device = NULL; - uint modem_type = MM_MODEM_TYPE_UNKNOWN; + uint modem_type = MM_OLD_MODEM_TYPE_UNKNOWN; uint ip_method = MM_MODEM_IP_METHOD_PPP; uint ip_timeout = 0; NMModemState state = NM_MODEM_STATE_UNKNOWN; @@ -188,7 +188,7 @@ create_modem (NMModemManager *self, const char *path) &modem_type, &ip_method, &ip_timeout, &state)) return; - if (modem_type == MM_MODEM_TYPE_UNKNOWN) { + if (modem_type == MM_OLD_MODEM_TYPE_UNKNOWN) { nm_log_warn (LOGD_MB, "modem with path %s has unknown type, ignoring", path); return; } @@ -208,9 +208,9 @@ create_modem (NMModemManager *self, const char *path) return; } - if (modem_type == MM_MODEM_TYPE_GSM) + if (modem_type == MM_OLD_MODEM_TYPE_GSM) modem = nm_modem_gsm_new (path, data_device, ip_method, state); - else if (modem_type == MM_MODEM_TYPE_CDMA) + else if (modem_type == MM_OLD_MODEM_TYPE_CDMA) modem = nm_modem_cdma_new (path, data_device, ip_method, state); else nm_log_warn (LOGD_MB, "unknown modem type '%d'", modem_type); diff --git a/src/modem-manager/nm-modem-types.h b/src/modem-manager/nm-modem-types.h index a11af81071..960cc871cb 100644 --- a/src/modem-manager/nm-modem-types.h +++ b/src/modem-manager/nm-modem-types.h @@ -30,9 +30,9 @@ #define MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card" #define MM_OLD_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network" -#define MM_MODEM_TYPE_UNKNOWN 0 -#define MM_MODEM_TYPE_GSM 1 -#define MM_MODEM_TYPE_CDMA 2 +#define MM_OLD_MODEM_TYPE_UNKNOWN 0 +#define MM_OLD_MODEM_TYPE_GSM 1 +#define MM_OLD_MODEM_TYPE_CDMA 2 /* Errors */