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

anydata: port to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-04 15:19:52 +02:00
parent f5ce4a722a
commit fe4b8f6817
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/anydata/mm-broadband-modem-anydata.c
View File

@@ -25,7 +25,7 @@
#include "ModemManager.h" #include "ModemManager.h"
#include "mm-serial-parsers.h" #include "mm-serial-parsers.h"
#include "mm-log.h" #include "mm-log-object.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
#include "mm-errors-types.h" #include "mm-errors-types.h"
#include "mm-base-modem-at.h" #include "mm-base-modem-at.h"
@@ -38,7 +38,7 @@ static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemAnydata, mm_broadband_modem_anydata, MM_TYPE_BROADBAND_MODEM, 0, G_DEFINE_TYPE_EXTENDED (MMBroadbandModemAnydata, mm_broadband_modem_anydata, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_CDMA, iface_modem_cdma_init)); G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_CDMA, iface_modem_cdma_init))
/*****************************************************************************/ /*****************************************************************************/
/* Detailed registration state (CDMA interface) */ /* Detailed registration state (CDMA interface) */
@@ -119,7 +119,7 @@ hstate_ready (MMIfaceModemCdma *self,
results->detailed_evdo_state = MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED; results->detailed_evdo_state = MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED;
break; break;
default: default:
mm_warn ("ANYDATA: unknown *STATE (%d); assuming no service.", val); mm_obj_warn (self, "unknown *HSTATE (%d); assuming no service", val);
/* fall through */ /* fall through */
case 0: /* NO SERVICE */ case 0: /* NO SERVICE */
case 1: /* ACQUISITION */ case 1: /* ACQUISITION */
@@ -186,7 +186,7 @@ state_ready (MMIfaceModemCdma *self,
results->detailed_cdma1x_state = MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED; results->detailed_cdma1x_state = MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED;
break; break;
default: default:
mm_warn ("ANYDATA: unknown *STATE (%d); assuming no service.", val); mm_obj_warn (self, "unknown *HSTATE (%d); assuming no service", val);
/* fall through */ /* fall through */
case 0: /* NO SERVICE */ case 0: /* NO SERVICE */
break; break;

4
plugins/anydata/mm-plugin-anydata.c
View File

@@ -21,7 +21,7 @@
#define _LIBMM_INSIDE_MM #define _LIBMM_INSIDE_MM
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-log.h" #include "mm-log-object.h"
#include "mm-plugin-anydata.h" #include "mm-plugin-anydata.h"
#include "mm-broadband-modem-anydata.h" #include "mm-broadband-modem-anydata.h"
@@ -47,7 +47,7 @@ create_modem (MMPlugin *self,
{ {
#if defined WITH_QMI #if defined WITH_QMI
if (mm_port_probe_list_has_qmi_port (probes)) { if (mm_port_probe_list_has_qmi_port (probes)) {
mm_dbg ("QMI-powered AnyDATA modem found..."); mm_obj_dbg (self, "QMI-powered AnyDATA modem found...");
return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid, return MM_BASE_MODEM (mm_broadband_modem_qmi_new (uid,
drivers, drivers,
mm_plugin_get_name (self), mm_plugin_get_name (self),