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

xmm: minor alignment fixes

Browse Source
This commit is contained in:
Aleksander Morgado
2018-09-13 09:30:02 +02:00
parent 823aa46a14
commit 2f14012399
3 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/xmm/mm-modem-helpers-xmm.c
+17 -17
View File
@@ -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);
}
plugins/xmm/mm-modem-helpers-xmm.h
+5 -5
View File
@@ -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 */
plugins/xmm/mm-shared-xmm.c
+12 -15
View File
@@ -688,9 +688,6 @@ mm_shared_xmm_power_up (MMIfaceModem *self,
common_modem_power_operation (MM_SHARED_XMM (self), "+CFUN=1", callback, user_data);
}
/*****************************************************************************/
/*****************************************************************************/
/* Check support (Signal interface) */
@@ -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?",