diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2018-09-13 09:29:52 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-09-13 09:30:02 +0200 |
| commit | 2f140123995642b5c186b1bab203b4d16380563a (patch) | |
| tree | db26f9351c02b6be8ff338d8bafe77341917bb49 | |
| parent | 823aa46a148725e9e1bf4f38517230f384dc0f9a (diff) | |
| download | ModemManager-2f140123995642b5c186b1bab203b4d16380563a.tar.gz | |
xmm: minor alignment fixes
| -rw-r--r-- | plugins/xmm/mm-modem-helpers-xmm.c | 34 | ||||
| -rw-r--r-- | plugins/xmm/mm-modem-helpers-xmm.h | 10 | ||||
| -rw-r--r-- | plugins/xmm/mm-shared-xmm.c | 27 |
3 files changed, 34 insertions, 37 deletions
diff --git a/plugins/xmm/mm-modem-helpers-xmm.c b/plugins/xmm/mm-modem-helpers-xmm.c index 083c1adf5..1ef8f3841 100644 --- a/plugins/xmm/mm-modem-helpers-xmm.c +++ b/plugins/xmm/mm-modem-helpers-xmm.c @@ -597,16 +597,17 @@ mm_xmm_get_modem_mode_any (const GArray *combinations) /*****************************************************************************/ /* +XCESQ? response parser */ + gboolean -mm_xmm_parse_xcesq_query_response (const gchar *response, - guint *out_rxlev, - guint *out_ber, - guint *out_rscp, - guint *out_ecn0, - guint *out_rsrq, - guint *out_rsrp, - gint *out_rssnr, - GError **error) +mm_xmm_parse_xcesq_query_response (const gchar *response, + guint *out_rxlev, + guint *out_ber, + guint *out_rscp, + guint *out_ecn0, + guint *out_rsrq, + guint *out_rsrp, + gint *out_rssnr, + GError **error) { GRegex *r; GMatchInfo *match_info; @@ -712,15 +713,15 @@ rssnr_level_to_rssnr (gint rssnr_level, return FALSE; } - /*****************************************************************************/ /* Get extended signal information */ + gboolean -mm_xmm_xcesq_response_to_signal_info (const gchar *response, - MMSignal **out_gsm, - MMSignal **out_umts, - MMSignal **out_lte, - GError **error) +mm_xmm_xcesq_response_to_signal_info (const gchar *response, + MMSignal **out_gsm, + MMSignal **out_umts, + MMSignal **out_lte, + GError **error) { guint rxlev = 0; guint ber = 0; @@ -768,8 +769,7 @@ mm_xmm_xcesq_response_to_signal_info (const gchar *response, } /* Calculate RSSI if we have ecio and rscp */ - if (umts && ecio != -G_MAXDOUBLE && rscp != -G_MAXDOUBLE) - { + if (umts && ecio != -G_MAXDOUBLE && rscp != -G_MAXDOUBLE) { mm_signal_set_rssi (umts, rscp - ecio); } diff --git a/plugins/xmm/mm-modem-helpers-xmm.h b/plugins/xmm/mm-modem-helpers-xmm.h index 8d7157ecd..1d65936e4 100644 --- a/plugins/xmm/mm-modem-helpers-xmm.h +++ b/plugins/xmm/mm-modem-helpers-xmm.h @@ -49,10 +49,10 @@ gboolean mm_xmm_parse_xcesq_query_response (const gchar *response, gint *out_rssnr, GError **error); -gboolean mm_xmm_xcesq_response_to_signal_info (const gchar *response, - MMSignal **out_gsm, - MMSignal **out_umts, - MMSignal **out_lte, - GError **error); +gboolean mm_xmm_xcesq_response_to_signal_info (const gchar *response, + MMSignal **out_gsm, + MMSignal **out_umts, + MMSignal **out_lte, + GError **error); #endif /* MM_MODEM_HELPERS_XMM_H */ diff --git a/plugins/xmm/mm-shared-xmm.c b/plugins/xmm/mm-shared-xmm.c index 3aa85c2df..b00610183 100644 --- a/plugins/xmm/mm-shared-xmm.c +++ b/plugins/xmm/mm-shared-xmm.c @@ -689,9 +689,6 @@ mm_shared_xmm_power_up (MMIfaceModem *self, } /*****************************************************************************/ - - -/*****************************************************************************/ /* Check support (Signal interface) */ gboolean @@ -719,14 +716,14 @@ mm_shared_xmm_signal_check_support (MMIfaceModemSignal *self, /* Load extended signal information (Signal interface) */ gboolean -mm_shared_xmm_signal_load_values_finish (MMIfaceModemSignal *self, - GAsyncResult *res, - MMSignal **cdma, - MMSignal **evdo, - MMSignal **gsm, - MMSignal **umts, - MMSignal **lte, - GError **error) +mm_shared_xmm_signal_load_values_finish (MMIfaceModemSignal *self, + GAsyncResult *res, + MMSignal **cdma, + MMSignal **evdo, + MMSignal **gsm, + MMSignal **umts, + MMSignal **lte, + GError **error) { const gchar *response; @@ -743,10 +740,10 @@ mm_shared_xmm_signal_load_values_finish (MMIfaceModemSignal *self, } void -mm_shared_xmm_signal_load_values (MMIfaceModemSignal *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +mm_shared_xmm_signal_load_values (MMIfaceModemSignal *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { mm_base_modem_at_command (MM_BASE_MODEM (self), "+XCESQ?", |