From 6ec12add1ba6625a8470ae3cf7b30cefcf28d503 Mon Sep 17 00:00:00 2001 From: Justin Standring Date: Thu, 16 Jul 2020 12:55:31 +1200 Subject: [PATCH] broadband-modem-qmi: fix object logging with WITH_NEWEST_QMI_COMMANDS mm-broadband-modem-qmi.c: In function 'common_signal_info_get_quality': mm-broadband-modem-qmi.c:1469:21: error: 'self' undeclared (first use in this function) mm_obj_dbg (self, "RSSI (CDMA): %d dBm", cdma1x_rssi); ^~~~ mm-broadband-modem-qmi.c:1469:21: note: each undeclared identifier is reported only once for each function it appears in mm_obj_dbg (self, "RSSI (CDMA): %d dBm", cdma1x_rssi); ^~~~ mm-broadband-modem-qmi.c: In function 'process_gsm_info': mm-broadband-modem-qmi.c:2992:25: error: 'self' undeclared (first use in this function) mm_obj_dbg (self, "no GSM service reported"); ^~~~ mm-broadband-modem-qmi.c: In function 'process_wcdma_info': mm-broadband-modem-qmi.c:3100:25: error: 'self' undeclared (first use in this function) mm_obj_dbg (self, "no WCDMA service reported"); ^~~~ mm-broadband-modem-qmi.c: In function 'process_lte_info': mm-broadband-modem-qmi.c:3209:25: error: 'self' undeclared (first use in this function) mm_obj_dbg (self, "no LTE service reported"); ^~~~ mm-broadband-modem-qmi.c: In function 'config_signal_info_ready': mm-broadband-modem-qmi.c:4890:21: error: 'self' undeclared (first use in this function) mm_obj_dbg (self, "QMI operation failed: '%s'", error->message); ^~~~ Signed-off-by: Justin Standring --- src/mm-broadband-modem-qmi.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 1febe628..0711a467 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -1445,7 +1445,8 @@ load_signal_quality_finish (MMIfaceModem *self, #if defined WITH_NEWEST_QMI_COMMANDS static gboolean -common_signal_info_get_quality (gint8 cdma1x_rssi, +common_signal_info_get_quality (MMBroadbandModemQmi *self, + gint8 cdma1x_rssi, gint8 evdo_rssi, gint8 gsm_rssi, gint8 wcdma_rssi, @@ -1535,7 +1536,7 @@ signal_info_get_quality (MMBroadbandModemQmi *self, qmi_message_nas_get_signal_info_output_get_wcdma_signal_strength (output, &wcdma_rssi, NULL, NULL); qmi_message_nas_get_signal_info_output_get_lte_signal_strength (output, <e_rssi, NULL, NULL, NULL, NULL); - return common_signal_info_get_quality (cdma1x_rssi, evdo_rssi, gsm_rssi, wcdma_rssi, lte_rssi, out_quality, out_act); + return common_signal_info_get_quality (self, cdma1x_rssi, evdo_rssi, gsm_rssi, wcdma_rssi, lte_rssi, out_quality, out_act); } static void @@ -2932,7 +2933,8 @@ process_common_info (QmiNasServiceStatus service_status, } static gboolean -process_gsm_info (QmiMessageNasGetSystemInfoOutput *response_output, +process_gsm_info (MMBroadbandModemQmi *self, + QmiMessageNasGetSystemInfoOutput *response_output, QmiIndicationNasSystemInfoOutput *indication_output, MMModem3gppRegistrationState *mm_cs_registration_state, MMModem3gppRegistrationState *mm_ps_registration_state, @@ -3037,7 +3039,8 @@ process_gsm_info (QmiMessageNasGetSystemInfoOutput *response_output, } static gboolean -process_wcdma_info (QmiMessageNasGetSystemInfoOutput *response_output, +process_wcdma_info (MMBroadbandModemQmi *self, + QmiMessageNasGetSystemInfoOutput *response_output, QmiIndicationNasSystemInfoOutput *indication_output, MMModem3gppRegistrationState *mm_cs_registration_state, MMModem3gppRegistrationState *mm_ps_registration_state, @@ -3146,7 +3149,8 @@ process_wcdma_info (QmiMessageNasGetSystemInfoOutput *response_output, } static gboolean -process_lte_info (QmiMessageNasGetSystemInfoOutput *response_output, +process_lte_info (MMBroadbandModemQmi *self, + QmiMessageNasGetSystemInfoOutput *response_output, QmiIndicationNasSystemInfoOutput *indication_output, MMModem3gppRegistrationState *mm_cs_registration_state, MMModem3gppRegistrationState *mm_ps_registration_state, @@ -3276,7 +3280,7 @@ common_process_system_info_3gpp (MMBroadbandModemQmi *self, * LTE > WCDMA > GSM * The first one giving results will be the one reported. */ - has_lte_info = process_lte_info (response_output, indication_output, + has_lte_info = process_lte_info (self, response_output, indication_output, &cs_registration_state, &ps_registration_state, &lac, @@ -3284,13 +3288,13 @@ common_process_system_info_3gpp (MMBroadbandModemQmi *self, &cid, &operator_id); if (!has_lte_info && - !process_wcdma_info (response_output, indication_output, + !process_wcdma_info (self, response_output, indication_output, &cs_registration_state, &ps_registration_state, &lac, &cid, &operator_id) && - !process_gsm_info (response_output, indication_output, + !process_gsm_info (self, response_output, indication_output, &cs_registration_state, &ps_registration_state, &lac, @@ -4814,8 +4818,11 @@ config_signal_info_ready (QmiClientNas *client, GAsyncResult *res, GTask *task) { - g_autoptr(QmiMessageNasConfigSignalInfoOutput) output = NULL; - g_autoptr(GError) error = NULL; + MMBroadbandModemQmi *self; + g_autoptr(QmiMessageNasConfigSignalInfoOutput) output = NULL; + g_autoptr(GError) error = NULL; + + self = g_task_get_source_object (task); output = qmi_client_nas_config_signal_info_finish (client, res, &error); if (!output || !qmi_message_nas_config_signal_info_output_get_result (output, &error)) @@ -5039,7 +5046,8 @@ signal_info_indication_cb (QmiClientNas *client, qmi_indication_nas_signal_info_output_get_wcdma_signal_strength (output, &wcdma_rssi, NULL, NULL); qmi_indication_nas_signal_info_output_get_lte_signal_strength (output, <e_rssi, NULL, NULL, NULL, NULL); - if (common_signal_info_get_quality (cdma1x_rssi, + if (common_signal_info_get_quality (self, + cdma1x_rssi, evdo_rssi, gsm_rssi, wcdma_rssi,