biscuit

commit 618d0dc3988b1189302a5bb9662ff76ce24dadf7
parent ddc9b85357ba85fb3b66efa129f45641661fede9
Author: Daniel Barlow <dan@telent.net>
Date:   Tue, 23 Jul 2024 21:16:45 +0100

always use proxy

Diffstat:
M
pkgs/qmi-nmea/qmi-nmea.c
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pkgs/qmi-nmea/qmi-nmea.c b/pkgs/qmi-nmea/qmi-nmea.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
- * qmicli -- Command line interface to control QMI devices
+ * qmi-nmea -- enable location services and print NMEA strings
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,8 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * This program started life as qmicli, which is
+ *
  * Copyright (C) 2012-2023 Aleksander Morgado <aleksander@aleksander.es>
  * Copyright (c) 2022 Qualcomm Innovation Center, Inc.
+ *
+ * Changes Copyright (C) 2024 Daniel Barlow
  */
 
 #include "config.h"
@@ -62,7 +66,6 @@ static gchar *device_set_instance_id_str;
 static gboolean device_open_version_info_flag;
 static gboolean device_open_sync_flag;
 static gchar *device_open_net_str;
-static gboolean device_open_proxy_flag;
 #if QMI_MBIM_QMUX_SUPPORTED
 static gboolean device_open_qmi_flag;
 static gboolean device_open_mbim_flag;
@@ -85,10 +88,6 @@ static GOptionEntry main_entries[] = {
       "[PATH]"
 #endif
     },
-    { "device-open-proxy", 'p', 0, G_OPTION_ARG_NONE, &device_open_proxy_flag,
-      "Request to use the 'qmi-proxy' proxy",
-      NULL
-    },
 #if QMI_MBIM_QMUX_SUPPORTED
     { "device-open-qmi", 0, 0, G_OPTION_ARG_NONE, &device_open_qmi_flag,
       "Open a cdc-wdm device explicitly in QMI mode",
@@ -526,8 +525,7 @@ device_new_ready (GObject *unused,
         open_flags |= QMI_DEVICE_OPEN_FLAGS_VERSION_INFO;
     if (device_open_sync_flag)
         open_flags |= QMI_DEVICE_OPEN_FLAGS_SYNC;
-    if (device_open_proxy_flag)
-        open_flags |= QMI_DEVICE_OPEN_FLAGS_PROXY;
+    open_flags |= QMI_DEVICE_OPEN_FLAGS_PROXY;
 #if QMI_MBIM_QMUX_SUPPORTED
     if (device_open_mbim_flag)
         open_flags |= QMI_DEVICE_OPEN_FLAGS_MBIM;