diff options
-rw-r--r-- | cli/mmcli-modem.c | 15 | ||||
-rw-r--r-- | cli/mmcli-output.c | 1 | ||||
-rw-r--r-- | cli/mmcli-output.h | 1 | ||||
-rw-r--r-- | docs/reference/api/ModemManager-sections.txt | 1 | ||||
-rw-r--r-- | docs/reference/libmm-glib/libmm-glib-sections.txt | 7 | ||||
-rw-r--r-- | include/ModemManager-enums.h | 16 | ||||
-rw-r--r-- | introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml | 10 | ||||
-rw-r--r-- | libmm-glib/mm-modem-3gpp.c | 21 | ||||
-rw-r--r-- | libmm-glib/mm-modem-3gpp.h | 2 |
9 files changed, 68 insertions, 6 deletions
diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c index 9d82fa33..5702d845 100644 --- a/cli/mmcli-modem.c +++ b/cli/mmcli-modem.c @@ -395,6 +395,7 @@ print_modem_info (void) const gchar *operator_code = NULL; const gchar *operator_name = NULL; const gchar *registration = NULL; + const gchar *packet_service_state = NULL; const gchar *eps_ue_mode = NULL; GList *pco_list = NULL; const gchar *initial_eps_bearer_path = NULL; @@ -409,6 +410,7 @@ print_modem_info (void) operator_code = mm_modem_3gpp_get_operator_code (ctx->modem_3gpp); operator_name = mm_modem_3gpp_get_operator_name (ctx->modem_3gpp); registration = mm_modem_3gpp_registration_state_get_string (mm_modem_3gpp_get_registration_state (ctx->modem_3gpp)); + packet_service_state = mm_modem_3gpp_packet_service_state_get_string (mm_modem_3gpp_get_packet_service_state (ctx->modem_3gpp)); eps_ue_mode = mm_modem_3gpp_eps_ue_mode_operation_get_string (mm_modem_3gpp_get_eps_ue_mode_operation (ctx->modem_3gpp)); pco_list = mm_modem_3gpp_get_pco (ctx->modem_3gpp); initial_eps_bearer_path = mm_modem_3gpp_get_initial_eps_bearer_path (ctx->modem_3gpp); @@ -426,12 +428,13 @@ print_modem_info (void) } } - mmcli_output_string (MMC_F_3GPP_IMEI, imei); - mmcli_output_string_list (MMC_F_3GPP_ENABLED_LOCKS, facility_locks); - mmcli_output_string (MMC_F_3GPP_OPERATOR_ID, operator_code); - mmcli_output_string (MMC_F_3GPP_OPERATOR_NAME, operator_name); - mmcli_output_string (MMC_F_3GPP_REGISTRATION, registration); - mmcli_output_string (MMC_F_3GPP_EPS_UE_MODE, eps_ue_mode); + mmcli_output_string (MMC_F_3GPP_IMEI, imei); + mmcli_output_string_list (MMC_F_3GPP_ENABLED_LOCKS, facility_locks); + mmcli_output_string (MMC_F_3GPP_OPERATOR_ID, operator_code); + mmcli_output_string (MMC_F_3GPP_OPERATOR_NAME, operator_name); + mmcli_output_string (MMC_F_3GPP_REGISTRATION, registration); + mmcli_output_string (MMC_F_3GPP_PACKET_SERVICE_STATE, packet_service_state); + mmcli_output_string (MMC_F_3GPP_EPS_UE_MODE, eps_ue_mode); mmcli_output_string (MMC_F_3GPP_EPS_INITIAL_BEARER_PATH, g_strcmp0 (initial_eps_bearer_path, "/") != 0 ? initial_eps_bearer_path : NULL); mmcli_output_string (MMC_F_3GPP_EPS_BEARER_SETTINGS_APN, initial_eps_bearer_apn); mmcli_output_string_take (MMC_F_3GPP_EPS_BEARER_SETTINGS_IP_TYPE, initial_eps_bearer_ip_family_str); diff --git a/cli/mmcli-output.c b/cli/mmcli-output.c index 5b8a10d4..bacf3949 100644 --- a/cli/mmcli-output.c +++ b/cli/mmcli-output.c @@ -131,6 +131,7 @@ static FieldInfo field_infos[] = { [MMC_F_3GPP_OPERATOR_ID] = { "modem.3gpp.operator-code", "operator id", MMC_S_MODEM_3GPP, }, [MMC_F_3GPP_OPERATOR_NAME] = { "modem.3gpp.operator-name", "operator name", MMC_S_MODEM_3GPP, }, [MMC_F_3GPP_REGISTRATION] = { "modem.3gpp.registration-state", "registration", MMC_S_MODEM_3GPP, }, + [MMC_F_3GPP_PACKET_SERVICE_STATE] = { "modem.3gpp.packet-service-state", "packet service state", MMC_S_MODEM_3GPP, }, [MMC_F_3GPP_PCO] = { "modem.3gpp.pco", "pco", MMC_S_MODEM_3GPP, }, [MMC_F_3GPP_EPS_UE_MODE] = { "modem.3gpp.eps.ue-mode-operation", "ue mode of operation", MMC_S_MODEM_3GPP_EPS, }, [MMC_F_3GPP_EPS_INITIAL_BEARER_PATH] = { "modem.3gpp.eps.initial-bearer.dbus-path", "initial bearer path", MMC_S_MODEM_3GPP_EPS, }, diff --git a/cli/mmcli-output.h b/cli/mmcli-output.h index 6b56cafa..678b2b61 100644 --- a/cli/mmcli-output.h +++ b/cli/mmcli-output.h @@ -132,6 +132,7 @@ typedef enum { MMC_F_3GPP_OPERATOR_ID, MMC_F_3GPP_OPERATOR_NAME, MMC_F_3GPP_REGISTRATION, + MMC_F_3GPP_PACKET_SERVICE_STATE, MMC_F_3GPP_PCO, /* 3GPP EPS section */ MMC_F_3GPP_EPS_UE_MODE, diff --git a/docs/reference/api/ModemManager-sections.txt b/docs/reference/api/ModemManager-sections.txt index 74f7c8c6..5184503a 100644 --- a/docs/reference/api/ModemManager-sections.txt +++ b/docs/reference/api/ModemManager-sections.txt @@ -26,6 +26,7 @@ MMModem3gppSubscriptionState MMModem3gppRegistrationState MMModem3gppUssdSessionState MMModem3gppEpsUeModeOperation +MMModem3gppPacketServiceState MMModemAccessTechnology MMModemBand MMModemCapability diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt index a4569784..aaef50b4 100644 --- a/docs/reference/libmm-glib/libmm-glib-sections.txt +++ b/docs/reference/libmm-glib/libmm-glib-sections.txt @@ -307,6 +307,7 @@ mm_modem_3gpp_get_initial_eps_bearer_finish mm_modem_3gpp_get_initial_eps_bearer_sync mm_modem_3gpp_get_initial_eps_bearer_settings mm_modem_3gpp_peek_initial_eps_bearer_settings +mm_modem_3gpp_get_packet_service_state <SUBSECTION Methods> mm_modem_3gpp_register mm_modem_3gpp_register_finish @@ -1699,6 +1700,7 @@ mm_modem_3gpp_facility_build_string_from_mask mm_modem_3gpp_network_availability_get_string mm_modem_3gpp_ussd_session_state_get_string mm_modem_3gpp_eps_ue_mode_operation_get_string +mm_modem_3gpp_packet_service_state_get_string mm_modem_cdma_registration_state_get_string mm_modem_cdma_activation_state_get_string mm_modem_cdma_rm_protocol_get_string @@ -1751,6 +1753,7 @@ mm_modem_cdma_registration_state_build_string_from_mask mm_modem_cdma_activation_state_build_string_from_mask mm_modem_cdma_rm_protocol_build_string_from_mask mm_modem_3gpp_registration_state_build_string_from_mask +mm_modem_3gpp_packet_service_state_build_string_from_mask mm_modem_3gpp_subscription_state_build_string_from_mask mm_modem_3gpp_facility_get_string mm_modem_3gpp_network_availability_build_string_from_mask @@ -1780,6 +1783,7 @@ MM_TYPE_MODEM_3GPP_REGISTRATION_STATE MM_TYPE_MODEM_3GPP_SUBSCRIPTION_STATE MM_TYPE_MODEM_3GPP_USSD_SESSION_STATE MM_TYPE_MODEM_3GPP_EPS_UE_MODE_OPERATION +MM_TYPE_MODEM_3GPP_PACKET_SERVICE_STATE MM_TYPE_MODEM_ACCESS_TECHNOLOGY MM_TYPE_MODEM_BAND MM_TYPE_MODEM_CAPABILITY @@ -1824,6 +1828,7 @@ mm_modem_3gpp_registration_state_get_type mm_modem_3gpp_subscription_state_get_type mm_modem_3gpp_ussd_session_state_get_type mm_modem_3gpp_eps_ue_mode_operation_get_type +mm_modem_3gpp_packet_service_state_get_type mm_modem_access_technology_get_type mm_modem_band_get_type mm_modem_capability_get_type @@ -2112,6 +2117,7 @@ mm_gdbus_modem3gpp_get_initial_eps_bearer mm_gdbus_modem3gpp_dup_initial_eps_bearer mm_gdbus_modem3gpp_get_initial_eps_bearer_settings mm_gdbus_modem3gpp_dup_initial_eps_bearer_settings +mm_gdbus_modem3gpp_get_packet_service_state <SUBSECTION Methods> mm_gdbus_modem3gpp_call_register mm_gdbus_modem3gpp_call_register_finish @@ -2146,6 +2152,7 @@ mm_gdbus_modem3gpp_set_eps_ue_mode_operation mm_gdbus_modem3gpp_set_pco mm_gdbus_modem3gpp_set_initial_eps_bearer mm_gdbus_modem3gpp_set_initial_eps_bearer_settings +mm_gdbus_modem3gpp_set_packet_service_state <SUBSECTION Standard> MM_GDBUS_IS_MODEM3GPP MM_GDBUS_MODEM3GPP diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h index f14d5a86..13b78f76 100644 --- a/include/ModemManager-enums.h +++ b/include/ModemManager-enums.h @@ -1601,4 +1601,20 @@ typedef enum { /*< underscore_name=mm_bearer_apn_type >*/ MM_BEARER_APN_TYPE_PRIVATE = 1 << 7, } MMBearerApnType; +/** + * MMModem3gppPacketServiceState: + * @MM_MODEM_3GPP_PACKET_SERVICE_STATE_UNKNOWN: Unknown. + * @MM_MODEM_3GPP_PACKET_SERVICE_STATE_DETACHED: Detached. + * @MM_MODEM_3GPP_PACKET_SERVICE_STATE_ATTACHED: Attached. + * + * The packet domain service state. + * + * Since 1.20 + */ +typedef enum { /*< underscore_name=mm_modem_3gpp_packet_service_state >*/ + MM_MODEM_3GPP_PACKET_SERVICE_STATE_UNKNOWN = 0, + MM_MODEM_3GPP_PACKET_SERVICE_STATE_DETACHED = 1, + MM_MODEM_3GPP_PACKET_SERVICE_STATE_ATTACHED = 2, +} MMModem3gppPacketServiceState; + #endif /* _MODEMMANAGER_ENUMS_H_ */ diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml index 554b0cda..05e3c655 100644 --- a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml +++ b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml @@ -295,5 +295,15 @@ --> <property name="InitialEpsBearerSettings" type="a{sv}" access="read" /> + <!-- + PacketServiceState: + + A <link linkend="MMModem3gppPacketServiceState">MMModem3gppPacketServiceState</link> + value specifying the packet domain service state. + + Since: 1.20 + --> + <property name="PacketServiceState" type="u" access="read" /> + </interface> </node> diff --git a/libmm-glib/mm-modem-3gpp.c b/libmm-glib/mm-modem-3gpp.c index 6aac39b4..076e5426 100644 --- a/libmm-glib/mm-modem-3gpp.c +++ b/libmm-glib/mm-modem-3gpp.c @@ -405,6 +405,27 @@ mm_modem_3gpp_dup_initial_eps_bearer_path (MMModem3gpp *self) /*****************************************************************************/ /** + * mm_modem_3gpp_get_packet_service_state: + * @self: A #MMModem. + * + * Get the packet domain service state. + * + * Returns: A #MMModem3gppPacketServiceState value, specifying the current PS attach + * state. + * + * Since: 1.20 + */ +MMModem3gppPacketServiceState +mm_modem_3gpp_get_packet_service_state (MMModem3gpp *self) +{ + g_return_val_if_fail (MM_IS_MODEM_3GPP (self), MM_MODEM_3GPP_PACKET_SERVICE_STATE_UNKNOWN); + + return mm_gdbus_modem3gpp_get_packet_service_state (MM_GDBUS_MODEM3GPP (self)); +} + +/*****************************************************************************/ + +/** * mm_modem_3gpp_register_finish: * @self: A #MMModem3gpp. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to diff --git a/libmm-glib/mm-modem-3gpp.h b/libmm-glib/mm-modem-3gpp.h index 7baaf5a3..de7ec27d 100644 --- a/libmm-glib/mm-modem-3gpp.h +++ b/libmm-glib/mm-modem-3gpp.h @@ -92,6 +92,8 @@ gchar *mm_modem_3gpp_dup_initial_eps_bearer_path (MMModem3gpp *self); MMBearerProperties *mm_modem_3gpp_get_initial_eps_bearer_settings (MMModem3gpp *self); MMBearerProperties *mm_modem_3gpp_peek_initial_eps_bearer_settings (MMModem3gpp *self); +MMModem3gppPacketServiceState mm_modem_3gpp_get_packet_service_state (MMModem3gpp *self); + void mm_modem_3gpp_register (MMModem3gpp *self, const gchar *network_id, GCancellable *cancellable, |