aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/cinterion/mm-broadband-modem-cinterion.c18
-rw-r--r--plugins/huawei/mm-broadband-modem-huawei.c20
-rw-r--r--plugins/icera/mm-broadband-modem-icera.c18
-rw-r--r--plugins/linktop/mm-broadband-modem-linktop.c18
-rw-r--r--plugins/longcheer/mm-broadband-modem-longcheer.c18
-rw-r--r--plugins/mbm/mm-broadband-modem-mbm.c34
-rw-r--r--plugins/novatel/mm-broadband-modem-novatel.c26
-rw-r--r--plugins/option/mm-broadband-modem-option.c18
-rw-r--r--plugins/sierra/mm-broadband-modem-sierra.c28
-rw-r--r--plugins/simtech/mm-broadband-modem-simtech.c72
-rw-r--r--plugins/wavecom/mm-broadband-modem-wavecom.c48
-rw-r--r--plugins/x22x/mm-broadband-modem-x22x.c18
-rw-r--r--plugins/zte/mm-broadband-modem-zte.c18
13 files changed, 176 insertions, 178 deletions
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/plugins/cinterion/mm-broadband-modem-cinterion.c
index 4c74774c..f86460a5 100644
--- a/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -590,10 +590,10 @@ load_supported_modes (MMIfaceModem *self,
}
/*****************************************************************************/
-/* ALLOWED MODES */
+/* Set current modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -618,7 +618,7 @@ allowed_access_technology_update_ready (MMBroadbandModemCinterion *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -629,7 +629,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
/* For dual 2G/3G devices... */
if (mm_iface_modem_is_2g (self) &&
@@ -646,11 +646,9 @@ set_allowed_modes (MMIfaceModem *self,
* which is based on the quality of the connection.
*/
cmd = g_string_new ("+COPS=,,,");
- if (allowed == MM_MODEM_MODE_3G &&
- preferred == MM_MODEM_MODE_NONE) {
+ if (allowed == MM_MODEM_MODE_3G) {
g_string_append (cmd, "2");
- } else if (allowed == MM_MODEM_MODE_2G &&
- preferred == MM_MODEM_MODE_NONE) {
+ } else if (allowed == MM_MODEM_MODE_2G) {
g_string_append (cmd, "0");
} else {
gchar *allowed_str;
@@ -1271,8 +1269,8 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_supported_bands = load_supported_bands;
iface->load_supported_bands_finish = load_supported_bands_finish;
iface->load_current_bands = load_current_bands;
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
index 410032df..eb13a1ba 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/plugins/huawei/mm-broadband-modem-huawei.c
@@ -1187,7 +1187,7 @@ parse_prefmode (const gchar *response, MMModemMode *preferred, GError **error)
}
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -1208,7 +1208,7 @@ load_allowed_modes_finish (MMIfaceModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -1226,7 +1226,7 @@ load_allowed_modes (MMIfaceModem *self,
}
/*****************************************************************************/
-/* Set allowed modes (Modem interface) */
+/* Set current modes (Modem interface) */
static gboolean
allowed_mode_to_prefmode (MMModemMode allowed, guint *huawei_mode, GError **error)
@@ -1256,7 +1256,7 @@ allowed_mode_to_prefmode (MMModemMode allowed, guint *huawei_mode, GError **erro
}
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -1281,7 +1281,7 @@ allowed_mode_update_ready (MMBroadbandModemHuawei *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -1296,7 +1296,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
if (mm_iface_modem_is_cdma_only (self)) {
if (allowed_mode_to_prefmode (allowed, &mode, &error))
@@ -2743,10 +2743,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->set_current_bands_finish = set_current_bands_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_signal_quality = modem_load_signal_quality;
iface->load_signal_quality_finish = modem_load_signal_quality_finish;
iface->create_bearer = huawei_modem_create_bearer;
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c
index a9fdfe38..84e998b7 100644
--- a/plugins/icera/mm-broadband-modem-icera.c
+++ b/plugins/icera/mm-broadband-modem-icera.c
@@ -153,7 +153,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-modem_load_allowed_modes_finish (MMIfaceModem *self,
+modem_load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -212,7 +212,7 @@ modem_load_allowed_modes_finish (MMIfaceModem *self,
}
static void
-modem_load_allowed_modes (MMIfaceModem *self,
+modem_load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -228,7 +228,7 @@ modem_load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-modem_set_allowed_modes_finish (MMIfaceModem *self,
+modem_set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -253,7 +253,7 @@ allowed_mode_update_ready (MMBaseModem *self,
}
static void
-modem_set_allowed_modes (MMIfaceModem *self,
+modem_set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -266,7 +266,7 @@ modem_set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- modem_set_allowed_modes);
+ modem_set_current_modes);
/*
* The core has checked the following:
@@ -1857,10 +1857,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = modem_load_allowed_modes;
- iface->load_allowed_modes_finish = modem_load_allowed_modes_finish;
- iface->set_allowed_modes = modem_set_allowed_modes;
- iface->set_allowed_modes_finish = modem_set_allowed_modes_finish;
+ iface->load_current_modes = modem_load_current_modes;
+ iface->load_current_modes_finish = modem_load_current_modes_finish;
+ iface->set_current_modes = modem_set_current_modes;
+ iface->set_current_modes_finish = modem_set_current_modes_finish;
iface->load_access_technologies = modem_load_access_technologies;
iface->load_access_technologies_finish = modem_load_access_technologies_finish;
iface->load_unlock_retries = modem_load_unlock_retries;
diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/plugins/linktop/mm-broadband-modem-linktop.c
index bcfa7daf..a23f5320 100644
--- a/plugins/linktop/mm-broadband-modem-linktop.c
+++ b/plugins/linktop/mm-broadband-modem-linktop.c
@@ -123,7 +123,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -173,7 +173,7 @@ load_allowed_modes_finish (MMIfaceModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -189,7 +189,7 @@ load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -214,7 +214,7 @@ allowed_mode_update_ready (MMBroadbandModemLinktop *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -227,7 +227,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
if (allowed == MM_MODEM_MODE_2G)
linktop_mode = LINKTOP_MODE_2G;
@@ -302,10 +302,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
}
static void
diff --git a/plugins/longcheer/mm-broadband-modem-longcheer.c b/plugins/longcheer/mm-broadband-modem-longcheer.c
index 3abaaeaf..27da1868 100644
--- a/plugins/longcheer/mm-broadband-modem-longcheer.c
+++ b/plugins/longcheer/mm-broadband-modem-longcheer.c
@@ -120,7 +120,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -179,7 +179,7 @@ load_allowed_modes_finish (MMIfaceModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -195,7 +195,7 @@ load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -220,7 +220,7 @@ allowed_mode_update_ready (MMBroadbandModemLongcheer *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -233,7 +233,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
if (allowed == MM_MODEM_MODE_2G)
mododr = 3;
@@ -424,10 +424,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_access_technologies_finish = load_access_technologies_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_unlock_retries = load_unlock_retries;
iface->load_unlock_retries_finish = load_unlock_retries_finish;
}
diff --git a/plugins/mbm/mm-broadband-modem-mbm.c b/plugins/mbm/mm-broadband-modem-mbm.c
index e5eacaf0..8380813e 100644
--- a/plugins/mbm/mm-broadband-modem-mbm.c
+++ b/plugins/mbm/mm-broadband-modem-mbm.c
@@ -269,7 +269,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-load_allowed_modes_finish (MMIfaceModem *_self,
+load_current_modes_finish (MMIfaceModem *_self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -319,7 +319,7 @@ load_allowed_modes_finish (MMIfaceModem *_self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -338,19 +338,19 @@ typedef struct {
MMBroadbandModemMbm *self;
GSimpleAsyncResult *result;
gint mbm_mode;
-} SetAllowedModesContext;
+} SetCurrentModesContext;
static void
-set_allowed_modes_context_complete_and_free (SetAllowedModesContext *ctx)
+set_current_modes_context_complete_and_free (SetCurrentModesContext *ctx)
{
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->self);
- g_slice_free (SetAllowedModesContext, ctx);
+ g_slice_free (SetCurrentModesContext, ctx);
}
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -360,7 +360,7 @@ set_allowed_modes_finish (MMIfaceModem *self,
static void
allowed_mode_update_ready (MMBaseModem *self,
GAsyncResult *res,
- SetAllowedModesContext *ctx)
+ SetCurrentModesContext *ctx)
{
GError *error = NULL;
@@ -373,25 +373,25 @@ allowed_mode_update_ready (MMBaseModem *self,
ctx->self->priv->mbm_mode = ctx->mbm_mode;
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
}
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
gpointer user_data)
{
- SetAllowedModesContext *ctx;
+ SetCurrentModesContext *ctx;
gchar *command;
- ctx = g_slice_new (SetAllowedModesContext);
+ ctx = g_slice_new (SetCurrentModesContext);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
ctx->mbm_mode = -1;
if (allowed == MM_MODEM_MODE_2G)
@@ -419,7 +419,7 @@ set_allowed_modes (MMIfaceModem *self,
g_free (allowed_str);
g_free (preferred_str);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
return;
}
@@ -1322,10 +1322,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->modem_after_sim_unlock_finish = modem_after_sim_unlock_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->reset = reset;
iface->reset_finish = reset_finish;
iface->factory_reset = factory_reset;
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel.c
index 62f4a3a7..31a9cc31 100644
--- a/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/plugins/novatel/mm-broadband-modem-novatel.c
@@ -138,16 +138,16 @@ load_supported_modes (MMIfaceModem *self,
typedef struct {
MMModemMode allowed;
MMModemMode preferred;
-} LoadAllowedModesResult;
+} LoadCurrentModesResult;
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
GError **error)
{
- LoadAllowedModesResult *result;
+ LoadCurrentModesResult *result;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return FALSE;
@@ -164,7 +164,7 @@ nwrat_query_ready (MMBaseModem *self,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
- LoadAllowedModesResult result;
+ LoadCurrentModesResult result;
GError *error = NULL;
const gchar *response;
GRegex *r;
@@ -255,7 +255,7 @@ nwrat_query_ready (MMBaseModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -264,7 +264,7 @@ load_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- load_allowed_modes);
+ load_current_modes);
/* Load allowed modes only in 3GPP modems */
if (!mm_iface_modem_is_3gpp (self)) {
@@ -290,7 +290,7 @@ load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -315,7 +315,7 @@ allowed_mode_update_ready (MMBroadbandModemNovatel *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -329,7 +329,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
/* Setting allowed modes only in 3GPP modems */
if (!mm_iface_modem_is_3gpp (self)) {
@@ -1237,10 +1237,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_access_technologies_finish = modem_load_access_technologies_finish;
iface->load_access_technologies = modem_load_access_technologies;
iface->load_signal_quality = modem_load_signal_quality;
diff --git a/plugins/option/mm-broadband-modem-option.c b/plugins/option/mm-broadband-modem-option.c
index 42d9570e..534a1861 100644
--- a/plugins/option/mm-broadband-modem-option.c
+++ b/plugins/option/mm-broadband-modem-option.c
@@ -143,7 +143,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -202,7 +202,7 @@ load_allowed_modes_finish (MMIfaceModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -218,7 +218,7 @@ load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -243,7 +243,7 @@ allowed_mode_update_ready (MMBroadbandModemOption *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -256,7 +256,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
if (allowed == MM_MODEM_MODE_2G)
option_mode = 0;
@@ -1232,10 +1232,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_access_technologies_finish = load_access_technologies_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
}
static void
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c
index 46d2f3c3..ba1881f9 100644
--- a/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/plugins/sierra/mm-broadband-modem-sierra.c
@@ -622,16 +622,16 @@ load_supported_modes (MMIfaceModem *self,
typedef struct {
MMModemMode allowed;
MMModemMode preferred;
-} LoadAllowedModesResult;
+} LoadCurrentModesResult;
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
GError **error)
{
- LoadAllowedModesResult *result;
+ LoadCurrentModesResult *result;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return FALSE;
@@ -648,7 +648,7 @@ selrat_query_ready (MMBaseModem *self,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
- LoadAllowedModesResult result;
+ LoadCurrentModesResult result;
const gchar *response;
GError *error = NULL;
GRegex *r = NULL;
@@ -746,7 +746,7 @@ selrat_query_ready (MMBaseModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -756,7 +756,7 @@ load_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- load_allowed_modes);
+ load_current_modes);
if (!mm_iface_modem_is_3gpp (self)) {
/* Cannot do this in CDMA modems */
@@ -794,10 +794,10 @@ load_allowed_modes (MMIfaceModem *self,
}
/*****************************************************************************/
-/* Set allowed modes (Modem interface) */
+/* Set current modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -821,7 +821,7 @@ selrat_set_ready (MMBaseModem *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -835,7 +835,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- load_allowed_modes);
+ set_current_modes);
if (!mm_iface_modem_is_3gpp (self)) {
/* Cannot do this in CDMA modems */
@@ -1665,10 +1665,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_access_technologies = load_access_technologies;
iface->load_access_technologies_finish = load_access_technologies_finish;
iface->load_own_numbers = modem_load_own_numbers;
diff --git a/plugins/simtech/mm-broadband-modem-simtech.c b/plugins/simtech/mm-broadband-modem-simtech.c
index f7353d88..a75d9e4c 100644
--- a/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/plugins/simtech/mm-broadband-modem-simtech.c
@@ -532,17 +532,17 @@ load_supported_modes (MMIfaceModem *self,
typedef struct {
MMModemMode allowed;
MMModemMode preferred;
-} LoadAllowedModesResult;
+} LoadCurrentModesResult;
typedef struct {
MMBroadbandModemSimtech *self;
GSimpleAsyncResult *result;
gint acqord;
gint modepref;
-} LoadAllowedModesContext;
+} LoadCurrentModesContext;
static void
-load_allowed_modes_context_complete_and_free (LoadAllowedModesContext *ctx)
+load_current_modes_context_complete_and_free (LoadCurrentModesContext *ctx)
{
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
@@ -551,13 +551,13 @@ load_allowed_modes_context_complete_and_free (LoadAllowedModesContext *ctx)
}
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
GError **error)
{
- LoadAllowedModesResult *result;
+ LoadCurrentModesResult *result;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return FALSE;
@@ -571,9 +571,9 @@ load_allowed_modes_finish (MMIfaceModem *self,
static void
cnmp_query_ready (MMBroadbandModemSimtech *self,
GAsyncResult *res,
- LoadAllowedModesContext *ctx)
+ LoadCurrentModesContext *ctx)
{
- LoadAllowedModesResult *result;
+ LoadCurrentModesResult *result;
const gchar *response, *p;
GError *error = NULL;
@@ -581,7 +581,7 @@ cnmp_query_ready (MMBroadbandModemSimtech *self,
if (!response) {
/* Let the error be critical. */
g_simple_async_result_take_error (ctx->result, error);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
return;
}
@@ -593,11 +593,11 @@ cnmp_query_ready (MMBroadbandModemSimtech *self,
MM_CORE_ERROR_FAILED,
"Failed to parse the mode preference response: '%s'",
response);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
return;
}
- result = g_new (LoadAllowedModesResult, 1);
+ result = g_new (LoadCurrentModesResult, 1);
result->allowed = MM_MODEM_MODE_NONE;
result->preferred = MM_MODEM_MODE_NONE;
@@ -625,7 +625,7 @@ cnmp_query_ready (MMBroadbandModemSimtech *self,
MM_CORE_ERROR_FAILED,
"Unknown acquisition order preference: '%d'",
ctx->acqord);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
return;
}
break;
@@ -649,7 +649,7 @@ cnmp_query_ready (MMBroadbandModemSimtech *self,
MM_CORE_ERROR_FAILED,
"Unknown mode preference: '%d'",
ctx->modepref);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
return;
}
@@ -657,13 +657,13 @@ cnmp_query_ready (MMBroadbandModemSimtech *self,
g_simple_async_result_set_op_res_gpointer (ctx->result,
result,
g_free);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
}
static void
cnaop_query_ready (MMBroadbandModemSimtech *self,
GAsyncResult *res,
- LoadAllowedModesContext *ctx)
+ LoadCurrentModesContext *ctx)
{
const gchar *response, *p;
GError *error = NULL;
@@ -672,7 +672,7 @@ cnaop_query_ready (MMBroadbandModemSimtech *self,
if (!response) {
/* Let the error be critical. */
g_simple_async_result_take_error (ctx->result, error);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
return;
}
@@ -687,7 +687,7 @@ cnaop_query_ready (MMBroadbandModemSimtech *self,
MM_CORE_ERROR_FAILED,
"Failed to parse the acquisition order response: '%s'",
response);
- load_allowed_modes_context_complete_and_free (ctx);
+ load_current_modes_context_complete_and_free (ctx);
return;
}
@@ -701,18 +701,18 @@ cnaop_query_ready (MMBroadbandModemSimtech *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- LoadAllowedModesContext *ctx;
+ LoadCurrentModesContext *ctx;
- ctx = g_new (LoadAllowedModesContext, 1);
+ ctx = g_new (LoadCurrentModesContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- load_allowed_modes);
+ load_current_modes);
ctx->acqord = -1;
ctx->modepref = -1;
@@ -733,10 +733,10 @@ typedef struct {
GSimpleAsyncResult *result;
guint nmp; /* mode preference */
guint naop; /* acquisition order */
-} SetAllowedModesContext;
+} SetCurrentModesContext;
static void
-set_allowed_modes_context_complete_and_free (SetAllowedModesContext *ctx)
+set_current_modes_context_complete_and_free (SetCurrentModesContext *ctx)
{
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->result);
@@ -745,7 +745,7 @@ set_allowed_modes_context_complete_and_free (SetAllowedModesContext *ctx)
}
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -755,7 +755,7 @@ set_allowed_modes_finish (MMIfaceModem *self,
static void
cnaop_set_ready (MMBaseModem *self,
GAsyncResult *res,
- SetAllowedModesContext *ctx)
+ SetCurrentModesContext *ctx)
{
GError *error = NULL;
@@ -766,13 +766,13 @@ cnaop_set_ready (MMBaseModem *self,
else
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
}
static void
cnmp_set_ready (MMBaseModem *self,
GAsyncResult *res,
- SetAllowedModesContext *ctx)
+ SetCurrentModesContext *ctx)
{
GError *error = NULL;
gchar *command;
@@ -781,7 +781,7 @@ cnmp_set_ready (MMBaseModem *self,
if (error) {
/* Let the error be critical. */
g_simple_async_result_take_error (ctx->result, error);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
return;
}
@@ -797,21 +797,21 @@ cnmp_set_ready (MMBaseModem *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
gpointer user_data)
{
- SetAllowedModesContext *ctx;
+ SetCurrentModesContext *ctx;
gchar *command;
- ctx = g_new (SetAllowedModesContext, 1);
+ ctx = g_new (SetCurrentModesContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
/* Defaults: automatic search */
ctx->nmp = 2;
@@ -851,7 +851,7 @@ set_allowed_modes (MMIfaceModem *self,
g_free (allowed_str);
g_free (preferred_str);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
return;
}
@@ -927,10 +927,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_access_technologies_finish = load_access_technologies_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
}
static void
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/plugins/wavecom/mm-broadband-modem-wavecom.c
index 1ee16e99..85c96a98 100644
--- a/plugins/wavecom/mm-broadband-modem-wavecom.c
+++ b/plugins/wavecom/mm-broadband-modem-wavecom.c
@@ -212,16 +212,16 @@ load_supported_modes (MMIfaceModem *self,
typedef struct {
MMModemMode allowed;
MMModemMode preferred;
-} LoadAllowedModesResult;
+} LoadCurrentModesResult;
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
GError **error)
{
- LoadAllowedModesResult *result;
+ LoadCurrentModesResult *result;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return FALSE;
@@ -240,7 +240,7 @@ wwsm_read_ready (MMBaseModem *self,
{
GRegex *r;
GMatchInfo *match_info = NULL;
- LoadAllowedModesResult result;
+ LoadCurrentModesResult result;
const gchar *response;
GError *error = NULL;
@@ -330,7 +330,7 @@ current_ms_class_ready (MMBaseModem *self,
GAsyncResult *res,
GSimpleAsyncResult *simple)
{
- LoadAllowedModesResult result;
+ LoadCurrentModesResult result;
const gchar *response;
GError *error = NULL;
@@ -394,7 +394,7 @@ current_ms_class_ready (MMBaseModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -403,7 +403,7 @@ load_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- load_allowed_modes);
+ load_current_modes);
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+CGCLASS?",
@@ -421,10 +421,10 @@ typedef struct {
GSimpleAsyncResult *result;
gchar *cgclass_command;
gchar *wwsm_command;
-} SetAllowedModesContext;
+} SetCurrentModesContext;
static void
-set_allowed_modes_context_complete_and_free (SetAllowedModesContext *ctx)
+set_current_modes_context_complete_and_free (SetCurrentModesContext *ctx)
{
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->result);
@@ -435,7 +435,7 @@ set_allowed_modes_context_complete_and_free (SetAllowedModesContext *ctx)
}
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -445,7 +445,7 @@ set_allowed_modes_finish (MMIfaceModem *self,
static void
wwsm_update_ready (MMBaseModem *self,
GAsyncResult *res,
- SetAllowedModesContext *ctx)
+ SetCurrentModesContext *ctx)
{
GError *error = NULL;
@@ -456,13 +456,13 @@ wwsm_update_ready (MMBaseModem *self,
else
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
}
static void
cgclass_update_ready (MMBaseModem *self,
GAsyncResult *res,
- SetAllowedModesContext *ctx)
+ SetCurrentModesContext *ctx)
{
GError *error = NULL;
@@ -470,13 +470,13 @@ cgclass_update_ready (MMBaseModem *self,
if (error) {
/* Let the error be critical. */
g_simple_async_result_take_error (ctx->result, error);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
return;
}
if (!ctx->wwsm_command) {
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
return;
}
@@ -489,20 +489,20 @@ cgclass_update_ready (MMBaseModem *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
gpointer user_data)
{
- SetAllowedModesContext *ctx;
+ SetCurrentModesContext *ctx;
- ctx = g_new0 (SetAllowedModesContext, 1);
+ ctx = g_new0 (SetCurrentModesContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
/* Handle ANY/NONE */
if (allowed == MM_MODEM_MODE_ANY && preferred == MM_MODEM_MODE_NONE) {
@@ -553,7 +553,7 @@ set_allowed_modes (MMIfaceModem *self,
g_free (allowed_str);
g_free (preferred_str);
- set_allowed_modes_context_complete_and_free (ctx);
+ set_current_modes_context_complete_and_free (ctx);
return;
}
@@ -1186,10 +1186,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_supported_bands = load_supported_bands;
iface->load_supported_bands_finish = load_supported_bands_finish;
iface->load_current_bands = load_current_bands;
diff --git a/plugins/x22x/mm-broadband-modem-x22x.c b/plugins/x22x/mm-broadband-modem-x22x.c
index 3afb08cb..0cfccb4e 100644
--- a/plugins/x22x/mm-broadband-modem-x22x.c
+++ b/plugins/x22x/mm-broadband-modem-x22x.c
@@ -115,7 +115,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -180,7 +180,7 @@ load_allowed_modes_finish (MMIfaceModem *self,
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -196,7 +196,7 @@ load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -221,7 +221,7 @@ allowed_mode_update_ready (MMBroadbandModemX22x *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -234,7 +234,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
if (allowed == MM_MODEM_MODE_2G)
syssel = 1;
@@ -346,10 +346,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_access_technologies_finish = load_access_technologies_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
}
static void
diff --git a/plugins/zte/mm-broadband-modem-zte.c b/plugins/zte/mm-broadband-modem-zte.c
index d4f4f0f8..9c9d8e6d 100644
--- a/plugins/zte/mm-broadband-modem-zte.c
+++ b/plugins/zte/mm-broadband-modem-zte.c
@@ -347,7 +347,7 @@ load_supported_modes (MMIfaceModem *self,
/* Load initial allowed/preferred modes (Modem interface) */
static gboolean
-load_allowed_modes_finish (MMIfaceModem *self,
+load_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
MMModemMode *allowed,
MMModemMode *preferred,
@@ -434,7 +434,7 @@ done:
}
static void
-load_allowed_modes (MMIfaceModem *self,
+load_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -450,7 +450,7 @@ load_allowed_modes (MMIfaceModem *self,
/* Set allowed modes (Modem interface) */
static gboolean
-set_allowed_modes_finish (MMIfaceModem *self,
+set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
@@ -476,7 +476,7 @@ allowed_mode_update_ready (MMBroadbandModemZte *self,
}
static void
-set_allowed_modes (MMIfaceModem *self,
+set_current_modes (MMIfaceModem *self,
MMModemMode allowed,
MMModemMode preferred,
GAsyncReadyCallback callback,
@@ -490,7 +490,7 @@ set_allowed_modes (MMIfaceModem *self,
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
- set_allowed_modes);
+ set_current_modes);
if (allowed == MM_MODEM_MODE_2G) {
cm_mode = 1;
@@ -780,10 +780,10 @@ iface_modem_init (MMIfaceModem *iface)
iface->load_access_technologies_finish = load_access_technologies_finish;
iface->load_supported_modes = load_supported_modes;
iface->load_supported_modes_finish = load_supported_modes_finish;
- iface->load_allowed_modes = load_allowed_modes;
- iface->load_allowed_modes_finish = load_allowed_modes_finish;
- iface->set_allowed_modes = set_allowed_modes;
- iface->set_allowed_modes_finish = set_allowed_modes_finish;
+ iface->load_current_modes = load_current_modes;
+ iface->load_current_modes_finish = load_current_modes_finish;
+ iface->set_current_modes = set_current_modes;
+ iface->set_current_modes_finish = set_current_modes_finish;
iface->load_unlock_retries = load_unlock_retries;
iface->load_unlock_retries_finish = load_unlock_retries_finish;
}