RNDIS to more generic due to CDCECM

USB Ethernet CDC-ECM gadget configuration added.
Qt Creator can be connected via USB Ethernet to Mac OS with CDCECM,
to Linux with RNDIS or CDCECM and to Windows 10 with RNDIS.

Task-number: QTBUG-82530
Change-Id: Icdca6e50f0b94c99900c4789059a96d77807c9d6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>

4 files changed, 19 insertions, 19 deletions

diff --git a/qdbd/configuration.cpp b/qdbd/configuration.cpp
index 9ae452c..72b5f47 100644
--- a/qdbd/configuration.cpp
+++ b/qdbd/configuration.cpp
@@ -45,9 +45,9 @@ QString Configuration::networkScript()
     return s_networkScript;
 }
 
-QString Configuration::rndisFunctionName()
+QString Configuration::usbEthernetFunctionName()
 {
-    return s_rndisFunctionName;
+    return s_usbEthernetFunctionName;
 }
 
 QString Configuration::udcDriverDir()
@@ -70,13 +70,13 @@ void Configuration::setNetworkScript(const QString &script)
     s_networkScript = script;
 }
 
-void Configuration::setRndisFunctionName(const QString &name)
+void Configuration::setUsbEthernetFunctionName(const QString &name)
 {
-    s_rndisFunctionName = name;
+    s_usbEthernetFunctionName = name;
 }
 
 QString Configuration::s_functionFsDir = "/dev/usb-ffs/qdb";
 QString Configuration::s_gadgetConfigFsDir = "/sys/kernel/config/usb_gadget/g1";
-QString Configuration::s_rndisFunctionName = "rndis.usb0";
+QString Configuration::s_usbEthernetFunctionName = "rndis.usb0";
 QString Configuration::s_networkScript = "b2qt-gadget-network.sh";
 QString Configuration::s_udcDriverDir = "/sys/class/udc/";
diff --git a/qdbd/configuration.h b/qdbd/configuration.h
index dadc2c0..661c58d 100644
--- a/qdbd/configuration.h
+++ b/qdbd/configuration.h
@@ -37,18 +37,18 @@ public:
     static QString functionFsDir();
     static QString gadgetConfigFsDir();
     static QString networkScript();
-    static QString rndisFunctionName();
+    static QString usbEthernetFunctionName();
     static QString udcDriverDir();
     static void setFunctionFsDir(const QString &path);
     static void setGadgetConfigFsDir(const QString &path);
     static void setNetworkScript(const QString &script);
-    static void setRndisFunctionName(const QString &name);
+    static void setUsbEthernetFunctionName(const QString &name);
 
 private:
     static QString s_functionFsDir;
     static QString s_gadgetConfigFsDir;
     static QString s_networkScript;
-    static QString s_rndisFunctionName;
+    static QString s_usbEthernetFunctionName;
     static QString s_udcDriverDir;
 };
 
diff --git a/qdbd/handshakeexecutor.cpp b/qdbd/handshakeexecutor.cpp
index 940c9fe..124a75a 100644
--- a/qdbd/handshakeexecutor.cpp
+++ b/qdbd/handshakeexecutor.cpp
@@ -38,16 +38,16 @@
 
 Q_LOGGING_CATEGORY(handshakeC, "qdb.executors.handshake");
 
-QString rndisFunctionPath()
+QString usbEthernetFunctionPath()
 {
-    return Configuration::gadgetConfigFsDir() + "/functions/" + Configuration::rndisFunctionName();
+    return Configuration::gadgetConfigFsDir() + "/functions/" + Configuration::usbEthernetFunctionName();
 }
 
 QString deviceIpAddress()
 {
-    QFile file{rndisFunctionPath() + "/ifname"};
+    QFile file{usbEthernetFunctionPath() + "/ifname"};
     if (!file.open(QIODevice::ReadOnly)) {
-        qCCritical(handshakeC) << "Could not find network interface name from RNDIS configuration at" << rndisFunctionPath();
+        qCCritical(handshakeC) << "Could not find network interface name from Usb Ethernet configuration at" << usbEthernetFunctionPath();
         return "";
     }
 
@@ -77,9 +77,9 @@ QString deviceSerial()
 
 QString hostSideMac()
 {
-    QFile file{rndisFunctionPath() + "/host_addr"};
+    QFile file{usbEthernetFunctionPath() + "/host_addr"};
     if (!file.open(QIODevice::ReadOnly)) {
-        qCCritical(handshakeC) << "Could not find host MAC address from RNDIS configuration at" << rndisFunctionPath();
+        qCCritical(handshakeC) << "Could not find host MAC address from Usb Ethernet configuration at" << usbEthernetFunctionPath();
         return "";
     }
     return QString{file.readAll()}.trimmed();
diff --git a/qdbd/main.cpp b/qdbd/main.cpp
index 64b55ab..002e7ed 100644
--- a/qdbd/main.cpp
+++ b/qdbd/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     const QString ffsKey{"ffs-dir"};
     const QString gadgetKey{"gadget-configfs-dir"};
     const QString networkKey{"network-script"};
-    const QString rndisKey{"rndis-function-name"};
+    const QString usbEthernetKey{"usb-ethernet-function-name"};
 
     QCommandLineParser parser;
     parser.addHelpOption();
@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
     parser.addOption({networkKey,
                       "Script to run for controlling the network between host and device",
                       "script"});
-    parser.addOption({rndisKey,
-                      "Name of the Function File System function that provides RNDIS",
+    parser.addOption({usbEthernetKey,
+                      "Name of the Function File System function that provides USB Ethernet",
                       "name"});
     parser.process(app);
 
@@ -71,8 +71,8 @@ int main(int argc, char *argv[])
         Configuration::setGadgetConfigFsDir(parser.value(gadgetKey));
     if (parser.isSet(networkKey))
         Configuration::setNetworkScript(parser.value(networkKey));
-    if (parser.isSet(rndisKey))
-        Configuration::setRndisFunctionName(parser.value(rndisKey));
+    if (parser.isSet(usbEthernetKey))
+        Configuration::setUsbEthernetFunctionName(parser.value(usbEthernetKey));
 
     QString filterRules;
     if (!parser.isSet("debug-transport")) {