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

cli: print CDMA-related info from the modem

Browse Source
This commit is contained in:
Aleksander Morgado
2012-01-09 21:07:50 +01:00
parent c5fdd83905
commit d3c25e54c4
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cli/mmcli-modem.c
View File

@@ -40,6 +40,7 @@ typedef struct {
MMObject *object; MMObject *object;
MMModem *modem; MMModem *modem;
MMModem3gpp *modem_3gpp; MMModem3gpp *modem_3gpp;
MMModemCdma *modem_cdma;
} Context; } Context;
static Context *ctx; static Context *ctx;
@@ -183,6 +184,8 @@ context_free (Context *ctx)
g_object_unref (ctx->modem); g_object_unref (ctx->modem);
if (ctx->modem_3gpp) if (ctx->modem_3gpp)
g_object_unref (ctx->modem_3gpp); g_object_unref (ctx->modem_3gpp);
if (ctx->modem_cdma)
g_object_unref (ctx->modem_cdma);
if (ctx->object) if (ctx->object)
g_object_unref (ctx->object); g_object_unref (ctx->object);
if (ctx->manager) if (ctx->manager)
@@ -378,6 +381,42 @@ print_modem_info (void)
mm_modem_3gpp_get_registration_state ((ctx->modem_3gpp)))); mm_modem_3gpp_get_registration_state ((ctx->modem_3gpp))));
} }
/* If available, CDMA related stuff */
if (ctx->modem_cdma) {
guint sid;
guint nid;
gchar *sid_str;
gchar *nid_str;
sid = mm_modem_cdma_get_sid (ctx->modem_cdma);
sid_str = (sid != MM_MODEM_CDMA_SID_UNKNOWN ?
g_strdup_printf ("%u", sid) :
NULL);
nid = mm_modem_cdma_get_nid (ctx->modem_cdma);
nid_str = (nid != MM_MODEM_CDMA_NID_UNKNOWN ?
g_strdup_printf ("%u", nid) :
NULL);
g_print (" -------------------------\n"
" CDMA | meid: '%s'\n"
" | esn: '%s'\n"
" | sid: '%s'\n"
" | nid: '%s'\n"
" | registration: CDMA1x '%s'\n"
" | EV-DO '%s'\n",
VALIDATE_UNKNOWN (mm_modem_cdma_get_meid (ctx->modem_cdma)),
VALIDATE_UNKNOWN (mm_modem_cdma_get_esn (ctx->modem_cdma)),
VALIDATE_UNKNOWN (sid_str),
VALIDATE_UNKNOWN (nid_str),
mmcli_get_cdma_registration_state_string (
mm_modem_cdma_get_cdma1x_registration_state ((ctx->modem_cdma))),
mmcli_get_cdma_registration_state_string (
mm_modem_cdma_get_evdo_registration_state ((ctx->modem_cdma))));
g_free (sid_str);
g_free (nid_str);
}
/* SIM */ /* SIM */
g_print (" -------------------------\n" g_print (" -------------------------\n"
" SIM | path: '%s'\n", " SIM | path: '%s'\n",
@@ -718,6 +757,7 @@ get_modem_ready (GObject *source,
ctx->object = mmcli_get_modem_finish (result, &ctx->manager); ctx->object = mmcli_get_modem_finish (result, &ctx->manager);
ctx->modem = mm_object_get_modem (ctx->object); ctx->modem = mm_object_get_modem (ctx->object);
ctx->modem_3gpp = mm_object_get_modem_3gpp (ctx->object); ctx->modem_3gpp = mm_object_get_modem_3gpp (ctx->object);
ctx->modem_cdma = mm_object_get_modem_cdma (ctx->object);
if (info_flag) if (info_flag)
g_assert_not_reached (); g_assert_not_reached ();