aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/novatel/mm-broadband-bearer-novatel-lte.c69
-rw-r--r--plugins/novatel/mm-broadband-modem-novatel-lte.c13
-rw-r--r--plugins/novatel/mm-broadband-modem-novatel.c98
-rw-r--r--plugins/novatel/mm-common-novatel.c39
-rw-r--r--plugins/novatel/mm-plugin-novatel-lte.c1
-rw-r--r--plugins/novatel/mm-plugin-novatel.c4
-rw-r--r--plugins/novatel/mm-sim-novatel-lte.c2
7 files changed, 114 insertions, 112 deletions
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
index 72001efa..43eeed19 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
@@ -30,7 +30,7 @@
#include "mm-base-modem-at.h"
#include "mm-broadband-bearer-novatel-lte.h"
-#include "mm-log.h"
+#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#define QMISTATUS_TAG "$NWQMISTATUS:"
@@ -176,32 +176,36 @@ connect_3gpp_qmistatus_ready (MMBaseModem *modem,
GAsyncResult *res,
GTask *task)
{
+ MMBroadbandBearerNovatelLte *self;
DetailedConnectContext *ctx;
const gchar *result;
gchar *normalized_result;
GError *error = NULL;
+ self = g_task_get_source_object (task);
+ ctx = g_task_get_task_data (task);
+
if (g_task_return_error_if_cancelled (task)) {
g_object_unref (task);
return;
}
- ctx = g_task_get_task_data (task);
-
result = mm_base_modem_at_command_full_finish (modem, res, &error);
if (!result) {
- mm_warn ("QMI connection status failed: %s", error->message);
if (!g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN)) {
g_task_return_error (task, error);
g_object_unref (task);
return;
}
+ mm_obj_dbg (self, "connection status failed: %s; will retry", error->message);
g_error_free (error);
- result = "Unknown error";
- } else if (is_qmistatus_connected (result)) {
+ goto retry;
+ }
+
+ if (is_qmistatus_connected (result)) {
MMBearerIpConfig *config;
- mm_dbg("Connected");
+ mm_obj_dbg (self, "connected");
config = mm_bearer_ip_config_new ();
mm_bearer_ip_config_set_method (config, MM_BEARER_IP_METHOD_DHCP);
g_task_return_pointer (
@@ -211,17 +215,18 @@ connect_3gpp_qmistatus_ready (MMBaseModem *modem,
g_object_unref (task);
g_object_unref (config);
return;
- } else if (is_qmistatus_call_failed (result)) {
- /* Don't retry if the call failed */
- ctx->retries = 0;
}
- mm_dbg ("Error: '%s'", result);
+ /* Don't retry if the call failed */
+ if (is_qmistatus_call_failed (result)) {
+ mm_obj_dbg (self, "not retrying: call failed");
+ ctx->retries = 0;
+ }
+retry:
if (ctx->retries > 0) {
ctx->retries--;
- mm_dbg ("Retrying status check in a second. %d retries left.",
- ctx->retries);
+ mm_obj_dbg (self, "retrying status check in a second: %d retries left", ctx->retries);
g_timeout_add_seconds (1, (GSourceFunc)connect_3gpp_qmistatus, task);
return;
}
@@ -268,7 +273,6 @@ connect_3gpp_qmiconnect_ready (MMBaseModem *modem,
result = mm_base_modem_at_command_full_finish (modem, res, &error);
if (!result) {
- mm_warn ("QMI connection failed: %s", error->message);
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -381,27 +385,30 @@ disconnect_3gpp_finish (MMBroadbandBearer *self,
static gboolean disconnect_3gpp_qmistatus (GTask *task);
static void
-disconnect_3gpp_status_ready (MMBaseModem *modem,
+disconnect_3gpp_status_ready (MMBaseModem *modem,
GAsyncResult *res,
- GTask *task)
+ GTask *task)
{
- DetailedDisconnectContext *ctx;
- const gchar *result;
- GError *error = NULL;
- gboolean is_connected = FALSE;
+ MMBroadbandBearerNovatelLte *self;
+ DetailedDisconnectContext *ctx;
+ const gchar *result;
+ GError *error = NULL;
+ gboolean is_connected = FALSE;
+
+ self = g_task_get_source_object (task);
result = mm_base_modem_at_command_full_finish (modem, res, &error);
if (result) {
- mm_dbg ("QMI connection status: %s", result);
+ mm_obj_dbg (self, "QMI connection status: %s", result);
if (is_qmistatus_disconnected (result)) {
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
- } else if (is_qmistatus_connected (result)) {
- is_connected = TRUE;
}
+ if (is_qmistatus_connected (result))
+ is_connected = TRUE;
} else {
- mm_dbg ("QMI connection status failed: %s", error->message);
+ mm_obj_dbg (self, "QMI connection status failed: %s", error->message);
g_error_free (error);
result = "Unknown error";
}
@@ -410,8 +417,7 @@ disconnect_3gpp_status_ready (MMBaseModem *modem,
if (ctx->retries > 0) {
ctx->retries--;
- mm_dbg ("Retrying status check in a second. %d retries left.",
- ctx->retries);
+ mm_obj_dbg (self, "retrying status check in a second: %d retries left", ctx->retries);
g_timeout_add_seconds (1, (GSourceFunc)disconnect_3gpp_qmistatus, task);
return;
}
@@ -457,15 +463,18 @@ disconnect_3gpp_qmistatus (GTask *task)
static void
-disconnect_3gpp_check_status (MMBaseModem *modem,
+disconnect_3gpp_check_status (MMBaseModem *modem,
GAsyncResult *res,
- GTask *task)
+ GTask *task)
{
- GError *error = NULL;
+ MMBroadbandBearerNovatelLte *self;
+ GError *error = NULL;
+
+ self = g_task_get_source_object (task);
mm_base_modem_at_command_full_finish (modem, res, &error);
if (error) {
- mm_dbg("Disconnection error: %s", error->message);
+ mm_obj_dbg (self, "disconnection error: %s", error->message);
g_error_free (error);
}
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.c b/plugins/novatel/mm-broadband-modem-novatel-lte.c
index 6b5d0490..5628c2e8 100644
--- a/plugins/novatel/mm-broadband-modem-novatel-lte.c
+++ b/plugins/novatel/mm-broadband-modem-novatel-lte.c
@@ -31,7 +31,7 @@
#include "mm-iface-modem.h"
#include "mm-iface-modem-3gpp.h"
#include "mm-iface-modem-messaging.h"
-#include "mm-log.h"
+#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-serial-parsers.h"
@@ -256,7 +256,6 @@ load_own_numbers (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- mm_dbg ("loading (Novatel LTE) own numbers...");
mm_base_modem_at_sequence (
MM_BASE_MODEM (self),
own_numbers_commands,
@@ -365,7 +364,6 @@ load_current_bands_done (MMIfaceModem *self,
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!response) {
- mm_dbg ("Couldn't query supported bands: '%s'", error->message);
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -424,7 +422,6 @@ load_unlock_retries_ready (MMBaseModem *self,
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!response) {
- mm_dbg ("Couldn't query unlock retries: '%s'", error->message);
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -499,7 +496,6 @@ load_access_technologies_ready (MMIfaceModem *self,
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!response) {
- mm_dbg ("Couldn't query access technology: '%s'", error->message);
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -598,7 +594,7 @@ scan_networks (MMIfaceModem3gpp *self,
GTask *task;
MMModemAccessTechnology access_tech;
- mm_dbg ("scanning for networks (Novatel LTE)...");
+ mm_obj_dbg (self, "scanning for networks (Novatel LTE)...");
task = g_task_new (self, NULL, callback, user_data);
@@ -608,17 +604,16 @@ scan_networks (MMIfaceModem3gpp *self,
*/
access_tech = mm_iface_modem_get_access_technologies (MM_IFACE_MODEM (self));
if (access_tech & MM_MODEM_ACCESS_TECHNOLOGY_LTE) {
- gchar *access_tech_string;
+ g_autofree gchar *access_tech_string = NULL;
access_tech_string = mm_modem_access_technology_build_string_from_mask (access_tech);
- mm_warn ("Couldn't scan for networks with access technologies: %s", access_tech_string);
+ mm_obj_warn (self, "couldn't scan for networks with access technologies: %s", access_tech_string);
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED,
"Couldn't scan for networks with access technologies: %s",
access_tech_string);
g_object_unref (task);
- g_free (access_tech_string);
return;
}
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel.c
index 3a07b555..086ea637 100644
--- a/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/plugins/novatel/mm-broadband-modem-novatel.c
@@ -35,7 +35,7 @@
#include "mm-modem-helpers.h"
#include "libqcdm/src/commands.h"
#include "libqcdm/src/result.h"
-#include "mm-log.h"
+#include "mm-log-object.h"
static void iface_modem_init (MMIfaceModem *iface);
static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
@@ -413,7 +413,7 @@ nw_snapshot_old_ready (MMPortSerialQcdm *port,
response = mm_port_serial_qcdm_command_finish (port, res, &error);
if (error) {
/* Just ignore the error and complete with the input info */
- mm_dbg ("Couldn't run QCDM Novatel Modem MSM6500 snapshot: '%s'", error->message);
+ g_prefix_error (&error, "Couldn't run QCDM Novatel Modem MSM6500 snapshot: ");
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -423,7 +423,7 @@ nw_snapshot_old_ready (MMPortSerialQcdm *port,
result = qcdm_cmd_nw_subsys_modem_snapshot_cdma_result ((const gchar *) response->data, response->len, NULL);
g_byte_array_unref (response);
if (!result) {
- mm_dbg ("Failed to get QCDM Novatel Modem MSM6500 snapshot: %s", error->message);
+ g_prefix_error (&error, "Failed to get QCDM Novatel Modem MSM6500 snapshot: ");
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -439,18 +439,21 @@ nw_snapshot_old_ready (MMPortSerialQcdm *port,
static void
nw_snapshot_new_ready (MMPortSerialQcdm *port,
- GAsyncResult *res,
- GTask *task)
+ GAsyncResult *res,
+ GTask *task)
{
- QcdmResult *result;
- GByteArray *nwsnap;
- GError *error = NULL;
- GByteArray *response;
- guint8 hdr_revision = QCDM_HDR_REV_UNKNOWN;
+ MMBroadbandModemNovatel *self;
+ QcdmResult *result;
+ GByteArray *nwsnap;
+ GError *error = NULL;
+ GByteArray *response;
+ guint8 hdr_revision = QCDM_HDR_REV_UNKNOWN;
+
+ self = g_task_get_source_object (task);
response = mm_port_serial_qcdm_command_finish (port, res, &error);
if (error) {
- mm_dbg ("Couldn't run QCDM Novatel Modem MSM6800 snapshot: '%s'", error->message);
+ g_prefix_error (&error, "couldn't run QCDM Novatel Modem MSM6800 snapshot: ");
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -469,7 +472,7 @@ nw_snapshot_new_ready (MMPortSerialQcdm *port,
return;
}
- mm_dbg ("Failed to get QCDM Novatel Modem MSM6800 snapshot.");
+ mm_obj_dbg (self, "failed to get QCDM Novatel Modem MSM6800 snapshot");
/* Try for MSM6500 */
nwsnap = g_byte_array_sized_new (25);
@@ -498,9 +501,7 @@ get_evdo_version (MMBaseModem *self,
port = mm_base_modem_get_port_qcdm (self);
if (!port) {
- error = g_error_new (MM_CORE_ERROR,
- MM_CORE_ERROR_FAILED,
- "No available QCDM port.");
+ error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "No available QCDM port");
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -508,7 +509,7 @@ get_evdo_version (MMBaseModem *self,
g_task_set_task_data (task, port, (GDestroyNotify) close_and_unref_port);
if (!mm_port_serial_open (MM_PORT_SERIAL (port), &error)) {
- g_prefix_error (&error, "Couldn't open QCDM port: ");
+ g_prefix_error (&error, "couldn't open QCDM port: ");
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -543,24 +544,24 @@ modem_load_access_technologies_finish (MMIfaceModem *self,
guint *mask,
GError **error)
{
- GTask *task = G_TASK (res);
- AccessTechContext *ctx = g_task_get_task_data (task);
+ AccessTechContext *ctx;
- if (!g_task_propagate_boolean (task, error))
+ if (!g_task_propagate_boolean (G_TASK (res), error))
return FALSE;
/* Update access technology with specific EVDO revision from QCDM if we have them */
+ ctx = g_task_get_task_data (G_TASK (res));
if (ctx->act & MM_IFACE_MODEM_CDMA_ALL_EVDO_ACCESS_TECHNOLOGIES_MASK) {
if (ctx->hdr_revision == QCDM_HDR_REV_0) {
- mm_dbg ("Novatel Modem Snapshot EVDO revision: 0");
+ mm_obj_dbg (self, "novatel modem snapshot EVDO revision: 0");
ctx->act &= ~MM_IFACE_MODEM_CDMA_ALL_EVDO_ACCESS_TECHNOLOGIES_MASK;
ctx->act |= MM_MODEM_ACCESS_TECHNOLOGY_EVDO0;
} else if (ctx->hdr_revision == QCDM_HDR_REV_A) {
- mm_dbg ("Novatel Modem Snapshot EVDO revision: A");
+ mm_obj_dbg (self, "novatel modem snapshot EVDO revision: A");
ctx->act &= ~MM_IFACE_MODEM_CDMA_ALL_EVDO_ACCESS_TECHNOLOGIES_MASK;
ctx->act |= MM_MODEM_ACCESS_TECHNOLOGY_EVDOA;
} else
- mm_dbg ("Novatel Modem Snapshot EVDO revision: %d (unknown)", ctx->hdr_revision);
+ mm_obj_dbg (self, "novatel modem snapshot EVDO revision: %d (unknown)", ctx->hdr_revision);
}
*access_technologies = ctx->act;
@@ -820,7 +821,6 @@ modem_load_signal_quality (MMIfaceModem *self,
{
GTask *task;
- mm_dbg ("loading signal quality...");
task = g_task_new (self, NULL, callback, user_data);
/* 3GPP modems can just run parent's signal quality loading */
@@ -865,7 +865,7 @@ qcmipgetp_ready (MMBaseModem *self,
if (!response)
g_task_return_error (task, error);
else {
- mm_dbg ("Current profile information retrieved: %s", response);
+ mm_obj_dbg (self, "current profile information retrieved: %s", response);
g_task_return_boolean (task, TRUE);
}
g_object_unref (task);
@@ -1044,14 +1044,14 @@ cdma_activation_step (GTask *task)
switch (ctx->step) {
case CDMA_ACTIVATION_STEP_FIRST:
- mm_dbg ("Launching manual activation...");
+ mm_obj_dbg (self, "launching manual activation...");
ctx->step++;
/* fall-through */
case CDMA_ACTIVATION_STEP_REQUEST_ACTIVATION: {
gchar *command;
- mm_info ("Activation step [1/5]: setting up activation details");
+ mm_obj_info (self, "activation step [1/5]: setting up activation details");
command = g_strdup_printf ("$NWACTIVATION=%s,%s,%s",
mm_cdma_manual_activation_properties_get_spc (ctx->properties),
mm_cdma_manual_activation_properties_get_mdn (ctx->properties),
@@ -1067,7 +1067,7 @@ cdma_activation_step (GTask *task)
}
case CDMA_ACTIVATION_STEP_OTA_UPDATE:
- mm_info ("Activation step [2/5]: starting OTA activation");
+ mm_obj_info (self, "activation step [2/5]: starting OTA activation");
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+IOTA=1",
20,
@@ -1077,7 +1077,7 @@ cdma_activation_step (GTask *task)
return;
case CDMA_ACTIVATION_STEP_PRL_UPDATE:
- mm_info ("Activation step [3/5]: starting PRL update");
+ mm_obj_info (self, "activation step [3/5]: starting PRL update");
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+IOTA=2",
20,
@@ -1087,7 +1087,7 @@ cdma_activation_step (GTask *task)
return;
case CDMA_ACTIVATION_STEP_WAIT_UNTIL_FINISHED:
- mm_info ("Activation step [4/5]: checking activation process status");
+ mm_obj_info (self, "activation step [4/5]: checking activation process status");
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+IOTA?",
20,
@@ -1097,7 +1097,7 @@ cdma_activation_step (GTask *task)
return;
case CDMA_ACTIVATION_STEP_LAST:
- mm_info ("Activation step [5/5]: activation process finished");
+ mm_obj_info (self, "activation step [5/5]: activation process finished");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
@@ -1253,18 +1253,22 @@ parse_modem_eri (DetailedRegistrationStateContext *ctx, QcdmResult *result)
static void
reg_eri_6500_cb (MMPortSerialQcdm *port,
- GAsyncResult *res,
- GTask *task)
+ GAsyncResult *res,
+ GTask *task)
{
- DetailedRegistrationStateContext *ctx = g_task_get_task_data (task);
- GError *error = NULL;
- GByteArray *response;
- QcdmResult *result;
+ MMBroadbandModemNovatel *self;
+ DetailedRegistrationStateContext *ctx;
+ GError *error = NULL;
+ GByteArray *response;
+ QcdmResult *result;
+
+ self = g_task_get_source_object (task);
+ ctx = g_task_get_task_data (task);
response = mm_port_serial_qcdm_command_finish (port, res, &error);
if (error) {
/* Just ignore the error and complete with the input info */
- mm_dbg ("Couldn't run QCDM MSM6500 ERI: '%s'", error->message);
+ mm_obj_dbg (self, "couldn't run QCDM MSM6500 ERI: %s", error->message);
g_error_free (error);
goto done;
}
@@ -1286,16 +1290,20 @@ reg_eri_6800_cb (MMPortSerialQcdm *port,
GAsyncResult *res,
GTask *task)
{
- DetailedRegistrationStateContext *ctx = g_task_get_task_data (task);
- GError *error = NULL;
- GByteArray *response;
- GByteArray *nweri;
- QcdmResult *result;
+ MMBroadbandModemNovatel *self;
+ DetailedRegistrationStateContext *ctx;
+ GError *error = NULL;
+ GByteArray *response;
+ GByteArray *nweri;
+ QcdmResult *result;
+
+ self = g_task_get_source_object (task);
+ ctx = g_task_get_task_data (task);
response = mm_port_serial_qcdm_command_finish (port, res, &error);
if (error) {
/* Just ignore the error and complete with the input info */
- mm_dbg ("Couldn't run QCDM MSM6800 ERI: '%s'", error->message);
+ mm_obj_dbg (self, "couldn't run QCDM MSM6800 ERI: %s", error->message);
g_error_free (error);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
@@ -1350,7 +1358,7 @@ modem_cdma_get_detailed_registration_state (MMIfaceModemCdma *self,
ctx->port = mm_base_modem_get_port_qcdm (MM_BASE_MODEM (self));
if (!ctx->port) {
/* Ignore errors and use non-detailed registration state */
- mm_dbg ("No available QCDM port.");
+ mm_obj_dbg (self, "no available QCDM port");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
@@ -1358,7 +1366,7 @@ modem_cdma_get_detailed_registration_state (MMIfaceModemCdma *self,
if (!mm_port_serial_open (MM_PORT_SERIAL (ctx->port), &error)) {
/* Ignore errors and use non-detailed registration state */
- mm_dbg ("Couldn't open QCDM port: %s", error->message);
+ mm_obj_dbg (self, "couldn't open QCDM port: %s", error->message);
g_error_free (error);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
diff --git a/plugins/novatel/mm-common-novatel.c b/plugins/novatel/mm-common-novatel.c
index 6932f5a9..0a444418 100644
--- a/plugins/novatel/mm-common-novatel.c
+++ b/plugins/novatel/mm-common-novatel.c
@@ -14,7 +14,7 @@
*/
#include "mm-common-novatel.h"
-#include "mm-log.h"
+#include "mm-log-object.h"
/*****************************************************************************/
/* Custom init */
@@ -44,30 +44,27 @@ static void custom_init_step (GTask *task);
static void
nwdmat_ready (MMPortSerialAt *port,
- GAsyncResult *res,
- GTask* task)
+ GAsyncResult *res,
+ GTask *task)
{
- GError *error = NULL;
+ g_autoptr(GError) error = NULL;
+ MMPortProbe *probe;
+
+ probe = g_task_get_source_object (task);
mm_port_serial_at_command_finish (port, res, &error);
if (error) {
- if (g_error_matches (error,
- MM_SERIAL_ERROR,
- MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
+ if (g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
custom_init_step (task);
- goto out;
+ return;
}
- mm_dbg ("(Novatel) Error flipping secondary ports to AT mode: %s", error->message);
+ mm_obj_dbg (probe, "(Novatel) Error flipping secondary ports to AT mode: %s", error->message);
}
/* Finish custom_init */
g_task_return_boolean (task, TRUE);
g_object_unref (task);
-
-out:
- if (error)
- g_error_free (error);
}
static gboolean
@@ -81,24 +78,21 @@ static void
custom_init_step (GTask *task)
{
CustomInitContext *ctx;
- MMPortProbe *probe;
+ MMPortProbe *probe;
- ctx = g_task_get_task_data (task);
+ probe = g_task_get_source_object (task);
+ ctx = g_task_get_task_data (task);
/* If cancelled, end */
if (g_task_return_error_if_cancelled (task)) {
- mm_dbg ("(Novatel) no need to keep on running custom init in (%s)",
- mm_port_get_device (MM_PORT (ctx->port)));
+ mm_obj_dbg (probe, "(Novatel) no need to keep on running custom init");
g_object_unref (task);
return;
}
- probe = g_task_get_source_object (task);
-
/* If device has a QMI port, don't run $NWDMAT */
if (mm_port_probe_list_has_qmi_port (mm_device_peek_port_probe_list (mm_port_probe_peek_device (probe)))) {
- mm_dbg ("(Novatel) no need to run custom init in (%s): device has QMI port",
- mm_port_get_device (MM_PORT (ctx->port)));
+ mm_obj_dbg (probe, "(Novatel) no need to run custom init: device has QMI port");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
@@ -124,8 +118,7 @@ custom_init_step (GTask *task)
}
/* Finish custom_init */
- mm_dbg ("(Novatel) couldn't flip secondary port to AT in (%s): all retries consumed",
- mm_port_get_device (MM_PORT (ctx->port)));
+ mm_obj_dbg (probe, "(Novatel) couldn't flip secondary port to AT: all retries consumed");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
}
diff --git a/plugins/novatel/mm-plugin-novatel-lte.c b/plugins/novatel/mm-plugin-novatel-lte.c
index 9182c579..e9bf9c35 100644
--- a/plugins/novatel/mm-plugin-novatel-lte.c
+++ b/plugins/novatel/mm-plugin-novatel-lte.c
@@ -26,7 +26,6 @@
#include "mm-plugin-novatel-lte.h"
#include "mm-private-boxed-types.h"
#include "mm-broadband-modem-novatel-lte.h"
-#include "mm-log.h"
G_DEFINE_TYPE (MMPluginNovatelLte, mm_plugin_novatel_lte, MM_TYPE_PLUGIN)
diff --git a/plugins/novatel/mm-plugin-novatel.c b/plugins/novatel/mm-plugin-novatel.c
index 292f758e..91662f7c 100644
--- a/plugins/novatel/mm-plugin-novatel.c
+++ b/plugins/novatel/mm-plugin-novatel.c
@@ -31,7 +31,7 @@
#include "mm-common-novatel.h"
#include "mm-private-boxed-types.h"
#include "mm-broadband-modem-novatel.h"
-#include "mm-log.h"
+#include "mm-log-object.h"
#if defined WITH_QMI
#include "mm-broadband-modem-qmi.h"
@@ -55,7 +55,7 @@ create_modem (MMPlugin *self,
{
#if defined WITH_QMI
if (mm_port_probe_list_has_qmi_port (probes)) {
- mm_dbg ("QMI-powered Novatel modem found...");
+ mm_obj_dbg (self, "QMI-powered Novatel modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
drivers,
mm_plugin_get_name (self),
diff --git a/plugins/novatel/mm-sim-novatel-lte.c b/plugins/novatel/mm-sim-novatel-lte.c
index 1088d0d0..676db569 100644
--- a/plugins/novatel/mm-sim-novatel-lte.c
+++ b/plugins/novatel/mm-sim-novatel-lte.c
@@ -23,7 +23,6 @@
#include <ModemManager.h>
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
-#include "mm-log.h"
#include "mm-modem-helpers.h"
#include "mm-base-modem-at.h"
@@ -172,7 +171,6 @@ load_imsi (MMBaseSim *self,
MM_BASE_SIM_MODEM, &modem,
NULL);
- mm_dbg ("loading (Novatel LTE) IMSI...");
mm_base_modem_at_command (
modem,
"+CRSM=176,28423,0,0,9",
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-09 15:59:41 +0000