qmi-firmware-update: support automatic mode (QMI/MBIM) detection by default

The default, if nothing specified, is the 'auto mode', which can also be
explicitly selected with --device-open-auto.

The user may also select an explicit mode with --device-open-mbim or
--device-open-qmi.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/qmi-firmware-update/qfu-reseter.c b/src/qmi-firmware-update/qfu-reseter.c
index aad09a5..7fc0c68 100644
--- a/src/qmi-firmware-update/qfu-reseter.c
+++ b/src/qmi-firmware-update/qfu-reseter.c
@@ -36,8 +36,7 @@ G_DEFINE_TYPE (QfuReseter, qfu_reseter, G_TYPE_OBJECT)
 struct _QfuReseterPrivate {
     QfuDeviceSelection *device_selection;
     QmiClientDms       *qmi_client;
-    gboolean            device_open_proxy;
-    gboolean            device_open_mbim;
+    QmiDeviceOpenFlags  device_open_flags;
 };
 
 /******************************************************************************/
@@ -387,8 +386,7 @@ qfu_reseter_run (QfuReseter          *self,
     g_assert (ctx->cdc_wdm);
     qfu_utils_new_client_dms (ctx->cdc_wdm,
                               3,
-                              self->priv->device_open_proxy,
-                              self->priv->device_open_mbim,
+                              self->priv->device_open_flags,
                               FALSE,
                               cancellable,
                               (GAsyncReadyCallback) new_client_dms_ready,
@@ -400,16 +398,14 @@ qfu_reseter_run (QfuReseter          *self,
 QfuReseter *
 qfu_reseter_new (QfuDeviceSelection *device_selection,
                  QmiClientDms       *qmi_client,
-                 gboolean            device_open_proxy,
-                 gboolean            device_open_mbim)
+                 QmiDeviceOpenFlags  device_open_flags)
 {
     QfuReseter *self;
 
     self = g_object_new (QFU_TYPE_RESETER, NULL);
     self->priv->device_selection = g_object_ref (device_selection);
     self->priv->qmi_client = qmi_client ? g_object_ref (qmi_client) : NULL;
-    self->priv->device_open_proxy = device_open_proxy;
-    self->priv->device_open_mbim = device_open_mbim;
+    self->priv->device_open_flags = device_open_flags;
 
     return self;
 }