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

iface-modem-location: define first and last location sources

Browse Source 
Much clearer to understand when looping through them.
This commit is contained in:
Aleksander Morgado
2019-03-14 08:07:27 +01:00
committed by Aleksander Morgado
parent b77aa7ab0e
commit caa1f8fdc1
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/ModemManager-enums.h
View File

@@ -940,6 +940,11 @@ typedef enum { /*< underscore_name=mm_modem_location_source >*/
MM_MODEM_LOCATION_SOURCE_CDMA_BS = 1 << 3, MM_MODEM_LOCATION_SOURCE_CDMA_BS = 1 << 3,
MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED = 1 << 4, MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED = 1 << 4,
MM_MODEM_LOCATION_SOURCE_AGPS_MSA = 1 << 5, MM_MODEM_LOCATION_SOURCE_AGPS_MSA = 1 << 5,
#if defined (MM_COMPILATION)
/* MM internal methods, not part of the API */
MM_MODEM_LOCATION_SOURCE_FIRST = MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI, /*< skip >*/
MM_MODEM_LOCATION_SOURCE_LAST = MM_MODEM_LOCATION_SOURCE_AGPS_MSA, /*< skip >*/
#endif
} MMModemLocationSource; } MMModemLocationSource;
/** /**

1
src/Makefile.am
View File

@@ -267,6 +267,7 @@ CLEANFILES += $(DAEMON_ENUMS_GENERATED)
ModemManager_CPPFLAGS = \ ModemManager_CPPFLAGS = \
-DPLUGINDIR=\"$(pkglibdir)\" \ -DPLUGINDIR=\"$(pkglibdir)\" \
-DMM_COMPILATION \
$(NULL) $(NULL)
ModemManager_LDADD = \ ModemManager_LDADD = \

8
src/mm-iface-modem-location.c
View File

@@ -622,7 +622,7 @@ setup_gathering_step (GTask *task)
return; return;
} }
while (ctx->current <= MM_MODEM_LOCATION_SOURCE_AGPS_MSA) { while (ctx->current <= MM_MODEM_LOCATION_SOURCE_LAST) {
gchar *source_str; gchar *source_str;
if (ctx->to_enable & ctx->current) { if (ctx->to_enable & ctx->current) {
@@ -720,8 +720,8 @@ setup_gathering (MMIfaceModemLocation *self,
ctx->to_disable = MM_MODEM_LOCATION_SOURCE_NONE; ctx->to_disable = MM_MODEM_LOCATION_SOURCE_NONE;
/* Loop through all known bits in the bitmask to enable/disable specific location sources */ /* Loop through all known bits in the bitmask to enable/disable specific location sources */
for (source = MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI; for (source = MM_MODEM_LOCATION_SOURCE_FIRST;
source <= MM_MODEM_LOCATION_SOURCE_AGPS_MSA; source <= MM_MODEM_LOCATION_SOURCE_LAST;
source = source << 1) { source = source << 1) {
/* skip unsupported sources */ /* skip unsupported sources */
if (!(mm_gdbus_modem_location_get_capabilities (ctx->skeleton) & source)) if (!(mm_gdbus_modem_location_get_capabilities (ctx->skeleton) & source))
@@ -778,7 +778,7 @@ setup_gathering (MMIfaceModemLocation *self,
} }
/* Start enabling/disabling location sources */ /* Start enabling/disabling location sources */
ctx->current = MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI; ctx->current = MM_MODEM_LOCATION_SOURCE_FIRST;
setup_gathering_step (task); setup_gathering_step (task);
} }