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

plugins: don't add plugin name in log message explicitly

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-08 17:53:42 +02:00
parent 8722215f7e
commit 4b058872a0
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/altair/mm-broadband-modem-altair-lte.c
+1 -1
View File
@@ -708,7 +708,7 @@ altair_statcm_changed (MMPortSerialAt *port,
mm_get_int_from_match_info (match_info, 1, &pdn_event);
mm_obj_dbg (self, "altair PDN event detected: %d", pdn_event);
mm_obj_dbg (self, "PDN event detected: %d", pdn_event);
/* Currently we only care about bearer disconnection */
plugins/cinterion/mm-broadband-bearer-cinterion.c
+8 -8
View File
@@ -402,7 +402,7 @@ dial_3gpp_context_step (GTask *task)
command = build_auth_string (self, mm_base_bearer_peek_config (MM_BASE_BEARER (ctx->self)), ctx->cid);
if (command) {
mm_obj_dbg (self, "cinterion dial step %u/%u: authenticating...", ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST);
mm_obj_dbg (self, "dial step %u/%u: authenticating...", ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST);
/* Send SGAUTH write, if User & Pass are provided.
* advance to next state by callback */
mm_base_modem_at_command_full (ctx->modem,
@@ -418,14 +418,14 @@ dial_3gpp_context_step (GTask *task)
return;
}
mm_obj_dbg (self, "cinterion dial step %u/%u: authentication not required", ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST);
mm_obj_dbg (self, "dial step %u/%u: authentication not required", ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST);
ctx->step++;
} /* fall through */
case DIAL_3GPP_CONTEXT_STEP_START_SWWAN: {
gchar *command;
mm_obj_dbg (self, "cinterion dial step %u/%u: starting SWWAN interface %u connection...",
mm_obj_dbg (self, "dial step %u/%u: starting SWWAN interface %u connection...",
ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST, usb_interface_configs[ctx->usb_interface_config_index].swwan_index);
command = g_strdup_printf ("^SWWAN=1,%u,%u",
ctx->cid,
@@ -444,7 +444,7 @@ dial_3gpp_context_step (GTask *task)
}
case DIAL_3GPP_CONTEXT_STEP_VALIDATE_CONNECTION:
mm_obj_dbg (self, "cinterion dial step %u/%u: checking SWWAN interface %u status...",
mm_obj_dbg (self, "dial step %u/%u: checking SWWAN interface %u status...",
ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST, usb_interface_configs[ctx->usb_interface_config_index].swwan_index);
load_connection_status_by_cid (ctx->self,
ctx->cid,
@@ -453,7 +453,7 @@ dial_3gpp_context_step (GTask *task)
return;
case DIAL_3GPP_CONTEXT_STEP_LAST:
mm_obj_dbg (self, "cinterion dial step %u/%u: finished", ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST);
mm_obj_dbg (self, "dial step %u/%u: finished", ctx->step, DIAL_3GPP_CONTEXT_STEP_LAST);
g_task_return_pointer (task, g_object_ref (ctx->data), g_object_unref);
g_object_unref (task);
return;
@@ -625,7 +625,7 @@ disconnect_3gpp_context_step (GTask *task)
command = g_strdup_printf ("^SWWAN=0,%u,%u",
ctx->cid, usb_interface_configs[ctx->usb_interface_config_index].swwan_index);
mm_obj_dbg (self, "cinterion disconnect step %u/%u: disconnecting PDP CID %u...",
mm_obj_dbg (self, "disconnect step %u/%u: disconnecting PDP CID %u...",
ctx->step, DISCONNECT_3GPP_CONTEXT_STEP_LAST, ctx->cid);
mm_base_modem_at_command_full (ctx->modem,
ctx->primary,
@@ -641,7 +641,7 @@ disconnect_3gpp_context_step (GTask *task)
}
case DISCONNECT_3GPP_CONTEXT_STEP_CONNECTION_STATUS:
mm_obj_dbg (self, "cinterion disconnect step %u/%u: checking SWWAN interface %u status...",
mm_obj_dbg (self, "disconnect step %u/%u: checking SWWAN interface %u status...",
ctx->step, DISCONNECT_3GPP_CONTEXT_STEP_LAST,
usb_interface_configs[ctx->usb_interface_config_index].swwan_index);
load_connection_status_by_cid (MM_BROADBAND_BEARER_CINTERION (ctx->self),
@@ -651,7 +651,7 @@ disconnect_3gpp_context_step (GTask *task)
return;
case DISCONNECT_3GPP_CONTEXT_STEP_LAST:
mm_obj_dbg (self, "cinterion disconnect step %u/%u: finished",
mm_obj_dbg (self, "disconnect step %u/%u: finished",
ctx->step, DISCONNECT_3GPP_CONTEXT_STEP_LAST);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
plugins/huawei/mm-broadband-modem-huawei.c
+2 -2
View File
@@ -2890,7 +2890,7 @@ cvoice_check_ready (MMBaseModem *_self,
&self->priv->audio_bits,
&error)) {
self->priv->cvoice_support = FEATURE_NOT_SUPPORTED;
mm_obj_dbg (self, "Huawei-specific CVOICE is unsupported: %s", error->message);
mm_obj_dbg (self, "CVOICE is unsupported: %s", error->message);
g_clear_error (&error);
/* Now check generic support */
@@ -2900,7 +2900,7 @@ cvoice_check_ready (MMBaseModem *_self,
return;
}
mm_obj_dbg (self, "Huawei-specific CVOICE is supported");
mm_obj_dbg (self, "CVOICE is supported");
self->priv->cvoice_support = FEATURE_SUPPORTED;
g_task_return_boolean (task, TRUE);
g_object_unref (task);
plugins/huawei/mm-plugin-huawei.c
+7 -7
View File
@@ -152,7 +152,7 @@ getportmode_ready (MMPortSerialAt *port,
MMDevice *device;
guint n_cached_port_modes = 0;
mm_obj_dbg (probe, "(Huawei) port mode layout retrieved");
mm_obj_dbg (probe, "port mode layout retrieved");
/* Results are cached in the parent device object */
device = mm_port_probe_peek_device (probe);
@@ -200,10 +200,10 @@ curc_ready (MMPortSerialAt *port,
MM_SERIAL_ERROR_RESPONSE_TIMEOUT))
goto out;
mm_obj_dbg (probe, "(Huawei) couldn't turn off unsolicited messages in secondary ports: %s", error->message);
mm_obj_dbg (probe, "couldn't turn off unsolicited messages in secondary ports: %s", error->message);
}
mm_obj_dbg (probe, "(Huawei) unsolicited messages in secondary ports turned off");
mm_obj_dbg (probe, "unsolicited messages in secondary ports turned off");
ctx->curc_done = TRUE;
@@ -245,9 +245,9 @@ try_next_usbif (MMPortProbe *probe,
if (closest == G_MAXUINT) {
/* No more ttys to try! Just return something */
closest = 0;
mm_obj_dbg (probe, "(Huawei) no more ports to run initial probing");
mm_obj_dbg (probe, "no more ports to run initial probing");
} else
mm_obj_dbg (probe, "(Huawei) will try initial probing with interface '%d' instead", closest);
mm_obj_dbg (probe, "will try initial probing with interface '%d' instead", closest);
fi_ctx->first_usbif = closest;
}
@@ -265,7 +265,7 @@ huawei_custom_init_step (GTask *task)
/* If cancelled, end */
if (g_task_return_error_if_cancelled (task)) {
mm_obj_dbg (probe, "(Huawei) no need to keep on running custom init");
mm_obj_dbg (probe, "no need to keep on running custom init");
g_object_unref (task);
return;
}
@@ -571,7 +571,7 @@ grab_port (MMPlugin *self,
gchar *str;
str = mm_port_serial_at_flag_build_string_from_mask (pflags);
mm_obj_dbg (self, "(%s/%s) huawei port will have AT flags '%s'",
mm_obj_dbg (self, "(%s/%s) port will have AT flags '%s'",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe),
str);
plugins/longcheer/mm-plugin-longcheer.c
+3 -3
View File
@@ -69,7 +69,7 @@ gmr_ready (MMPortSerialAt *port,
response = mm_port_serial_at_command_finish (port, res, NULL);
if (!response) {
mm_obj_dbg (probe, "(Longcheer) retrying custom init step...");
mm_obj_dbg (probe, "retrying custom init step...");
longcheer_custom_init_step (task);
return;
}
@@ -88,7 +88,7 @@ gmr_ready (MMPortSerialAt *port,
MM_CORE_ERROR_UNSUPPORTED,
"X200 cannot be supported with the Longcheer plugin");
} else {
mm_obj_dbg (probe, "(Longcheer) device is not a X200");
mm_obj_dbg (probe, "device is not a X200");
g_task_return_boolean (task, TRUE);
}
g_object_unref (task);
@@ -107,7 +107,7 @@ longcheer_custom_init_step (GTask *task)
/* If cancelled, end */
if (g_cancellable_is_cancelled (cancellable)) {
mm_obj_dbg (probe, "(Longcheer) no need to keep on running custom init");
mm_obj_dbg (probe, "no need to keep on running custom init");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
plugins/novatel/mm-broadband-modem-novatel.c
+3 -3
View File
@@ -553,15 +553,15 @@ modem_load_access_technologies_finish (MMIfaceModem *self,
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_obj_dbg (self, "novatel modem snapshot EVDO revision: 0");
mm_obj_dbg (self, "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_obj_dbg (self, "novatel modem snapshot EVDO revision: A");
mm_obj_dbg (self, "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_obj_dbg (self, "novatel modem snapshot EVDO revision: %d (unknown)", ctx->hdr_revision);
mm_obj_dbg (self, "modem snapshot EVDO revision: %d (unknown)", ctx->hdr_revision);
}
*access_technologies = ctx->act;
plugins/novatel/mm-common-novatel.c
+4 -4
View File
@@ -59,7 +59,7 @@ nwdmat_ready (MMPortSerialAt *port,
return;
}
mm_obj_dbg (probe, "(Novatel) Error flipping secondary ports to AT mode: %s", error->message);
mm_obj_dbg (probe, "error flipping secondary ports to AT mode: %s", error->message);
}
/* Finish custom_init */
@@ -85,14 +85,14 @@ custom_init_step (GTask *task)
/* If cancelled, end */
if (g_task_return_error_if_cancelled (task)) {
mm_obj_dbg (probe, "(Novatel) no need to keep on running custom init");
mm_obj_dbg (probe, "no need to keep on running custom init");
g_object_unref (task);
return;
}
/* 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_obj_dbg (probe, "(Novatel) no need to run custom init: device has QMI port");
mm_obj_dbg (probe, "no need to run custom init: device has QMI port");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
@@ -118,7 +118,7 @@ custom_init_step (GTask *task)
}
/* Finish custom_init */
mm_obj_dbg (probe, "(Novatel) couldn't flip secondary port to AT: all retries consumed");
mm_obj_dbg (probe, "couldn't flip secondary port to AT: all retries consumed");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
}
plugins/sierra/mm-common-sierra.c
+3 -3
View File
@@ -160,7 +160,7 @@ gcap_ready (MMPortSerialAt *port,
* on the APP1 port or not.
*/
if (getenv ("MM_SIERRA_APP1_PPP_OK")) {
mm_obj_dbg (probe, "(Sierra) APP1 PPP OK '%s'", response);
mm_obj_dbg (probe, "APP1 PPP OK '%s'", response);
g_object_set_data (G_OBJECT (probe), TAG_SIERRA_APP1_PPP_OK, GUINT_TO_POINTER (TRUE));
}
} else if (strstr (response, "APP2") ||
@@ -193,14 +193,14 @@ sierra_custom_init_step (GTask *task)
/* If cancelled, end */
if (g_cancellable_is_cancelled (cancellable)) {
mm_obj_dbg (probe, "(Sierra) no need to keep on running custom init");
mm_obj_dbg (probe, "no need to keep on running custom init");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
}
if (ctx->retries == 0) {
mm_obj_dbg (probe, "(Sierra) couldn't get port type hints");
mm_obj_dbg (probe, "couldn't get port type hints");
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
plugins/ublox/mm-broadband-bearer-ublox.c
+2 -2
View File
@@ -417,7 +417,7 @@ test_cedata_ready (MMBaseModem *modem,
self->priv->cedata = FEATURE_SUPPORTED;
else
self->priv->cedata = FEATURE_UNSUPPORTED;
mm_obj_dbg (self, "u-blox: +UCEDATA command%s available",
mm_obj_dbg (self, "+UCEDATA command%s available",
(self->priv->cedata == FEATURE_SUPPORTED) ? "" : " not");
activate_3gpp (task);
@@ -439,7 +439,7 @@ test_cedata (GTask *task)
return;
}
mm_obj_dbg (self, "u-blox: checking availability of +UCEDATA command...");
mm_obj_dbg (self, "checking availability of +UCEDATA command...");
mm_base_modem_at_command (MM_BASE_MODEM (ctx->modem),
"+UCEDATA=?",
3,
plugins/zte/mm-plugin-zte.c
+1 -1
View File
@@ -126,7 +126,7 @@ grab_port (MMPlugin *self,
}
if (mm_kernel_device_get_global_property_as_boolean (port, "ID_MM_ZTE_ICERA_DHCP")) {
mm_obj_dbg (self, "ZTE: Icera-based modem will use DHCP");
mm_obj_dbg (self, "icera-based modem will use DHCP");
g_object_set (modem,
MM_BROADBAND_MODEM_ICERA_DEFAULT_IP_METHOD, MM_BEARER_IP_METHOD_DHCP,
NULL);