aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-01-22 10:44:34 +0100
committerAleksander Morgado <aleksander@lanedo.com>2012-03-15 14:14:56 +0100
commit65455558bef9dd885805f650a2afea149aedf546 (patch)
tree890ab53af58112c077253da4a23bc53785efa1db
parent6d5c98b30c6cc19ae7bac33171e33244358fd746 (diff)
iface-modem: s/access_tech/access_technologies
-rw-r--r--src/mm-iface-modem-3gpp.c12
-rw-r--r--src/mm-iface-modem-cdma.c24
-rw-r--r--src/mm-iface-modem.c6
-rw-r--r--src/mm-iface-modem.h6
4 files changed, 24 insertions, 24 deletions
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index 086e425c..81d99fca 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -628,9 +628,9 @@ update_registration_state (MMIfaceModem3gpp *self,
(GAsyncReadyCallback)load_operator_name_ready,
NULL);
- mm_iface_modem_update_access_tech (MM_IFACE_MODEM (self),
- access_tech,
- ALL_3GPP_ACCESS_TECHNOLOGIES_MASK);
+ mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
+ access_tech,
+ ALL_3GPP_ACCESS_TECHNOLOGIES_MASK);
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_3GPP,
@@ -654,9 +654,9 @@ update_registration_state (MMIfaceModem3gpp *self,
if (MM_IS_IFACE_MODEM_LOCATION (self))
mm_iface_modem_location_3gpp_clear (MM_IFACE_MODEM_LOCATION (self));
- mm_iface_modem_update_access_tech (MM_IFACE_MODEM (self),
- 0,
- ALL_3GPP_ACCESS_TECHNOLOGIES_MASK);
+ mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
+ MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN,
+ ALL_3GPP_ACCESS_TECHNOLOGIES_MASK);
mm_iface_modem_update_subsystem_state (
MM_IFACE_MODEM (self),
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 85273ff1..70d6ebd5 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -954,18 +954,18 @@ mm_iface_modem_cdma_update_evdo_registration_state (MMIfaceModemCdma *self,
MM_MODEM_STATE_REGISTERED,
MM_MODEM_STATE_REASON_NONE);
/* TODO: report proper EVDO revision (0/A/B) */
- mm_iface_modem_update_access_tech (MM_IFACE_MODEM (self),
- MM_MODEM_ACCESS_TECHNOLOGY_EVDO0,
- ALL_CDMA_EVDO_ACCESS_TECHNOLOGIES_MASK);
+ mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
+ MM_MODEM_ACCESS_TECHNOLOGY_EVDO0,
+ ALL_CDMA_EVDO_ACCESS_TECHNOLOGIES_MASK);
break;
case MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN:
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_EVDO,
MM_MODEM_STATE_ENABLED,
MM_MODEM_STATE_REASON_NONE);
- mm_iface_modem_update_access_tech (MM_IFACE_MODEM (self),
- 0,
- ALL_CDMA_EVDO_ACCESS_TECHNOLOGIES_MASK);
+ mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
+ MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN,
+ ALL_CDMA_EVDO_ACCESS_TECHNOLOGIES_MASK);
break;
}
}
@@ -1004,9 +1004,9 @@ mm_iface_modem_cdma_update_cdma1x_registration_state (MMIfaceModemCdma *self,
SUBSYSTEM_CDMA1X,
MM_MODEM_STATE_REGISTERED,
MM_MODEM_STATE_REASON_NONE);
- mm_iface_modem_update_access_tech (MM_IFACE_MODEM (self),
- MM_MODEM_ACCESS_TECHNOLOGY_1XRTT,
- ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK);
+ mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
+ MM_MODEM_ACCESS_TECHNOLOGY_1XRTT,
+ ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK);
break;
case MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN:
if (mm_gdbus_modem_cdma_get_sid (skeleton) != MM_MODEM_CDMA_SID_UNKNOWN)
@@ -1018,9 +1018,9 @@ mm_iface_modem_cdma_update_cdma1x_registration_state (MMIfaceModemCdma *self,
SUBSYSTEM_CDMA1X,
MM_MODEM_STATE_ENABLED,
MM_MODEM_STATE_REASON_NONE);
- mm_iface_modem_update_access_tech (MM_IFACE_MODEM (self),
- 0,
- ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK);
+ mm_iface_modem_update_access_technologies (MM_IFACE_MODEM (self),
+ MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN,
+ ALL_CDMA_CDMA1X_ACCESS_TECHNOLOGIES_MASK);
break;
}
}
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 0b40681b..946e6397 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -350,9 +350,9 @@ handle_list_bearers (MmGdbusModem *skeleton,
/*****************************************************************************/
void
-mm_iface_modem_update_access_tech (MMIfaceModem *self,
- MMModemAccessTechnology new_access_tech,
- guint32 mask)
+mm_iface_modem_update_access_technologies (MMIfaceModem *self,
+ MMModemAccessTechnology new_access_tech,
+ guint32 mask)
{
MmGdbusModem *skeleton = NULL;
MMModemAccessTechnology old_access_tech;
diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h
index b7ab6102..1ef3fd83 100644
--- a/src/mm-iface-modem.h
+++ b/src/mm-iface-modem.h
@@ -319,9 +319,9 @@ void mm_iface_modem_update_state (MMIfaceModem *self,
MMModemStateReason reason);
/* Allow reporting new access tech */
-void mm_iface_modem_update_access_tech (MMIfaceModem *self,
- MMModemAccessTechnology access_tech,
- guint32 mask);
+void mm_iface_modem_update_access_technologies (MMIfaceModem *self,
+ MMModemAccessTechnology access_tech,
+ guint32 mask);
/* Allow updating signal quality */
void mm_iface_modem_update_signal_quality (MMIfaceModem *self,