Changeset 91880 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 20, 2021 11:37:06 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147683

Message:

Devices/USB: Change the USB proxy device to access the CFGM API through the USB helper callback table only, bugref:10074

File:

• trunk/src/VBox/Devices/USB/USBProxyDevice.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

@@ -816 +816 @@
  * @param   pFilter         The filter.
  * @param   enmFieldIdx     The filter field indext.
+ * @param   pHlp            The USB helper callback table.
  * @param   pNode           The CFGM node.
  * @param   pszExact        The exact value name.
  * @param   pszExpr         The expression value name.
  */
-static int usbProxyQueryNum(PUSBFILTER pFilter, USBFILTERIDX enmFieldIdx, PCFGMNODE pNode, const char *pszExact, const char *pszExpr)
+static int usbProxyQueryNum(PUSBFILTER pFilter, USBFILTERIDX enmFieldIdx,
+                            PCPDMUSBHLP pHlp, PCFGMNODE pNode,
+                            const char *pszExact, const char *pszExpr)
 {
     char szTmp[256];
@@ -826 +829 @@
     /* try exact first */
     uint16_t u16;
-    int rc = CFGMR3QueryU16(pNode, pszExact, &u16);
+    int rc = pHlp->pfnCFGMQueryU16(pNode, pszExact, &u16);
     if (RT_SUCCESS(rc))
     {
@@ -833 +836 @@
 
         /* make sure only the exact attribute is present. */
-        rc = CFGMR3QueryString(pNode, pszExpr, szTmp, sizeof(szTmp));
+        rc = pHlp->pfnCFGMQueryString(pNode, pszExpr, szTmp, sizeof(szTmp));
         if (RT_UNLIKELY(rc != VERR_CFGM_VALUE_NOT_FOUND))
         {
             szTmp[0] = '\0';
-            CFGMR3GetName(pNode, szTmp, sizeof(szTmp));
+            pHlp->pfnCFGMGetName(pNode, szTmp, sizeof(szTmp));
             LogRel(("usbProxyConstruct: %s: Both %s and %s are present!\n", szTmp, pszExact, pszExpr));
             return VERR_INVALID_PARAMETER;
@@ -846 +849 @@
     {
         szTmp[0] = '\0';
-        CFGMR3GetName(pNode, szTmp, sizeof(szTmp));
+        pHlp->pfnCFGMGetName(pNode, szTmp, sizeof(szTmp));
         LogRel(("usbProxyConstruct: %s: %s query failed, rc=%Rrc\n", szTmp, pszExact, rc));
         return rc;
@@ -852 +855 @@
 
     /* expression? */
-    rc = CFGMR3QueryString(pNode, pszExpr, szTmp, sizeof(szTmp));
+    rc = pHlp->pfnCFGMQueryString(pNode, pszExpr, szTmp, sizeof(szTmp));
     if (RT_SUCCESS(rc))
     {
@@ -862 +865 @@
     {
         szTmp[0] = '\0';
-        CFGMR3GetName(pNode, szTmp, sizeof(szTmp));
+        pHlp->pfnCFGMGetName(pNode, szTmp, sizeof(szTmp));
         LogRel(("usbProxyConstruct: %s: %s query failed, rc=%Rrc\n", szTmp, pszExpr, rc));
         return rc;
@@ -876 +879 @@
     PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
     RT_NOREF(iInstance);
-    PUSBPROXYDEV pThis = PDMINS_2_DATA(pUsbIns, PUSBPROXYDEV);
+    PUSBPROXYDEV    pThis = PDMINS_2_DATA(pUsbIns, PUSBPROXYDEV);
+    PCPDMUSBHLP     pHlp  = pUsbIns->pHlpR3;
+
     LogFlow(("usbProxyConstruct: pUsbIns=%p iInstance=%d\n", pUsbIns, iInstance));
 
@@ -893 +898 @@
      */
     char szAddress[1024];
-    int rc = CFGMR3QueryString(pCfg, "Address", szAddress, sizeof(szAddress));
+    int rc = pHlp->pfnCFGMQueryString(pCfg, "Address", szAddress, sizeof(szAddress));
     AssertRCReturn(rc, rc);
 
     char szBackend[64];
-    rc = CFGMR3QueryString(pCfg, "Backend", szBackend, sizeof(szBackend));
+    rc = pHlp->pfnCFGMQueryString(pCfg, "Backend", szBackend, sizeof(szBackend));
     AssertRCReturn(rc, rc);
 
     void *pvBackend;
-    rc = CFGMR3QueryPtr(pCfg, "pvBackend", &pvBackend);
+    rc = pHlp->pfnCFGMQueryPtr(pCfg, "pvBackend", &pvBackend);
     AssertRCReturn(rc, rc);
 
@@ -977 +982 @@
      */
     PCFGMNODE pCfgGlobalDev = pCfgGlobal;
-    PCFGMNODE pCur = CFGMR3GetFirstChild(pCfgGlobal);
+    PCFGMNODE pCur = pHlp->pfnCFGMGetFirstChild(pCfgGlobal);
     if (pCur)
     {
@@ -996 +1001 @@
         int iBestMatchRate = -1;
         PCFGMNODE pBestMatch = NULL;
-        for (pCur = CFGMR3GetFirstChild(pCfgGlobal); pCur; pCur = CFGMR3GetNextChild(pCur))
+        for (pCur = pHlp->pfnCFGMGetFirstChild(pCfgGlobal); pCur; pCur = pHlp->pfnCFGMGetNextChild(pCur))
         {
             /*
@@ -1005 +1010 @@
 
             /* numeric */
-            if (    RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_VENDOR_ID,        pCur, "idVendor",        "idVendorExpr"))
-                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_PRODUCT_ID,       pCur, "idProduct",       "idProcutExpr"))
-                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_REV,       pCur, "bcdDevice",       "bcdDeviceExpr"))
-                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_CLASS,     pCur, "bDeviceClass",    "bDeviceClassExpr"))
-                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_SUB_CLASS, pCur, "bDeviceSubClass", "bDeviceSubClassExpr"))
-                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_PROTOCOL,  pCur, "bDeviceProtocol", "bDeviceProtocolExpr")))
+            if (    RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_VENDOR_ID,        pHlp, pCur, "idVendor",        "idVendorExpr"))
+                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_PRODUCT_ID,       pHlp, pCur, "idProduct",       "idProcutExpr"))
+                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_REV,       pHlp, pCur, "bcdDevice",       "bcdDeviceExpr"))
+                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_CLASS,     pHlp, pCur, "bDeviceClass",    "bDeviceClassExpr"))
+                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_SUB_CLASS, pHlp, pCur, "bDeviceSubClass", "bDeviceSubClassExpr"))
+                ||  RT_FAILURE(usbProxyQueryNum(&Filter, USBFILTERIDX_DEVICE_PROTOCOL,  pHlp, pCur, "bDeviceProtocol", "bDeviceProtocolExpr")))
                 continue; /* skip it */
 
@@ -1017 +1022 @@
 
             /* ignore unknown config values, but not without bitching. */
-            if (!CFGMR3AreValuesValid(pCur,
-                                      "idVendor\0idVendorExpr\0"
-                                      "idProduct\0idProductExpr\0"
-                                      "bcdDevice\0bcdDeviceExpr\0"
-                                      "bDeviceClass\0bDeviceClassExpr\0"
-                                      "bDeviceSubClass\0bDeviceSubClassExpr\0"
-                                      "bDeviceProtocol\0bDeviceProtocolExpr\0"))
+            if (!pHlp->pfnCFGMAreValuesValid(pCur,
+                                             "idVendor\0idVendorExpr\0"
+                                             "idProduct\0idProductExpr\0"
+                                             "bcdDevice\0bcdDeviceExpr\0"
+                                             "bDeviceClass\0bDeviceClassExpr\0"
+                                             "bDeviceSubClass\0bDeviceSubClassExpr\0"
+                                             "bDeviceProtocol\0bDeviceProtocolExpr\0"))
                 LogRel(("usbProxyConstruct: Unknown value(s) in config filter (ignored)!\n"));
 
@@ -1040 +1045 @@
         }
         if (pBestMatch)
-            pCfgGlobalDev = CFGMR3GetChild(pBestMatch, "Config");
+            pCfgGlobalDev = pHlp->pfnCFGMGetChild(pBestMatch, "Config");
         if (pCfgGlobalDev)
             pCfgGlobalDev = pCfgGlobal;
@@ -1048 +1053 @@
      * Query the rest of the configuration using the global as fallback.
      */
-    rc = CFGMR3QueryU32(pCfg, "MaskedIfs", &pThis->fMaskedIfs);
+    rc = pHlp->pfnCFGMQueryU32(pCfg, "MaskedIfs", &pThis->fMaskedIfs);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        rc = CFGMR3QueryU32(pCfgGlobalDev, "MaskedIfs", &pThis->fMaskedIfs);
+        rc = pHlp->pfnCFGMQueryU32(pCfgGlobalDev, "MaskedIfs", &pThis->fMaskedIfs);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->fMaskedIfs = 0;
@@ -1057 +1062 @@
 
     bool fForce11Device;
-    rc = CFGMR3QueryBool(pCfg, "Force11Device", &fForce11Device);
+    rc = pHlp->pfnCFGMQueryBool(pCfg, "Force11Device", &fForce11Device);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        rc = CFGMR3QueryBool(pCfgGlobalDev, "Force11Device", &fForce11Device);
+        rc = pHlp->pfnCFGMQueryBool(pCfgGlobalDev, "Force11Device", &fForce11Device);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fForce11Device = false;
@@ -1066 +1071 @@
 
     bool fForce11PacketSize;
-    rc = CFGMR3QueryBool(pCfg, "Force11PacketSize", &fForce11PacketSize);
+    rc = pHlp->pfnCFGMQueryBool(pCfg, "Force11PacketSize", &fForce11PacketSize);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        rc = CFGMR3QueryBool(pCfgGlobalDev, "Force11PacketSize", &fForce11PacketSize);
+        rc = pHlp->pfnCFGMQueryBool(pCfgGlobalDev, "Force11PacketSize", &fForce11PacketSize);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fForce11PacketSize = false;
@@ -1075 +1080 @@
 
     bool fEditAudioSyncEp;
-    rc = CFGMR3QueryBool(pCfg, "EditAudioSyncEp", &fEditAudioSyncEp);
+    rc = pHlp->pfnCFGMQueryBool(pCfg, "EditAudioSyncEp", &fEditAudioSyncEp);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        rc = CFGMR3QueryBool(pCfgGlobalDev, "EditAudioSyncEp", &fEditAudioSyncEp);
+        rc = pHlp->pfnCFGMQueryBool(pCfgGlobalDev, "EditAudioSyncEp", &fEditAudioSyncEp);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fEditAudioSyncEp = true;    /* NB: On by default! */
@@ -1084 +1089 @@
 
     bool fEditRemoteWake;
-    rc = CFGMR3QueryBool(pCfg, "EditRemoteWake", &fEditRemoteWake);
+    rc = pHlp->pfnCFGMQueryBool(pCfg, "EditRemoteWake", &fEditRemoteWake);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        rc = CFGMR3QueryBool(pCfgGlobalDev, "EditRemoteWake", &fEditRemoteWake);
+        rc = pHlp->pfnCFGMQueryBool(pCfgGlobalDev, "EditRemoteWake", &fEditRemoteWake);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fEditRemoteWake = true;    /* NB: On by default! */