aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/huawei/mm-broadband-modem-huawei.c14
-rw-r--r--plugins/mtk/mm-broadband-modem-mtk.c16
-rw-r--r--plugins/option/mm-broadband-modem-option.c6
-rw-r--r--plugins/simtech/mm-broadband-modem-simtech.c2
-rw-r--r--plugins/via/mm-broadband-modem-via.c2
5 files changed, 20 insertions, 20 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
index a7e40c81..12b518ee 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/plugins/huawei/mm-broadband-modem-huawei.c
@@ -1537,11 +1537,11 @@ huawei_signal_changed (MMPortSerialAt *port,
quality = 0;
} else {
/* Normalize the quality */
- quality = CLAMP (quality, 0, 31) * 100 / 31;
+ quality = MM_CLAMP_HIGH (quality, 31) * 100 / 31;
}
mm_dbg ("3GPP signal quality: %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
@@ -2373,9 +2373,9 @@ huawei_1x_signal_changed (MMPortSerialAt *port,
if (!mm_get_uint_from_match_info (match_info, 1, &quality))
return;
- quality = CLAMP (quality, 0, 100);
+ quality = MM_CLAMP_HIGH (quality, 100);
mm_dbg ("1X signal quality: %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
@@ -2388,9 +2388,9 @@ huawei_evdo_signal_changed (MMPortSerialAt *port,
if (!mm_get_uint_from_match_info (match_info, 1, &quality))
return;
- quality = CLAMP (quality, 0, 100);
+ quality = MM_CLAMP_HIGH (quality, 100);
mm_dbg ("EVDO signal quality: %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
/* Signal quality loading (Modem interface) */
@@ -2459,7 +2459,7 @@ signal_ready (MMBaseModem *self,
buf[i++] = *response++;
if (mm_get_uint_from_str (buf, &quality)) {
- quality = CLAMP (quality, 0, 100);
+ quality = MM_CLAMP_HIGH (quality, 100);
g_task_return_int (task, quality);
} else {
g_task_return_new_error (task,
diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/plugins/mtk/mm-broadband-modem-mtk.c
index dbdd66ac..98620124 100644
--- a/plugins/mtk/mm-broadband-modem-mtk.c
+++ b/plugins/mtk/mm-broadband-modem-mtk.c
@@ -545,10 +545,10 @@ mtk_80_signal_changed (MMPortSerialAt *port,
if (quality == 99)
quality = 0;
else
- quality = CLAMP(quality, 0, 31) * 100 / 31;
+ quality = MM_CLAMP_HIGH (quality, 31) * 100 / 31;
mm_dbg ("6280 signal quality URC received: quality = %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
@@ -564,10 +564,10 @@ mtk_90_2g_signal_changed (MMPortSerialAt *port,
if (quality == 99)
quality = 0;
else
- quality = CLAMP (quality, 0, 63) * 100 / 63;
+ quality = MM_CLAMP_HIGH (quality, 63) * 100 / 63;
mm_dbg ("2G signal quality URC received: quality = %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
@@ -580,10 +580,10 @@ mtk_90_3g_signal_changed (MMPortSerialAt *port,
if (!mm_get_uint_from_match_info (match_info, 1, &quality))
return;
- quality = CLAMP (quality, 0, 96) * 100 / 96;
+ quality = MM_CLAMP_HIGH (quality, 96) * 100 / 96;
mm_dbg ("3G signal quality URC received: quality = %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
@@ -596,10 +596,10 @@ mtk_90_4g_signal_changed (MMPortSerialAt *port,
if (!mm_get_uint_from_match_info (match_info, 1, &quality))
return;
- quality = CLAMP (quality, 0, 97) * 100 / 97;
+ quality = MM_CLAMP_HIGH (quality, 97) * 100 / 97;
mm_dbg ("4G signal quality URC received: quality = %u", quality);
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
diff --git a/plugins/option/mm-broadband-modem-option.c b/plugins/option/mm-broadband-modem-option.c
index 82ec58d0..268cb531 100644
--- a/plugins/option/mm-broadband-modem-option.c
+++ b/plugins/option/mm-broadband-modem-option.c
@@ -808,7 +808,7 @@ option_signal_changed (MMPortSerialAt *port,
MMBroadbandModemOption *self)
{
gchar *str;
- gint quality = 0;
+ guint quality = 0;
str = g_match_info_fetch (match_info, 1);
if (str) {
@@ -821,10 +821,10 @@ option_signal_changed (MMPortSerialAt *port,
quality = 0;
} else {
/* Normalize the quality */
- quality = CLAMP (quality, 0, 31) * 100 / 31;
+ quality = MM_CLAMP_HIGH (quality, 31) * 100 / 31;
}
- mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), (guint)quality);
+ mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}
static void
diff --git a/plugins/simtech/mm-broadband-modem-simtech.c b/plugins/simtech/mm-broadband-modem-simtech.c
index 21781dc9..246ce682 100644
--- a/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/plugins/simtech/mm-broadband-modem-simtech.c
@@ -116,7 +116,7 @@ simtech_signal_changed (MMPortSerialAt *port,
return;
if (quality != 99)
- quality = CLAMP (quality, 0, 31) * 100 / 31;
+ quality = MM_CLAMP_HIGH (quality, 31) * 100 / 31;
else
quality = 0;
diff --git a/plugins/via/mm-broadband-modem-via.c b/plugins/via/mm-broadband-modem-via.c
index 968e62da..6e2cfe61 100644
--- a/plugins/via/mm-broadband-modem-via.c
+++ b/plugins/via/mm-broadband-modem-via.c
@@ -281,7 +281,7 @@ handle_evdo_quality_change (MMPortSerialAt *port,
guint quality = 0;
if (mm_get_uint_from_match_info (match_info, 1, &quality)) {
- quality = CLAMP (quality, 0, 100);
+ quality = MM_CLAMP_HIGH (quality, 100);
mm_dbg ("EVDO signal quality: %u", quality);
mm_iface_modem_update_signal_quality (MM_IFACE_MODEM (self), quality);
}