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

quectel,shared: private context at beginning of source file

Browse Source
This commit is contained in:
Aleksander Morgado
2020-06-28 10:55:15 +02:00
parent 234ba4544b
commit 0f9d69fd35
1 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
plugins/quectel/mm-shared-quectel.c
View File

@@ -29,6 +29,49 @@
#include "mm-base-modem-at.h" #include "mm-base-modem-at.h"
#include "mm-shared-quectel.h" #include "mm-shared-quectel.h"
/*****************************************************************************/
/* Private context */
#define PRIVATE_TAG "shared-quectel-private-tag"
static GQuark private_quark;
typedef enum {
FEATURE_SUPPORT_UNKNOWN,
FEATURE_NOT_SUPPORTED,
FEATURE_SUPPORTED,
} FeatureSupport;
typedef struct {
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource provided_sources;
MMModemLocationSource enabled_sources;
FeatureSupport qgps_supported;
} Private;
static Private *
get_private (MMSharedQuectel *self)
{
Private *priv;
if (G_UNLIKELY (!private_quark))
private_quark = g_quark_from_static_string (PRIVATE_TAG);
priv = g_object_get_qdata (G_OBJECT (self), private_quark);
if (!priv) {
priv = g_slice_new0 (Private);
priv->provided_sources = MM_MODEM_LOCATION_SOURCE_NONE;
priv->enabled_sources = MM_MODEM_LOCATION_SOURCE_NONE;
priv->qgps_supported = FEATURE_SUPPORT_UNKNOWN;
g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_location_interface);
priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_location_interface (self);
g_object_set_qdata (G_OBJECT (self), private_quark, priv);
}
return priv;
}
/*****************************************************************************/ /*****************************************************************************/
/* Firmware update settings loading (Firmware interface) */ /* Firmware update settings loading (Firmware interface) */
@@ -165,9 +208,6 @@ mm_shared_quectel_setup_sim_hot_swap (MMIfaceModem *self,
/*****************************************************************************/ /*****************************************************************************/
/* Location State Variables */ /* Location State Variables */
#define PRIVATE_TAG "shared-quectel-private-tag"
static GQuark private_quark;
static const gchar *gps_startup[] = { static const gchar *gps_startup[] = {
/* NOTES: /* NOTES:
* 1) "+QGPSCFG=\"nmeasrc\",1" will be necessary for getting location data * 1) "+QGPSCFG=\"nmeasrc\",1" will be necessary for getting location data
@@ -187,19 +227,6 @@ typedef struct {
GError *command_error; GError *command_error;
} LocationGatheringContext; } LocationGatheringContext;
typedef enum {
FEATURE_SUPPORT_UNKNOWN,
FEATURE_NOT_SUPPORTED,
FEATURE_SUPPORTED,
} FeatureSupport;
typedef struct {
MMIfaceModemLocation *iface_modem_location_parent;
MMModemLocationSource provided_sources;
MMModemLocationSource enabled_sources;
FeatureSupport qgps_supported;
} Private;
static void static void
location_gathering_context_free (LocationGatheringContext *ctx) location_gathering_context_free (LocationGatheringContext *ctx)
{ {
@@ -217,30 +244,6 @@ location_gathering_context_new (MMModemLocationSource source)
return ctx; return ctx;
} }
static Private *
get_private (MMSharedQuectel *self)
{
Private *priv;
if (G_UNLIKELY (!private_quark))
private_quark = g_quark_from_static_string (PRIVATE_TAG);
priv = g_object_get_qdata (G_OBJECT (self), private_quark);
if (!priv) {
priv = g_slice_new0 (Private);
priv->provided_sources = MM_MODEM_LOCATION_SOURCE_NONE;
priv->enabled_sources = MM_MODEM_LOCATION_SOURCE_NONE;
priv->qgps_supported = FEATURE_SUPPORT_UNKNOWN;
g_assert (MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_location_interface);
priv->iface_modem_location_parent = MM_SHARED_QUECTEL_GET_INTERFACE (self)->peek_parent_location_interface (self);
g_object_set_qdata (G_OBJECT (self), private_quark, priv);
}
return priv;
}
/*****************************************************************************/ /*****************************************************************************/
/* Location capabilities loading (Location interface) */ /* Location capabilities loading (Location interface) */