summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build-aux/mbim-codegen/Message.py4
-rw-r--r--build-aux/mbim-codegen/ObjectList.py4
-rw-r--r--data/mbim-service-atds.json5
-rw-r--r--data/mbim-service-auth.json3
-rw-r--r--data/mbim-service-basic-connect.json22
-rw-r--r--data/mbim-service-dss.json1
-rw-r--r--data/mbim-service-intel-firmware-update.json1
-rwxr-xr-xdata/mbim-service-ms-basic-connect-extensions.json9
-rw-r--r--data/mbim-service-ms-firmware-id.json1
-rw-r--r--data/mbim-service-ms-host-shutdown.json1
-rw-r--r--data/mbim-service-ms-sar.json2
-rw-r--r--data/mbim-service-ms-uicc-low-level-access.json6
-rw-r--r--data/mbim-service-phonebook.json4
-rw-r--r--data/mbim-service-proxy-control.json1
-rw-r--r--data/mbim-service-qdu.json7
-rw-r--r--data/mbim-service-qmi.json1
-rw-r--r--data/mbim-service-sms.json5
-rw-r--r--data/mbim-service-stk.json3
-rw-r--r--data/mbim-service-ussd.json1
19 files changed, 7 insertions, 74 deletions
diff --git a/build-aux/mbim-codegen/Message.py b/build-aux/mbim-codegen/Message.py
index 248efc4..92d0d78 100644
--- a/build-aux/mbim-codegen/Message.py
+++ b/build-aux/mbim-codegen/Message.py
@@ -92,9 +92,9 @@ class Message:
"""
Constructor
"""
- def __init__(self, dictionary):
+ def __init__(self, service, dictionary):
# The message service, e.g. "Basic Connect"
- self.service = dictionary['service']
+ self.service = service
# The name of the specific message, e.g. "Something"
self.name = dictionary['name']
diff --git a/build-aux/mbim-codegen/ObjectList.py b/build-aux/mbim-codegen/ObjectList.py
index 3faf1ee..bde711b 100644
--- a/build-aux/mbim-codegen/ObjectList.py
+++ b/build-aux/mbim-codegen/ObjectList.py
@@ -44,7 +44,9 @@ class ObjectList:
# Loop items in the list, creating Message objects for the messages
for object_dictionary in objects_dictionary:
if object_dictionary['type'] == 'Command':
- self.command_list.append(Message(object_dictionary))
+ if self.service == '':
+ raise ValueError('Service name not specified before the first command')
+ self.command_list.append(Message(self.service, object_dictionary))
elif object_dictionary['type'] == 'Struct':
self.struct_list.append(Struct(object_dictionary))
elif object_dictionary['type'] == 'Service':
diff --git a/data/mbim-service-atds.json b/data/mbim-service-atds.json
index 3b8f2ed..717f537 100644
--- a/data/mbim-service-atds.json
+++ b/data/mbim-service-atds.json
@@ -5,7 +5,6 @@
// *********************************************************************************
{ "name" : "Signal",
- "service" : "ATDS",
"type" : "Command",
"since" : "1.16",
"query" : [],
@@ -64,7 +63,6 @@
// *********************************************************************************
{ "name" : "Location",
- "service" : "ATDS",
"type" : "Command",
"since" : "1.16",
"query" : [],
@@ -95,7 +93,6 @@
"format" : "guint32" } ] },
{ "name" : "Operators",
- "service" : "ATDS",
"type" : "Command",
"since" : "1.16",
"query" : [],
@@ -108,7 +105,6 @@
// *********************************************************************************
{ "name" : "RAT",
- "service" : "ATDS",
"type" : "Command",
"since" : "1.16",
"set" : [ { "name" : "Mode",
@@ -121,7 +117,6 @@
// *********************************************************************************
{ "name" : "Register State",
- "service" : "ATDS",
"type" : "Command",
"since" : "1.16",
"query" : [],
diff --git a/data/mbim-service-auth.json b/data/mbim-service-auth.json
index ea8a783..3f099ef 100644
--- a/data/mbim-service-auth.json
+++ b/data/mbim-service-auth.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Aka",
- "service" : "Auth",
"type" : "Command",
"since" : "1.4",
"query" : [ { "name" : "Rand",
@@ -32,7 +31,6 @@
// *********************************************************************************
{ "name" : "Akap",
- "service" : "Auth",
"type" : "Command",
"since" : "1.4",
"query" : [ { "name" : "Rand",
@@ -60,7 +58,6 @@
// *********************************************************************************
{ "name" : "Sim",
- "service" : "Auth",
"type" : "Command",
"since" : "1.4",
"query" : [ { "name" : "Rand1",
diff --git a/data/mbim-service-basic-connect.json b/data/mbim-service-basic-connect.json
index c664a79..6a45143 100644
--- a/data/mbim-service-basic-connect.json
+++ b/data/mbim-service-basic-connect.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Device Caps",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"query" : [],
@@ -48,7 +47,6 @@
// *********************************************************************************
{ "name" : "Subscriber Ready Status",
- "service" : "Basic Connect",
"type" : "Command",
"since-ex" : { "query" : "1.0",
"response" : "1.0",
@@ -87,7 +85,6 @@
// *********************************************************************************
{ "name" : "Radio State",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "RadioState",
@@ -109,7 +106,6 @@
// *********************************************************************************
{ "name" : "Pin",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "PinType",
@@ -148,7 +144,6 @@
"format" : "guint32" } ] },
{ "name" : "Pin List",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"query" : [],
@@ -203,7 +198,6 @@
"format" : "guint32" } ] },
{ "name" : "Home Provider",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.2",
"set" : [ { "name" : "Provider",
@@ -216,7 +210,6 @@
// *********************************************************************************
{ "name" : "Preferred Providers",
- "service" : "Basic Connect",
"type" : "Command",
"since-ex" : { "set" : "1.2",
"query" : "1.2",
@@ -244,7 +237,6 @@
// *********************************************************************************
{ "name" : "Visible Providers",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.2",
"query" : [ { "name" : "Action",
@@ -259,7 +251,6 @@
// *********************************************************************************
{ "name" : "Register State",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "ProviderId",
@@ -322,7 +313,6 @@
// *********************************************************************************
{ "name" : "Signal State",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "SignalStrengthInterval",
@@ -356,7 +346,6 @@
// *********************************************************************************
{ "name" : "Packet Service",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "PacketServiceAction",
@@ -390,7 +379,6 @@
// *********************************************************************************
{ "name" : "Connect",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "SessionId",
@@ -483,7 +471,6 @@
"public-format" : "MbimAuthProtocol" } ] },
{ "name" : "Provisioned Contexts",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"set" : [ { "name" : "ContextId",
@@ -521,7 +508,6 @@
// *********************************************************************************
{ "name" : "Service Activation",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.2",
"set" : [ { "name" : "Buffer",
@@ -550,7 +536,6 @@
"format" : "ipv6" } ] },
{ "name" : "IP Configuration",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"query" : [ { "name" : "SessionId",
@@ -685,7 +670,6 @@
"array-size-field" : "CidsCount" } ] },
{ "name" : "Device Services",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.0",
"query" : [],
@@ -711,7 +695,6 @@
"array-size-field" : "CidsCount" } ] },
{ "name" : "Device Service Subscribe List",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.8",
"set" : [ { "name" : "EventsCount",
@@ -729,7 +712,6 @@
// *********************************************************************************
{ "name" : "Packet Statistics",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.4",
"query" : [],
@@ -752,7 +734,6 @@
// *********************************************************************************
{ "name" : "Network Idle Hint",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.4",
"query" : [],
@@ -765,7 +746,6 @@
// *********************************************************************************
{ "name" : "Emergency Mode",
- "service" : "Basic Connect",
"type" : "Command",
"since-ex" : { "set" : "1.4",
"query" : "1.4",
@@ -796,7 +776,6 @@
"array-size-field" : "FilterSize" } ] },
{ "name" : "IP Packet Filters",
- "service" : "Basic Connect",
"type" : "Command",
"since" : "1.4",
"query" : [ { "name" : "SessionId",
@@ -826,7 +805,6 @@
// *********************************************************************************
{ "name" : "Multicarrier Providers",
- "service" : "Basic Connect",
"type" : "Command",
"since-ex" : { "set" : "1.4",
"query" : "1.4",
diff --git a/data/mbim-service-dss.json b/data/mbim-service-dss.json
index db72d17..93211fb 100644
--- a/data/mbim-service-dss.json
+++ b/data/mbim-service-dss.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Connect",
- "service" : "DSS",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "DeviceServiceId",
diff --git a/data/mbim-service-intel-firmware-update.json b/data/mbim-service-intel-firmware-update.json
index 2998de1..e75af8d 100644
--- a/data/mbim-service-intel-firmware-update.json
+++ b/data/mbim-service-intel-firmware-update.json
@@ -5,7 +5,6 @@
// *********************************************************************************
{ "name" : "Modem Reboot",
- "service" : "Intel Firmware Update",
"type" : "Command",
"since" : "1.16",
"set" : [] }
diff --git a/data/mbim-service-ms-basic-connect-extensions.json b/data/mbim-service-ms-basic-connect-extensions.json
index d312225..13c0c83 100755
--- a/data/mbim-service-ms-basic-connect-extensions.json
+++ b/data/mbim-service-ms-basic-connect-extensions.json
@@ -19,7 +19,6 @@
"array-size-field" : "PcoDataSize" } ] },
{ "name" : "PCO",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.18",
"query" : [ { "name" : "PcoValue",
@@ -60,7 +59,6 @@
"public-format" : "MbimAuthProtocol" } ] },
{ "name" : "Lte Attach Configuration",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.18",
"set" : [ { "name" : "Operation",
@@ -89,7 +87,6 @@
// *********************************************************************************
{ "name" : "Lte Attach Info",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.26",
"query" : [],
@@ -133,7 +130,6 @@
//**********************************************************************************
{ "name" : "Sys Caps",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.26",
"query" : [],
@@ -149,7 +145,6 @@
//**********************************************************************************
{ "name" : "Slot Info Status",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.26",
"query" : [ { "name" : "SlotIndex",
@@ -174,7 +169,6 @@
"format" : "guint32" } ] },
{ "name" : "Device Slot Mappings",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "MapCount",
@@ -194,7 +188,6 @@
//************************************************************************************
{ "name" : "Device Caps",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.26",
"query" : [],
@@ -239,7 +232,6 @@
// *********************************************************************************
{ "name" : "Version",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.28",
"query" : [ { "name" : "MbimVersion",
@@ -254,7 +246,6 @@
//************************************************************************************
{ "name" : "Location Info Status",
- "service" : "Ms Basic Connect Extensions",
"type" : "Command",
"since" : "1.28",
"query" : [],
diff --git a/data/mbim-service-ms-firmware-id.json b/data/mbim-service-ms-firmware-id.json
index ea3fafe..bb4a430 100644
--- a/data/mbim-service-ms-firmware-id.json
+++ b/data/mbim-service-ms-firmware-id.json
@@ -5,7 +5,6 @@
// *********************************************************************************
{ "name" : "Get",
- "service" : "MS Firmware ID",
"type" : "Command",
"since" : "1.8",
"query" : [],
diff --git a/data/mbim-service-ms-host-shutdown.json b/data/mbim-service-ms-host-shutdown.json
index 7a3e9b5..2192cc0 100644
--- a/data/mbim-service-ms-host-shutdown.json
+++ b/data/mbim-service-ms-host-shutdown.json
@@ -5,7 +5,6 @@
// *********************************************************************************
{ "name" : "Notify",
- "service" : "MS Host Shutdown",
"type" : "Command",
"since" : "1.8",
"set" : [] }
diff --git a/data/mbim-service-ms-sar.json b/data/mbim-service-ms-sar.json
index 402490d..58b3acc 100644
--- a/data/mbim-service-ms-sar.json
+++ b/data/mbim-service-ms-sar.json
@@ -14,7 +14,6 @@
"format" : "guint32" } ] },
{ "name" : "Config",
- "service" : "MS SAR",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "Mode",
@@ -49,7 +48,6 @@
// *********************************************************************************
{ "name" : "Transmission status",
- "service" : "MS SAR",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "ChannelNotification",
diff --git a/data/mbim-service-ms-uicc-low-level-access.json b/data/mbim-service-ms-uicc-low-level-access.json
index 8307d21..a9db9fe 100644
--- a/data/mbim-service-ms-uicc-low-level-access.json
+++ b/data/mbim-service-ms-uicc-low-level-access.json
@@ -5,7 +5,6 @@
// ************************************************************************
{ "name" : "ATR",
- "service" : "MS UICC Low Level Access",
"type" : "Command",
"since" : "1.26",
"query" : [],
@@ -14,7 +13,6 @@
// ************************************************************************
{ "name" : "Open Channel",
- "service" : "MS UICC Low Level Access",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "AppId",
@@ -32,7 +30,6 @@
// ************************************************************************
{ "name" : "Close Channel",
- "service" : "MS UICC Low Level Access",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "Channel",
@@ -44,7 +41,6 @@
// ************************************************************************
{ "name" : "APDU",
- "service" : "MS UICC Low Level Access",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "Channel",
@@ -71,7 +67,6 @@
"format" : "unsized-byte-array" } ] },
{ "name" : "Terminal Capability",
- "service" : "MS UICC Low Level Access",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "TerminalCapabilityCount",
@@ -90,7 +85,6 @@
// *********************************************************************************
{ "name" : "Reset",
- "service" : "MS UICC Low Level Access",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "PassThroughAction",
diff --git a/data/mbim-service-phonebook.json b/data/mbim-service-phonebook.json
index 452d53f..170b0ee 100644
--- a/data/mbim-service-phonebook.json
+++ b/data/mbim-service-phonebook.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Configuration",
- "service" : "Phonebook",
"type" : "Command",
"since" : "1.4",
"query" : [],
@@ -45,7 +44,6 @@
"format" : "string" } ] },
{ "name" : "Read",
- "service" : "Phonebook",
"type" : "Command",
"since" : "1.4",
"query" : [ { "name" : "FilterFlag",
@@ -62,7 +60,6 @@
// *********************************************************************************
{ "name" : "Delete",
- "service" : "Phonebook",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "FilterFlag",
@@ -75,7 +72,6 @@
// *********************************************************************************
{ "name" : "Write",
- "service" : "Phonebook",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "SaveFlag",
diff --git a/data/mbim-service-proxy-control.json b/data/mbim-service-proxy-control.json
index 68e47ef..bbd2180 100644
--- a/data/mbim-service-proxy-control.json
+++ b/data/mbim-service-proxy-control.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Configuration",
- "service" : "Proxy Control",
"type" : "Command",
"since" : "1.10",
"set" : [ { "name" : "DevicePath",
diff --git a/data/mbim-service-qdu.json b/data/mbim-service-qdu.json
index 285f59d..e2ee9da 100644
--- a/data/mbim-service-qdu.json
+++ b/data/mbim-service-qdu.json
@@ -5,7 +5,6 @@
// *********************************************************************************
{ "name" : "Update Session",
- "service" : "QDU",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "SessionAction",
@@ -31,10 +30,9 @@
"format" : "guint32" },
{ "name" : "LastSessionErrorSize",
"format" : "guint32" } ] },
-
+
// *********************************************************************************
{ "name" : "File Open",
- "service" : "QDU",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "FileType",
@@ -47,10 +45,9 @@
"format" : "guint32" },
{ "name" : "MaxWindowSize",
"format" : "guint32" } ] },
-
+
// *********************************************************************************
{ "name" : "File Write",
- "service" : "QDU",
"type" : "Command",
"since" : "1.26",
"set" : [ { "name" : "DataBuffer",
diff --git a/data/mbim-service-qmi.json b/data/mbim-service-qmi.json
index eed861e..12ef5bb 100644
--- a/data/mbim-service-qmi.json
+++ b/data/mbim-service-qmi.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "msg",
- "service" : "QMI",
"type" : "Command",
"since-ex" : { "set" : "1.14",
"response" : "1.14",
diff --git a/data/mbim-service-sms.json b/data/mbim-service-sms.json
index b6e2ecb..590cbf5 100644
--- a/data/mbim-service-sms.json
+++ b/data/mbim-service-sms.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Configuration",
- "service" : "SMS",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "Format",
@@ -64,7 +63,6 @@
"format" : "guint32" } ] },
{ "name" : "Read",
- "service" : "SMS",
"type" : "Command",
"since" : "1.4",
"query" : [ { "name" : "Format",
@@ -138,7 +136,6 @@
"format" : "guint32" } ] },
{ "name" : "Send",
- "service" : "SMS",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "Format",
@@ -161,7 +158,6 @@
// *********************************************************************************
{ "name" : "Delete",
- "service" : "SMS",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "Flag",
@@ -173,7 +169,6 @@
// *********************************************************************************
{ "name" : "Message Store Status",
- "service" : "SMS",
"type" : "Command",
"since" : "1.4",
"query" : [],
diff --git a/data/mbim-service-stk.json b/data/mbim-service-stk.json
index 44a7c97..bf3acc7 100644
--- a/data/mbim-service-stk.json
+++ b/data/mbim-service-stk.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "Pac",
- "service" : "STK",
"type" : "Command",
"since" : "1.4",
"query" : [],
@@ -24,7 +23,6 @@
// *********************************************************************************
{ "name" : "Terminal Response",
- "service" : "STK",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "Response",
@@ -36,7 +34,6 @@
// *********************************************************************************
{ "name" : "Envelope",
- "service" : "STK",
"type" : "Command",
"since" : "1.4",
"query" : [],
diff --git a/data/mbim-service-ussd.json b/data/mbim-service-ussd.json
index 7b0f594..047cdfc 100644
--- a/data/mbim-service-ussd.json
+++ b/data/mbim-service-ussd.json
@@ -6,7 +6,6 @@
// *********************************************************************************
{ "name" : "",
- "service" : "USSD",
"type" : "Command",
"since" : "1.4",
"set" : [ { "name" : "Action",
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 08:41:49 +0000