ms-basic-connect-v2: don't reimplement commands if they didn't change

If a given command didn't change in the new version update of the
service, skip creating methods to handle it, just use the ones from
the original version.

2 files changed, 11 insertions, 40 deletions

diff --git a/data/mbim-service-ms-basic-connect-v2.json b/data/mbim-service-ms-basic-connect-v2.json
index 713861d..f8c535a 100644
--- a/data/mbim-service-ms-basic-connect-v2.json
+++ b/data/mbim-service-ms-basic-connect-v2.json
@@ -10,15 +10,8 @@
   { "name"         : "Register State",
     "type"         : "Command",
     "since"        : "1.28",
-    "set"          : [ { "name"          : "ProviderId",
-                         "format"        : "string" },
-                       { "name"          : "RegisterAction",
-                         "format"        : "guint32",
-                         "public-format" : "MbimRegisterAction" },
-                       { "name"          : "DataClass",
-                         "format"        : "guint32",
-                         "public-format" : "MbimDataClass" } ],
-    "query"        : [],
+    // set same as in v1
+    // query same as in v1
     "response"     : [ { "name"          : "NwError",
                          "format"        : "guint32",
                          "public-format" : "MbimNwError" },
@@ -78,10 +71,8 @@
   { "name"         : "Packet Service",
     "type"         : "Command",
     "since"        : "1.28",
-    "set"          : [ { "name"          : "PacketServiceAction",
-                         "format"        : "guint32",
-                         "public-format" : "MbimPacketServiceAction" } ],
-    "query"        : [],
+    // set same as in v1
+    // query same as in v1
     "response"     : [ { "name"          : "NwError",
                          "format"        : "guint32" },
                        { "name"          : "PacketServiceState",
@@ -132,13 +123,8 @@
   { "name"         : "Signal State",
     "type"         : "Command",
     "since"        : "1.28",
-    "set"          : [ { "name"   : "SignalStrengthInterval",
-                         "format" : "guint32" },
-                       { "name"   : "RssiThreshold",
-                         "format" : "guint32" },
-                       { "name"   : "ErrorRateThreshold",
-                         "format" : "guint32" } ],
-    "query"        : [],
+    // set same as in v1
+    // query same as in v1
     "response"     : [ { "name"         : "Rssi",
                          "format"       : "guint32" },
                        { "name"         : "ErrorRate",
diff --git a/src/mbimcli/mbimcli-basic-connect.c b/src/mbimcli/mbimcli-basic-connect.c
index b2d5b83..8a9cc20 100644
--- a/src/mbimcli/mbimcli-basic-connect.c
+++ b/src/mbimcli/mbimcli-basic-connect.c
@@ -1993,10 +1993,7 @@ mbimcli_basic_connect_run (MbimDevice   *device,
 
     /* Query registration status? */
     if (query_register_state_flag) {
-        if (mbim_device_check_ms_mbimex_version (device, 2, 0))
-            request = mbim_message_ms_basic_connect_v2_register_state_query_new (NULL);
-        else
-            request = mbim_message_register_state_query_new (NULL);
+        request = mbim_message_register_state_query_new (NULL);
         mbim_device_command (ctx->device,
                              request,
                              10,
@@ -2008,10 +2005,7 @@ mbimcli_basic_connect_run (MbimDevice   *device,
 
     /* Launch automatic registration? */
     if (set_register_state_automatic_flag) {
-        if (mbim_device_check_ms_mbimex_version (device, 2, 0))
-            request = mbim_message_ms_basic_connect_v2_register_state_set_new (NULL, MBIM_REGISTER_ACTION_AUTOMATIC, 0, &error);
-        else
-            request = mbim_message_register_state_set_new (NULL, MBIM_REGISTER_ACTION_AUTOMATIC, 0, &error);
+        request = mbim_message_register_state_set_new (NULL, MBIM_REGISTER_ACTION_AUTOMATIC, 0, &error);
         if (!request) {
             g_printerr ("error: couldn't create request: %s\n", error->message);
             shutdown (FALSE);
@@ -2029,10 +2023,7 @@ mbimcli_basic_connect_run (MbimDevice   *device,
 
     /* Query signal status? */
     if (query_signal_state_flag) {
-        if (mbim_device_check_ms_mbimex_version (device, 2, 0))
-            request = mbim_message_ms_basic_connect_v2_signal_state_query_new (NULL);
-        else
-            request = mbim_message_signal_state_query_new (NULL);
+        request = mbim_message_signal_state_query_new (NULL);
         mbim_device_command (ctx->device,
                              request,
                              10,
@@ -2044,10 +2035,7 @@ mbimcli_basic_connect_run (MbimDevice   *device,
 
     /* Query packet service status? */
     if (query_packet_service_flag) {
-        if (mbim_device_check_ms_mbimex_version (device, 2, 0))
-            request = mbim_message_ms_basic_connect_v2_packet_service_query_new (NULL);
-        else
-            request = mbim_message_packet_service_query_new (NULL);
+        request = mbim_message_packet_service_query_new (NULL);
         mbim_device_command (ctx->device,
                              request,
                              10,
@@ -2069,10 +2057,7 @@ mbimcli_basic_connect_run (MbimDevice   *device,
         else
             g_assert_not_reached ();
 
-        if (mbim_device_check_ms_mbimex_version (device, 2, 0))
-            request = mbim_message_ms_basic_connect_v2_packet_service_set_new (action, &error);
-        else
-            request = mbim_message_packet_service_set_new (action, &error);
+        request = mbim_message_packet_service_set_new (action, &error);
         if (!request) {
             g_printerr ("error: couldn't create request: %s\n", error->message);
             shutdown (FALSE);