colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

huawei: fix warnings with -Wswitch-enum

Browse Source 
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]
This commit is contained in:
Aleksander Morgado
2020-01-31 07:49:36 +01:00
parent 2753afb73c
commit 23f17ce766
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/huawei/mm-broadband-bearer-huawei.c
View File

@@ -303,6 +303,9 @@ huawei_parse_auth_type (MMBearerAllowedAuth mm_auth)
case MM_BEARER_ALLOWED_AUTH_MSCHAPV2: case MM_BEARER_ALLOWED_AUTH_MSCHAPV2:
return MM_BEARER_HUAWEI_AUTH_MSCHAPV2; return MM_BEARER_HUAWEI_AUTH_MSCHAPV2;
default: 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; return MM_BEARER_HUAWEI_AUTH_UNKNOWN;
} }
} }

36
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -1813,14 +1813,17 @@ huawei_hcsq_changed (MMPortSerialAt *port,
detailed_signal_clear (&self->priv->detailed_signal); detailed_signal_clear (&self->priv->detailed_signal);
switch (act) { /* 2G */
case MM_MODEM_ACCESS_TECHNOLOGY_GSM: if (act == MM_MODEM_ACCESS_TECHNOLOGY_GSM) {
self->priv->detailed_signal.gsm = mm_signal_new (); self->priv->detailed_signal.gsm = mm_signal_new ();
/* value1: gsm_rssi */ /* value1: gsm_rssi */
if (get_rssi_dbm (value1, &v)) if (get_rssi_dbm (value1, &v))
mm_signal_set_rssi (self->priv->detailed_signal.gsm, v); mm_signal_set_rssi (self->priv->detailed_signal.gsm, v);
break; return;
case MM_MODEM_ACCESS_TECHNOLOGY_UMTS: }
/* 3G */
if (act == MM_MODEM_ACCESS_TECHNOLOGY_UMTS) {
self->priv->detailed_signal.umts = mm_signal_new (); self->priv->detailed_signal.umts = mm_signal_new ();
/* value1: wcdma_rssi */ /* value1: wcdma_rssi */
if (get_rssi_dbm (value1, &v)) if (get_rssi_dbm (value1, &v))
@@ -1829,8 +1832,11 @@ huawei_hcsq_changed (MMPortSerialAt *port,
/* value3: wcdma_ecio */ /* value3: wcdma_ecio */
if (get_ecio_db (value3, &v)) if (get_ecio_db (value3, &v))
mm_signal_set_ecio (self->priv->detailed_signal.umts, v); mm_signal_set_ecio (self->priv->detailed_signal.umts, v);
break; return;
case MM_MODEM_ACCESS_TECHNOLOGY_LTE: }
/* 4G */
if (act == MM_MODEM_ACCESS_TECHNOLOGY_LTE) {
self->priv->detailed_signal.lte = mm_signal_new (); self->priv->detailed_signal.lte = mm_signal_new ();
/* value1: lte_rssi */ /* value1: lte_rssi */
if (get_rssi_dbm (value1, &v)) if (get_rssi_dbm (value1, &v))
@@ -1844,11 +1850,10 @@ huawei_hcsq_changed (MMPortSerialAt *port,
/* value4: lte_rsrq */ /* value4: lte_rsrq */
if (get_rsrq_db (value4, &v)) if (get_rsrq_db (value4, &v))
mm_signal_set_rsrq (self->priv->detailed_signal.lte, v); mm_signal_set_rsrq (self->priv->detailed_signal.lte, v);
break; return;
default:
/* CDMA and EVDO not yet supported */
break;
} }
/* CDMA and EVDO not yet supported */
} }
static void static void
@@ -3641,8 +3646,7 @@ huawei_rfswitch_check_ready (MMBaseModem *_self,
} }
} }
switch (self->priv->rfswitch_support) { if (self->priv->rfswitch_support == FEATURE_SUPPORT_UNKNOWN) {
case FEATURE_SUPPORT_UNKNOWN:
if (error) { if (error) {
mm_dbg ("The device does not support ^RFSWITCH"); mm_dbg ("The device does not support ^RFSWITCH");
self->priv->rfswitch_support = FEATURE_NOT_SUPPORTED; self->priv->rfswitch_support = FEATURE_NOT_SUPPORTED;
@@ -3656,12 +3660,6 @@ huawei_rfswitch_check_ready (MMBaseModem *_self,
mm_dbg ("The device supports ^RFSWITCH"); mm_dbg ("The device supports ^RFSWITCH");
self->priv->rfswitch_support = FEATURE_SUPPORTED; self->priv->rfswitch_support = FEATURE_SUPPORTED;
break;
case FEATURE_SUPPORTED:
break;
default:
g_assert_not_reached ();
break;
} }
if (error) if (error)
@@ -3760,6 +3758,7 @@ huawei_modem_power_up (MMIfaceModem *self,
callback, callback,
user_data); user_data);
break; break;
case FEATURE_SUPPORT_UNKNOWN:
default: default:
g_assert_not_reached (); g_assert_not_reached ();
break; break;
@@ -3801,6 +3800,7 @@ huawei_modem_power_down (MMIfaceModem *self,
callback, callback,
user_data); user_data);
break; break;
case FEATURE_SUPPORT_UNKNOWN:
default: default:
g_assert_not_reached (); g_assert_not_reached ();
break; break;