nas: implement "Get System Info" request/response

3 files changed, 724 insertions, 3 deletions

diff --git a/TODO b/TODO
index dc643e1..d6542fc 100644
--- a/TODO
+++ b/TODO
@@ -33,5 +33,5 @@ List of things left for later:
  * qmicli: Implement `--dms-get-software-version'.
  * qmicli: Implement `--dms-set-service-programming-code'.
 
- * nas: Define the 'QmiNasRegistrationRejectCause' enum for TLV 0x12 in the
-   "Event Report" indication.
+ * nas: Define the 'QmiNasRegistrationRejectCause' enum for the "Event Report"
+   indication and "Get System Info" response.
diff --git a/data/qmi-service-nas.json b/data/qmi-service-nas.json
index 499a731..1825c1c 100644
--- a/data/qmi-service-nas.json
+++ b/data/qmi-service-nas.json
@@ -1222,6 +1222,620 @@
                                         "public-format" : "gboolean" } ] } ] },
 
   // *********************************************************************************
+  {  "name"    : "Get System Info",
+     "type"    : "Message",
+     "service" : "NAS",
+     "id"      : "0x004D",
+     "version" : "1.8",
+     "output"  : [  { "common-ref" : "Operation Result" },
+                    { "name"      : "CDMA Service Status",
+                      "id"        : "0x10",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "Preferred Data Path",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "HDR Service Status",
+                      "id"        : "0x11",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "Preferred Data Path",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "GSM Service Status",
+                      "id"        : "0x12",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "True Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "Preferred Data Path",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "WCDMA Service Status",
+                      "id"        : "0x13",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "True Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "Preferred Data Path",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "LTE Service Status",
+                      "id"        : "0x14",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "True Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "Preferred Data Path",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "CDMA System Info",
+                      "id"        : "0x15",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Service Capability Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Service Capability",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Roaming Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Roaming Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasRoamingStatus" },
+                                      { "name"          : "Forbidden Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Forbidden",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "PRL Match Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "PRL Match",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "P Rev Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "P Rev",
+                                        "format"        : "guint8" },
+                                      { "name"          : "Base Station P Rev Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Base Station P Rev",
+                                        "format"        : "guint8" },
+                                      { "name"          : "Concurrent Service Support Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Concurrent Service Support",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "CDMA System ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "SID",
+                                        "format"        : "guint16" },
+                                      { "name"          : "NID",
+                                        "format"        : "guint16" },
+                                      { "name"          : "Base Station Info Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"   : "Base Station ID",
+                                        "format" : "guint16" },
+                                      { "name"   : "Base Station Latitude",
+                                        "format" : "gint32" },
+                                      { "name"   : "Base Station Longitude",
+                                        "format" : "gint32" },
+                                      { "name"          : "Packet Zone Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"   : "Packet Zone",
+                                        "format" : "guint16" },
+                                      { "name"          : "Network ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"       : "MCC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"       : "MNC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" } ] },
+                    { "name"      : "HDR System Info",
+                      "id"        : "0x16",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Service Capability Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Service Capability",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Roaming Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Roaming Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasRoamingStatus" },
+                                      { "name"          : "Forbidden Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Forbidden",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "PRL Match Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "PRL Match",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Personality Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Personality",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasHdrPersonality" },
+                                      { "name"          : "Protocol Revision Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Protocol Revision",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasHdrProtocolRevision" },
+                                      { "name"          : "IS 856 System ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"       : "IS 856 System ID",
+                                        "format"     : "string",
+                                        "fixed-size" : "16" } ] },
+                    { "name"      : "GSM System Info",
+                      "id"        : "0x17",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Service Capability Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Service Capability",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Roaming Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Roaming Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasRoamingStatus" },
+                                      { "name"          : "Forbidden Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Forbidden",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC",
+                                        "format"        : "guint16" },
+                                      { "name"          : "CID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "CID",
+                                        "format"        : "guint32" },
+                                      { "name"          : "Registration Reject Info Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Registration Reject Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Registration Reject Cause",
+                                        "format"        : "guint8" },
+                                      { "name"          : "Network ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"       : "MCC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"       : "MNC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"          : "EGPRS Support Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "EGPRS Support",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "DTM Support Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "DTM Support",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "WCDMA System Info",
+                      "id"        : "0x18",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Service Capability Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Service Capability",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Roaming Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Roaming Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasRoamingStatus" },
+                                      { "name"          : "Forbidden Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Forbidden",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC",
+                                        "format"        : "guint16" },
+                                      { "name"          : "CID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "CID",
+                                        "format"        : "guint32" },
+                                      { "name"          : "Registration Reject Info Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Registration Reject Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Registration Reject Cause",
+                                        "format"        : "guint8" },
+                                      { "name"          : "Network ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"       : "MCC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"       : "MNC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"          : "HS Call Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "HS Call Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasWcdmaHsService" },
+                                      { "name"          : "HS Service Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "HS Service",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasWcdmaHsService" },
+                                      { "name"          : "Primary Scrambling Code Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Primary Scrambling Code",
+                                        "format"        : "guint16" } ] },
+                    { "name"      : "LTE System Info",
+                      "id"        : "0x19",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Service Capability Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Service Capability",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Roaming Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Roaming Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasRoamingStatus" },
+                                      { "name"          : "Forbidden Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Forbidden",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC",
+                                        "format"        : "guint16" },
+                                      { "name"          : "CID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "CID",
+                                        "format"        : "guint32" },
+                                      { "name"          : "Registration Reject Info Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Registration Reject Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Registration Reject Cause",
+                                        "format"        : "guint8" },
+                                      { "name"          : "Network ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"       : "MCC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"       : "MNC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"          : "TAC Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "TAC",
+                                        "format"        : "guint16" } ] },
+                    { "name"      : "Additional CDMA System Info",
+                      "id"        : "0x1A",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"   : "Geo System Index",
+                                        "format" : "guint16" },
+                                      { "name"   : "Registration Period",
+                                        "format" : "guint16" } ] },
+                    { "name"      : "Additional HDR System Info",
+                      "id"        : "0x1B",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"   : "Geo System Index",
+                                        "format" : "guint16" } ] },
+                    { "name"      : "Additional GSM System Info",
+                      "id"        : "0x1C",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"   : "Geo System Index",
+                                        "format" : "guint16" },
+                                      { "name"          : "Cell Broadcast Support",
+                                        "format"        : "guint32",
+                                        "public-format" : "QmiNasCellBroadcastCapability" } ] },
+                    { "name"      : "Additional WCDMA System Info",
+                      "id"        : "0x1D",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"   : "Geo System Index",
+                                        "format" : "guint16" },
+                                      { "name"          : "Cell Broadcast Support",
+                                        "format"        : "guint32",
+                                        "public-format" : "QmiNasCellBroadcastCapability" } ] },
+                    { "name"      : "Additional LTE System Info",
+                      "id"        : "0x1E",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"   : "Geo System Index",
+                                        "format" : "guint16" } ] },
+                    { "name"      : "GSM Call Barring Status",
+                      "id"        : "0x1F",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "CS Status",
+                                        "format"        : "gint32",
+                                        "public-format" : "QmiNasCallBarringStatus" },
+                                      { "name"          : "PS Status",
+                                        "format"        : "gint32",
+                                        "public-format" : "QmiNasCallBarringStatus" } ] },
+                    { "name"      : "WCDMA Call Barring Status",
+                      "id"        : "0x20",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "CS Status",
+                                        "format"        : "gint32",
+                                        "public-format" : "QmiNasCallBarringStatus" },
+                                      { "name"          : "PS Status",
+                                        "format"        : "gint32",
+                                        "public-format" : "QmiNasCallBarringStatus" } ] },
+                    { "name"          : "LTE Voice Support",
+                      "id"            : "0x21",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "format"        : "guint8",
+                      "public-format" : "gboolean" },
+                    { "name"          : "GSM Cipher Domain",
+                      "id"            : "0x22",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "format"        : "guint8",
+                      "public-format" : "QmiNasNetworkServiceDomain" },
+                    { "name"          : "WCDMA Cipher Domain",
+                      "id"            : "0x23",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "format"        : "guint8",
+                      "public-format" : "QmiNasNetworkServiceDomain" },
+                    { "name"      : "TD SCDMA Service Status",
+                      "id"        : "0x24",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "True Service Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasServiceStatus" },
+                                      { "name"          : "Preferred Data Path",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" } ] },
+                    { "name"      : "TD SCDMA System Info",
+                      "id"        : "0x25",
+                      "mandatory" : "no",
+                      "type"      : "TLV",
+                      "format"    : "sequence",
+                      "contents"  : [ { "name"          : "Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Service Capability Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Service Capability",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Roaming Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Roaming Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasRoamingStatus" },
+                                      { "name"          : "Forbidden Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Forbidden",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "LAC",
+                                        "format"        : "guint16" },
+                                      { "name"          : "CID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "CID",
+                                        "format"        : "guint32" },
+                                      { "name"          : "Registration Reject Info Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Registration Reject Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" },
+                                      { "name"          : "Registration Reject Cause",
+                                        "format"        : "guint8" },
+                                      { "name"          : "Network ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"       : "MCC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"       : "MNC",
+                                        "format"     : "string",
+                                        "fixed-size" : "3" },
+                                      { "name"          : "HS Call Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "HS Call Status",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasWcdmaHsService" },
+                                      { "name"          : "HS Service Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "HS Service",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasWcdmaHsService" },
+                                      { "name"          : "Cell Parameter ID Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"   : "Cell Parameter ID",
+                                        "format" : "guint16" },
+                                      { "name"          : "Cell Broadcast Support Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Cell Broadcast Support",
+                                        "format"        : "guint32",
+                                        "public-format" : "QmiNasCellBroadcastCapability" },
+                                      { "name"          : "CS Call Barring Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "CS Call Barring Status",
+                                        "format"        : "gint32",
+                                        "public-format" : "QmiNasCallBarringStatus" },
+                                      { "name"          : "PS Call Barring Status Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "PS Call Barring Status",
+                                        "format"        : "gint32",
+                                        "public-format" : "QmiNasCallBarringStatus" },
+                                      { "name"          : "Cipher Domain Valid",
+                                        "format"        : "guint8",
+                                        "public-format" : "gboolean" },
+                                      { "name"          : "Cipher Domain",
+                                        "format"        : "guint8",
+                                        "public-format" : "QmiNasNetworkServiceDomain" } ] },
+                    { "name"          : "LTE eMBMS Coverage Info Support",
+                      "id"            : "0x26",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "format"        : "guint8",
+                      "public-format" : "gboolean" },
+                    { "name"          : "SIM Reject Info",
+                      "id"            : "0x27",
+                      "mandatory"     : "no",
+                      "type"          : "TLV",
+                      "format"        : "guint32",
+                      "public-format" : "QmiNasSimRejectState" } ] },
+
+  // *********************************************************************************
   {  "name"    : "Get Signal Info",
      "type"    : "Message",
      "service" : "NAS",
diff --git a/libqmi-glib/qmi-enums-nas.h b/libqmi-glib/qmi-enums-nas.h
index 6a3c920..51f58e4 100644
--- a/libqmi-glib/qmi-enums-nas.h
+++ b/libqmi-glib/qmi-enums-nas.h
@@ -222,7 +222,7 @@ typedef enum {
  * @QMI_NAS_NETWORK_SERVICE_DOMAIN_CS: Circuit switched.
  * @QMI_NAS_NETWORK_SERVICE_DOMAIN_PS: Packet switched.
  * @QMI_NAS_NETWORK_SERVICE_DOMAIN_CS_PS: Circuit and packet switched.
- * @QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN: Unknown service..
+ * @QMI_NAS_NETWORK_SERVICE_DOMAIN_UNKNOWN: Unknown service.
  *
  * Network Service Domain.
  */
@@ -668,4 +668,111 @@ typedef enum {
     QMI_NAS_TD_SCDMA_BAND_PREFERENCE_F = 1 << 5
 } QmiNasTdScdmaBandPreference;
 
+/*****************************************************************************/
+/* Helper enums for the 'QMI NAS Get System Info' request/response */
+
+/**
+ * QmiNasRoamingStatus:
+ * @QMI_NAS_ROAMING_STATUS_OFF: Off.
+ * @QMI_NAS_ROAMING_STATUS_ON: On.
+ * @QMI_NAS_ROAMING_STATUS_BLINK: Blinking.
+ * @QMI_NAS_ROAMING_STATUS_OUT_OF_NEIGHBORHOOD: Out of neighborhood.
+ * @QMI_NAS_ROAMING_STATUS_OUT_OF_BUILDING: Out of building.
+ * @QMI_NAS_ROAMING_STATUS_PREFERRED_SYSTEM: Preferred system.
+ * @QMI_NAS_ROAMING_STATUS_AVAILABLE_SYSTEM: Available system.
+ * @QMI_NAS_ROAMING_STATUS_ALLIANCE_PARTNER: Alliance partner.
+ * @QMI_NAS_ROAMING_STATUS_PREMIUM_PARTNER: Premium partner.
+ * @QMI_NAS_ROAMING_STATUS_FULL_SERVICE: Full service.
+ * @QMI_NAS_ROAMING_STATUS_PARTIAL_SERVICE: Partial service.
+ * @QMI_NAS_ROAMING_STATUS_BANNER_ON: Banner on.
+ * @QMI_NAS_ROAMING_STATUS_BANNER_OFF: Banner off.
+*/
+typedef enum {
+    QMI_NAS_ROAMING_STATUS_OFF                 = 0x00,
+    QMI_NAS_ROAMING_STATUS_ON                  = 0x01,
+    /* Next ones only for 3GPP2 */
+    QMI_NAS_ROAMING_STATUS_BLINK               = 0x02,
+    QMI_NAS_ROAMING_STATUS_OUT_OF_NEIGHBORHOOD = 0x03,
+    QMI_NAS_ROAMING_STATUS_OUT_OF_BUILDING     = 0x04,
+    QMI_NAS_ROAMING_STATUS_PREFERRED_SYSTEM    = 0x05,
+    QMI_NAS_ROAMING_STATUS_AVAILABLE_SYSTEM    = 0x06,
+    QMI_NAS_ROAMING_STATUS_ALLIANCE_PARTNER    = 0x07,
+    QMI_NAS_ROAMING_STATUS_PREMIUM_PARTNER     = 0x08,
+    QMI_NAS_ROAMING_STATUS_FULL_SERVICE        = 0x09,
+    QMI_NAS_ROAMING_STATUS_PARTIAL_SERVICE     = 0x0A,
+    QMI_NAS_ROAMING_STATUS_BANNER_ON           = 0x0B,
+    QMI_NAS_ROAMING_STATUS_BANNER_OFF          = 0x0C
+} QmiNasRoamingStatus;
+
+/**
+ * QmiNasHdrProtocolRevision:
+ * @QMI_NAS_HDR_PROTOCOL_REVISION_NONE: None.
+ * @QMI_NAS_HDR_PROTOCOL_REVISION_REL_0: HDR Rel 0.
+ * @QMI_NAS_HDR_PROTOCOL_REVISION_REL_A: HDR Rel A.
+ * @QMI_NAS_HDR_PROTOCOL_REVISION_REL_B: HDR Rel B.
+ *
+ * HDR protocol revision.
+ */
+typedef enum {
+    QMI_NAS_HDR_PROTOCOL_REVISION_NONE  = 0x00,
+    QMI_NAS_HDR_PROTOCOL_REVISION_REL_0 = 0x01,
+    QMI_NAS_HDR_PROTOCOL_REVISION_REL_A = 0x02,
+    QMI_NAS_HDR_PROTOCOL_REVISION_REL_B = 0x03
+} QmiNasHdrProtocolRevision;
+
+/**
+ * QmiNasWcdmaHsService:
+ * @QMI_NAS_WCDMA_HS_SERVICE_HSDPA_HSUPA_UNSUPPORTED: HSDPA and HSUPA not supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_HSDPA_SUPPORTED: HSDPA supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_HSUPA_SUPPORTED: HSUPA supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_HSDPA_HSUPA_SUPPORTED: HSDPA and HSUPA supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_HSDPA_PLUS_SUPPORTED: HSDPA+ supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_HSDPA_PLUS_HSUPA_SUPPORTED: HSDPA+ and HSUPA supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_DC_HSDPA_PLUS_SUPPORTED: DC-HSDPA+ supported.
+ * @QMI_NAS_WCDMA_HS_SERVICE_DC_HSDPA_PLUS_HSUPA_SUPPORTED: DC-HSDPA+ and HSUPA supported.
+ * Call status on high speed.
+ */
+typedef enum {
+    QMI_NAS_WCDMA_HS_SERVICE_HSDPA_HSUPA_UNSUPPORTED       = 0x00,
+    QMI_NAS_WCDMA_HS_SERVICE_HSDPA_SUPPORTED               = 0x01,
+    QMI_NAS_WCDMA_HS_SERVICE_HSUPA_SUPPORTED               = 0x02,
+    QMI_NAS_WCDMA_HS_SERVICE_HSDPA_HSUPA_SUPPORTED         = 0x03,
+    QMI_NAS_WCDMA_HS_SERVICE_HSDPA_PLUS_SUPPORTED          = 0x04,
+    QMI_NAS_WCDMA_HS_SERVICE_HSDPA_PLUS_HSUPA_SUPPORTED    = 0x05,
+    QMI_NAS_WCDMA_HS_SERVICE_DC_HSDPA_PLUS_SUPPORTED       = 0x06,
+    QMI_NAS_WCDMA_HS_SERVICE_DC_HSDPA_PLUS_HSUPA_SUPPORTED = 0x07
+} QmiNasWcdmaHsService;
+
+/**
+ * QmiNasCellBroadcastCapability:
+ * @QMI_NAS_CELL_BROADCAST_CAPABILITY_UNKNOWN: Unknown.
+ * @QMI_NAS_CELL_BROADCAST_CAPABILITY_OFF: Cell broadcast not supported.
+ * @QMI_NAS_CELL_BROADCAST_CAPABILITY_ON: Cell broadcast supported.
+ *
+ * Cell broadcast support.
+ */
+typedef enum {
+    QMI_NAS_CELL_BROADCAST_CAPABILITY_UNKNOWN = 0x00,
+    QMI_NAS_CELL_BROADCAST_CAPABILITY_OFF     = 0x01,
+    QMI_NAS_CELL_BROADCAST_CAPABILITY_ON      = 0x02
+} QmiNasCellBroadcastCapability;
+
+/**
+ * QmiNasSimRejectState:
+ * @QMI_NAS_SIM_REJECT_STATE_SIM_UNAVAILABLE: SIM not available.
+ * @QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE: SIM available.
+ * @QMI_NAS_SIM_REJECT_STATE_SIM_CS_INVALID: SIM invalid for circuit-switched connections.
+ * @QMI_NAS_SIM_REJECT_STATE_SIM_PS_INVALID: SIM invalid for packet-switched connections.
+ * @QMI_NAS_SIM_REJECT_STATE_SIM_CS_PS_INVALID: SIM invalid for circuit-switched and packet-switched connections.
+ *
+ * Reject information of the SIM.
+ */
+typedef enum {
+    QMI_NAS_SIM_REJECT_STATE_SIM_UNAVAILABLE   = 0,
+    QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE      = 1,
+    QMI_NAS_SIM_REJECT_STATE_SIM_CS_INVALID    = 2,
+    QMI_NAS_SIM_REJECT_STATE_SIM_PS_INVALID    = 3,
+    QMI_NAS_SIM_REJECT_STATE_SIM_CS_PS_INVALID = 4
+} QmiNasSimRejectState;
+
 #endif /* _LIBQMI_GLIB_QMI_ENUMS_NAS_H_ */