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

location: new 'unmanaged' GPS setup

Browse Source 
Standard GPS setup (raw/nmea) will both enable the GPS module and take full
control of the GPS port. This prevents other processes from reading the NMEA
traces from e.g. a tty. In order to handle this, a new 'unmanaged' GPS location
source is introduced, which will just enable/disable the GPS module, without
reading anything from the GPS port. Of course, both raw/nmea and unmanaged
setups cannot be enabled at the same time.
This commit is contained in:
Aleksander Morgado
2014-07-02 12:28:56 +02:00
parent 915a5beac0
commit ad67d68179
4 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/mmcli-modem-location.c
+25 -3
View File
@@ -58,6 +58,8 @@ static gboolean get_gps_raw_flag;
static gboolean enable_cdma_bs_flag;
static gboolean disable_cdma_bs_flag;
static gboolean get_cdma_bs_flag;
static gboolean enable_gps_unmanaged_flag;
static gboolean disable_gps_unmanaged_flag;
static gboolean get_all_flag;
static GOptionEntry entries[] = {
@@ -117,6 +119,14 @@ static GOptionEntry entries[] = {
"Get CDMA base station location.",
NULL
},
{ "location-enable-gps-unmanaged", 0, 0, G_OPTION_ARG_NONE, &enable_gps_unmanaged_flag,
"Enable unmanaged GPS location gathering.",
NULL
},
{ "location-disable-gps-unmanaged", 0, 0, G_OPTION_ARG_NONE, &disable_gps_unmanaged_flag,
"Disable unmanaged GPS location gathering.",
NULL
},
{ NULL }
};
@@ -147,6 +157,7 @@ mmcli_modem_location_options_enabled (void)
if ((enable_3gpp_flag && disable_3gpp_flag) ||
(enable_gps_nmea_flag && disable_gps_nmea_flag) ||
(enable_gps_raw_flag && disable_gps_raw_flag) ||
(enable_gps_unmanaged_flag && disable_gps_unmanaged_flag) ||
(enable_cdma_bs_flag && disable_cdma_bs_flag)) {
g_printerr ("error: cannot enable and disable the same source\n");
exit (EXIT_FAILURE);
@@ -167,7 +178,9 @@ mmcli_modem_location_options_enabled (void)
enable_gps_raw_flag +
disable_gps_raw_flag +
enable_cdma_bs_flag +
disable_cdma_bs_flag) +
disable_cdma_bs_flag +
enable_gps_unmanaged_flag +
disable_gps_unmanaged_flag) +
!!(get_3gpp_flag +
get_gps_nmea_flag +
get_gps_raw_flag +
@@ -302,6 +315,11 @@ build_sources_from_flags (void)
if (disable_cdma_bs_flag)
sources &= ~MM_MODEM_LOCATION_SOURCE_CDMA_BS;
if (enable_gps_unmanaged_flag)
sources |= MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED;
if (disable_gps_unmanaged_flag)
sources &= ~MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED;
return sources;
}
@@ -473,7 +491,9 @@ get_modem_ready (GObject *source,
enable_gps_raw_flag ||
disable_gps_raw_flag ||
enable_cdma_bs_flag ||
disable_cdma_bs_flag) {
disable_cdma_bs_flag ||
enable_gps_unmanaged_flag ||
disable_gps_unmanaged_flag) {
g_debug ("Asynchronously setting up location gathering...");
mm_modem_location_setup (ctx->modem_location,
build_sources_from_flags (),
@@ -550,7 +570,9 @@ mmcli_modem_location_run_synchronous (GDBusConnection *connection)
enable_gps_raw_flag ||
disable_gps_raw_flag ||
enable_cdma_bs_flag ||
disable_cdma_bs_flag) {
disable_cdma_bs_flag ||
enable_gps_unmanaged_flag ||
disable_gps_unmanaged_flag) {
gboolean result;
g_debug ("Synchronously setting up location gathering...");