From 7ff8e240e65bba557225a06cdf2f3a3b78c82746 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 9 May 2017 12:19:14 -0500
Subject: nas: add Attach/Detach message

---
 data/qmi-service-nas.json                          | 16 +++++++++++++++
 .../libqmi-glib/libqmi-glib-common.sections        |  5 +++++
 docs/reference/libqmi-glib/libqmi-glib-docs.xml    |  5 +++++
 src/libqmi-glib/qmi-enums-nas.h                    | 23 ++++++++++++++++++++++
 4 files changed, 49 insertions(+)

diff --git a/data/qmi-service-nas.json b/data/qmi-service-nas.json
index 7f6b809..dcdd03d 100644
--- a/data/qmi-service-nas.json
+++ b/data/qmi-service-nas.json
@@ -652,6 +652,22 @@
      "output"  : [  { "common-ref" : "Operation Result" } ] },
 
   // *********************************************************************************
+  {  "name"    : "Attach Detach",
+     "type"    : "Message",
+     "service" : "NAS",
+     "id"      : "0x0023",
+     "version" : "1.0",
+     "since"   : "1.20",
+     "input"   : [  { "name"          : "Action",
+                      "id"            : "0x10",
+                      "mandatory"     : "yes",
+                      "type"          : "TLV",
+                      "since"         : "1.20",
+                      "format"        : "guint8",
+                      "public-format" : "QmiNasPsAttachAction" } ],
+     "output"  : [  { "common-ref" : "Operation Result" } ] },
+
+  // *********************************************************************************
   {  "name"    : "Get Serving System",
      "type"    : "Message",
      "service" : "NAS",
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index b78dc5e..0c93808 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -260,6 +260,7 @@ QmiNasNetworkDescriptionDisplay
 QmiNasNetworkDescriptionEncoding
 QmiNasRadioTechnologyPreference
 QmiNasPreferenceDuration
+QmiNasPsAttachAction
 QmiNasRatModePreference
 QmiNasCdmaPrlPreference
 QmiNasRoamingPreference
@@ -306,6 +307,7 @@ qmi_nas_network_description_display_get_string
 qmi_nas_network_description_encoding_get_string
 qmi_nas_radio_technology_preference_build_string_from_mask
 qmi_nas_preference_duration_get_string
+qmi_nas_ps_attach_action_get_string
 qmi_nas_rat_mode_preference_build_string_from_mask
 qmi_nas_cdma_prl_preference_get_string
 qmi_nas_roaming_preference_get_string
@@ -375,6 +377,7 @@ qmi_nas_network_name_display_condition_get_string
 qmi_nas_plmn_encoding_scheme_build_string_from_mask
 qmi_nas_plmn_name_country_initials_build_string_from_mask
 qmi_nas_plmn_name_spare_bits_build_string_from_mask
+qmi_nas_ps_attach_action_build_string_from_mask
 <SUBSECTION Standard>
 QMI_TYPE_NAS_ACTIVE_BAND
 QMI_TYPE_NAS_ATTACH_STATE
@@ -396,6 +399,7 @@ QMI_TYPE_NAS_NETWORK_SERVICE_DOMAIN
 QMI_TYPE_NAS_NETWORK_STATUS
 QMI_TYPE_NAS_NETWORK_TYPE
 QMI_TYPE_NAS_PREFERENCE_DURATION
+QMI_TYPE_NAS_PS_ATTACH_ACTION
 QMI_TYPE_NAS_RADIO_INTERFACE
 QMI_TYPE_NAS_RADIO_TECHNOLOGY_PREFERENCE
 QMI_TYPE_NAS_RAT_MODE_PREFERENCE
@@ -439,6 +443,7 @@ qmi_nas_network_service_domain_get_type
 qmi_nas_network_status_get_type
 qmi_nas_network_type_get_type
 qmi_nas_preference_duration_get_type
+qmi_nas_ps_attach_action_get_type
 qmi_nas_radio_interface_get_type
 qmi_nas_radio_technology_preference_get_type
 qmi_nas_rat_mode_preference_get_type
diff --git a/docs/reference/libqmi-glib/libqmi-glib-docs.xml b/docs/reference/libqmi-glib/libqmi-glib-docs.xml
index 233db45..565a999 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-docs.xml
+++ b/docs/reference/libqmi-glib/libqmi-glib-docs.xml
@@ -144,6 +144,7 @@
       <xi:include href="xml/qmi-message-nas-get-signal-strength.xml"/>
       <xi:include href="xml/qmi-message-nas-network-scan.xml"/>
       <xi:include href="xml/qmi-message-nas-initiate-network-register.xml"/>
+      <xi:include href="xml/qmi-message-nas-attach-detach.xml"/>
       <xi:include href="xml/qmi-message-nas-get-serving-system.xml"/>
       <xi:include href="xml/qmi-message-nas-get-home-network.xml"/>
       <xi:include href="xml/qmi-message-nas-set-technology-preference.xml"/>
@@ -440,6 +441,10 @@
     <title>Index of new core symbols in 1.18</title>
     <xi:include href="xml/api-index-1.18.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-1-20" role="1.20">
+    <title>Index of new core symbols in 1.20</title>
+    <xi:include href="xml/api-index-1.20.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
diff --git a/src/libqmi-glib/qmi-enums-nas.h b/src/libqmi-glib/qmi-enums-nas.h
index c728547..f5435cb 100644
--- a/src/libqmi-glib/qmi-enums-nas.h
+++ b/src/libqmi-glib/qmi-enums-nas.h
@@ -425,6 +425,29 @@ typedef enum {
  */
 
 /*****************************************************************************/
+/* Helper enums for the 'QMI NAS Attach Detach' request/response */
+
+/**
+ * QmiNasPsAttachAction:
+ * @QMI_NAS_PS_ATTACH_ACTION_ATTACH: Attach the PS domain.
+ * @QMI_NAS_PS_ATTACH_ACTION_DETACH: Detach the PS domain.
+ *
+ * Packet Switched domain attach/detach action.
+ *
+ * Since: 1.20
+ */
+typedef enum {
+    QMI_NAS_PS_ATTACH_ACTION_ATTACH = 0x01,
+    QMI_NAS_PS_ATTACH_ACTION_DETACH = 0x02
+} QmiNasPsAttachAction;
+
+/**
+ * qmi_nas_ps_attach_action_get_string:
+ *
+ * Since: 1.20
+ */
+
+/*****************************************************************************/
 /* Helper enums for the 'QMI NAS Get Serving System' request/response */
 
 /**
-- 
cgit v1.1