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

iridium: port to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-07 15:04:10 +02:00
parent fe78612d6d
commit 2da417c7a2
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/iridium/mm-bearer-iridium.c
View File

@@ -26,12 +26,11 @@
#include "mm-bearer-iridium.h" #include "mm-bearer-iridium.h"
#include "mm-base-modem-at.h" #include "mm-base-modem-at.h"
#include "mm-log.h"
/* Allow up to 200s to get a proper IP connection */ /* Allow up to 200s to get a proper IP connection */
#define BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT 200 #define BEARER_IRIDIUM_IP_TIMEOUT_DEFAULT 200
G_DEFINE_TYPE (MMBearerIridium, mm_bearer_iridium, MM_TYPE_BASE_BEARER); G_DEFINE_TYPE (MMBearerIridium, mm_bearer_iridium, MM_TYPE_BASE_BEARER)
/*****************************************************************************/ /*****************************************************************************/
/* Connect */ /* Connect */

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

@@ -23,7 +23,7 @@
#include <ctype.h> #include <ctype.h>
#include "ModemManager.h" #include "ModemManager.h"
#include "mm-log.h" #include "mm-log-object.h"
#include "mm-errors-types.h" #include "mm-errors-types.h"
#include "mm-base-modem-at.h" #include "mm-base-modem-at.h"
#include "mm-iface-modem.h" #include "mm-iface-modem.h"
@@ -41,7 +41,7 @@ static void iface_modem_messaging_init (MMIfaceModemMessaging *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemIridium, mm_broadband_modem_iridium, MM_TYPE_BROADBAND_MODEM, 0, G_DEFINE_TYPE_EXTENDED (MMBroadbandModemIridium, mm_broadband_modem_iridium, 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_3GPP, iface_modem_3gpp_init) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_3GPP, iface_modem_3gpp_init)
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_MESSAGING, iface_modem_messaging_init)); G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_MESSAGING, iface_modem_messaging_init))
/*****************************************************************************/ /*****************************************************************************/
/* Operator Code loading (3GPP interface) */ /* Operator Code loading (3GPP interface) */
@@ -296,7 +296,7 @@ create_bearer (MMIfaceModem *self,
MMBaseBearer *bearer; MMBaseBearer *bearer;
GTask *task; GTask *task;
mm_dbg ("Creating Iridium bearer..."); mm_obj_dbg (self, "creating Iridium bearer...");
bearer = mm_bearer_iridium_new (MM_BROADBAND_MODEM_IRIDIUM (self), bearer = mm_bearer_iridium_new (MM_BROADBAND_MODEM_IRIDIUM (self),
properties); properties);
task = g_task_new (self, NULL, callback, user_data); task = g_task_new (self, NULL, callback, user_data);
@@ -325,7 +325,7 @@ setup_ports (MMBroadbandModem *self)
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_iridium_parent_class)->setup_ports (self); MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_iridium_parent_class)->setup_ports (self);
/* Set 9600 baudrate by default in the AT port */ /* Set 9600 baudrate by default in the AT port */
mm_dbg ("Baudrate will be set to 9600 bps..."); mm_obj_dbg (self, "baudrate will be set to 9600 bps...");
primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
if (!primary) if (!primary)
return; return;

1
plugins/iridium/mm-plugin-iridium.c
View File

@@ -29,7 +29,6 @@
#include "mm-plugin-iridium.h" #include "mm-plugin-iridium.h"
#include "mm-broadband-modem-iridium.h" #include "mm-broadband-modem-iridium.h"
#include "mm-private-boxed-types.h" #include "mm-private-boxed-types.h"
#include "mm-log.h"
G_DEFINE_TYPE (MMPluginIridium, mm_plugin_iridium, MM_TYPE_PLUGIN) G_DEFINE_TYPE (MMPluginIridium, mm_plugin_iridium, MM_TYPE_PLUGIN)