aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2020-01-31 07:49:36 +0100
committerAleksander Morgado <aleksander@aleksander.es>2020-01-31 15:18:35 +0100
commit23f17ce766f12ec053a63948a92bb55b27c05376 (patch)
tree033b45fbd4895091de56eb5e2bf43d4e1325c4f5
parent2753afb73c3c3acff1d34e477d3a6ebbb91f4f8b (diff)
huawei: fix warnings with -Wswitch-enum
huawei/mm-broadband-modem-huawei.c: In function ‘huawei_hcsq_changed’: huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN’ not handled in switch [-Werror=switch-enum] 1816 | switch (act) { | ^~~~~~ huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_POTS’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_GSM_COMPACT’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_GPRS’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_EDGE’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_HSDPA’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_HSUPA’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_HSPA’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_HSPA_PLUS’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_1XRTT’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_EVDO0’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_EVDOA’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_EVDOB’ not handled in switch [-Werror=switch-enum] huawei/mm-broadband-modem-huawei.c:1816:5: error: enumeration value ‘MM_MODEM_ACCESS_TECHNOLOGY_ANY’ not handled in switch [-Werror=switch-enum]
-rw-r--r--plugins/huawei/mm-broadband-bearer-huawei.c3
-rw-r--r--plugins/huawei/mm-broadband-modem-huawei.c36
2 files changed, 21 insertions, 18 deletions
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/plugins/huawei/mm-broadband-bearer-huawei.c
index 01a46c61..29ffec18 100644
--- a/plugins/huawei/mm-broadband-bearer-huawei.c
+++ b/plugins/huawei/mm-broadband-bearer-huawei.c
@@ -303,6 +303,9 @@ huawei_parse_auth_type (MMBearerAllowedAuth mm_auth)
case MM_BEARER_ALLOWED_AUTH_MSCHAPV2:
return MM_BEARER_HUAWEI_AUTH_MSCHAPV2;
default:
+ case MM_BEARER_ALLOWED_AUTH_UNKNOWN:
+ case MM_BEARER_ALLOWED_AUTH_MSCHAP:
+ case MM_BEARER_ALLOWED_AUTH_EAP:
return MM_BEARER_HUAWEI_AUTH_UNKNOWN;
}
}
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
index 12b518ee..1fbd3d2b 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/plugins/huawei/mm-broadband-modem-huawei.c
@@ -1813,14 +1813,17 @@ huawei_hcsq_changed (MMPortSerialAt *port,
detailed_signal_clear (&self->priv->detailed_signal);
- switch (act) {
- case MM_MODEM_ACCESS_TECHNOLOGY_GSM:
+ /* 2G */
+ if (act == MM_MODEM_ACCESS_TECHNOLOGY_GSM) {
self->priv->detailed_signal.gsm = mm_signal_new ();
/* value1: gsm_rssi */
if (get_rssi_dbm (value1, &v))
mm_signal_set_rssi (self->priv->detailed_signal.gsm, v);
- break;
- case MM_MODEM_ACCESS_TECHNOLOGY_UMTS:
+ return;
+ }
+
+ /* 3G */
+ if (act == MM_MODEM_ACCESS_TECHNOLOGY_UMTS) {
self->priv->detailed_signal.umts = mm_signal_new ();
/* value1: wcdma_rssi */
if (get_rssi_dbm (value1, &v))
@@ -1829,8 +1832,11 @@ huawei_hcsq_changed (MMPortSerialAt *port,
/* value3: wcdma_ecio */
if (get_ecio_db (value3, &v))
mm_signal_set_ecio (self->priv->detailed_signal.umts, v);
- break;
- case MM_MODEM_ACCESS_TECHNOLOGY_LTE:
+ return;
+ }
+
+ /* 4G */
+ if (act == MM_MODEM_ACCESS_TECHNOLOGY_LTE) {
self->priv->detailed_signal.lte = mm_signal_new ();
/* value1: lte_rssi */
if (get_rssi_dbm (value1, &v))
@@ -1844,11 +1850,10 @@ huawei_hcsq_changed (MMPortSerialAt *port,
/* value4: lte_rsrq */
if (get_rsrq_db (value4, &v))
mm_signal_set_rsrq (self->priv->detailed_signal.lte, v);
- break;
- default:
- /* CDMA and EVDO not yet supported */
- break;
+ return;
}
+
+ /* CDMA and EVDO not yet supported */
}
static void
@@ -3641,8 +3646,7 @@ huawei_rfswitch_check_ready (MMBaseModem *_self,
}
}
- switch (self->priv->rfswitch_support) {
- case FEATURE_SUPPORT_UNKNOWN:
+ if (self->priv->rfswitch_support == FEATURE_SUPPORT_UNKNOWN) {
if (error) {
mm_dbg ("The device does not support ^RFSWITCH");
self->priv->rfswitch_support = FEATURE_NOT_SUPPORTED;
@@ -3656,12 +3660,6 @@ huawei_rfswitch_check_ready (MMBaseModem *_self,
mm_dbg ("The device supports ^RFSWITCH");
self->priv->rfswitch_support = FEATURE_SUPPORTED;
- break;
- case FEATURE_SUPPORTED:
- break;
- default:
- g_assert_not_reached ();
- break;
}
if (error)
@@ -3760,6 +3758,7 @@ huawei_modem_power_up (MMIfaceModem *self,
callback,
user_data);
break;
+ case FEATURE_SUPPORT_UNKNOWN:
default:
g_assert_not_reached ();
break;
@@ -3801,6 +3800,7 @@ huawei_modem_power_down (MMIfaceModem *self,
callback,
user_data);
break;
+ case FEATURE_SUPPORT_UNKNOWN:
default:
g_assert_not_reached ();
break;