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

mmcli: new `--location-status' to show supported and enabled location sources

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-26 20:29:14 +02:00
parent ceefa2c356
commit a69b4d2451
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
cli/mmcli-modem-location.c
View File

@@ -44,11 +44,16 @@ typedef struct {
static Context *ctx; static Context *ctx;
/* Options */ /* Options */
static gboolean status_flag;
static gboolean enable_3gpp_flag; static gboolean enable_3gpp_flag;
static gboolean disable_3gpp_flag; static gboolean disable_3gpp_flag;
static gboolean get_3gpp_flag; static gboolean get_3gpp_flag;
static GOptionEntry entries[] = { static GOptionEntry entries[] = {
{ "location-status", 0, 0, G_OPTION_ARG_NONE, &status_flag,
"Show status of location gathering.",
NULL
},
{ "location-enable-3gpp", 0, 0, G_OPTION_ARG_NONE, &enable_3gpp_flag, { "location-enable-3gpp", 0, 0, G_OPTION_ARG_NONE, &enable_3gpp_flag,
"Enable 3GPP location gathering.", "Enable 3GPP location gathering.",
NULL NULL
@@ -88,7 +93,8 @@ mmcli_modem_location_options_enabled (void)
if (checked) if (checked)
return !!n_actions; return !!n_actions;
n_actions = (enable_3gpp_flag + n_actions = (status_flag +
enable_3gpp_flag +
disable_3gpp_flag + disable_3gpp_flag +
get_3gpp_flag); get_3gpp_flag);
@@ -97,6 +103,9 @@ mmcli_modem_location_options_enabled (void)
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
if (status_flag)
mmcli_force_sync_operation ();
checked = TRUE; checked = TRUE;
return !!n_actions; return !!n_actions;
} }
@@ -140,6 +149,30 @@ mmcli_modem_location_shutdown (void)
context_free (ctx); context_free (ctx);
} }
static void
print_location_status (void)
{
gchar *capabilities_str;
gchar *enabled_str;
capabilities_str = (mm_modem_location_source_build_string_from_mask (
mm_modem_location_get_capabilities (ctx->modem_location)));
enabled_str = (mm_modem_location_source_build_string_from_mask (
mm_modem_location_get_enabled (ctx->modem_location)));
g_print ("\n"
"%s\n"
" ----------------------------\n"
" Location | capabilities: '%s'\n"
" | enabled: '%s'\n"
" | signals: '%s'\n",
mm_modem_location_get_path (ctx->modem_location),
capabilities_str,
enabled_str,
mm_modem_location_signals_location (ctx->modem_location) ? "yes" : "no");
g_free (capabilities_str);
g_free (enabled_str);
}
static void static void
enable_process_reply (gboolean result, enable_process_reply (gboolean result,
const GError *error) const GError *error)
@@ -238,6 +271,9 @@ get_modem_ready (GObject *source,
ensure_modem_location (); ensure_modem_location ();
if (status_flag)
g_assert_not_reached ();
/* Request to enable location gathering? */ /* Request to enable location gathering? */
if (enable_3gpp_flag) { if (enable_3gpp_flag) {
g_debug ("Asynchronously enabling 3GPP location gathering..."); g_debug ("Asynchronously enabling 3GPP location gathering...");
@@ -309,6 +345,13 @@ mmcli_modem_location_run_synchronous (GDBusConnection *connection)
ensure_modem_location (); ensure_modem_location ();
/* Request to get location status? */
if (status_flag) {
g_debug ("Printing location status...");
print_location_status ();
return;
}
/* Request to enable location gathering? */ /* Request to enable location gathering? */
if (enable_3gpp_flag) { if (enable_3gpp_flag) {
gboolean result; gboolean result;