Changeset 91881 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Devices/Input: Change the USB keyboard and mouse device emulations to access the CFGM API through the USB helper callback table only, bugref:10074

Location:

trunk/src/VBox/Devices/Input

Files:

• UsbKbd.cpp (modified) (2 diffs)
• UsbMouse.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Input/UsbKbd.cpp

@@ -1759 +1759 @@
     RT_NOREF1(pCfgGlobal);
     PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
-    PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
+    PUSBHID     pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
     Log(("usbHidConstruct/#%u:\n", iInstance));
 
@@ -1781 +1782 @@
      * Validate and read the configuration.
      */
-    rc = CFGMR3ValidateConfig(pCfg, "/", "Mode", "Config", "UsbHid", iInstance);
+    rc = pHlp->pfnCFGMValidateConfig(pCfg, "/", "Mode", "Config", "UsbHid", iInstance);
     if (RT_FAILURE(rc))
         return rc;
     char szMode[64];
-    rc = CFGMR3QueryStringDef(pCfg, "Mode", szMode, sizeof(szMode), "basic");
+    rc = pHlp->pfnCFGMQueryStringDef(pCfg, "Mode", szMode, sizeof(szMode), "basic");
     if (RT_FAILURE(rc))
         return PDMUsbHlpVMSetError(pUsbIns, rc, RT_SRC_POS, N_("HID failed to query settings"));

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -2358 +2358 @@
     RT_NOREF1(pCfgGlobal);
     PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
-    PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
+    PUSBHID     pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
+
     LogRelFlow(("usbHidConstruct/#%u:\n", iInstance));
 
@@ -2379 +2381 @@
      * Validate and read the configuration.
      */
-    rc = CFGMR3ValidateConfig(pCfg, "/", "Mode|CoordShift", "Config", "UsbHid", iInstance);
+    rc = pHlp->pfnCFGMValidateConfig(pCfg, "/", "Mode|CoordShift", "Config", "UsbHid", iInstance);
     if (RT_FAILURE(rc))
         return rc;
     char szMode[64];
-    rc = CFGMR3QueryStringDef(pCfg, "Mode", szMode, sizeof(szMode), "relative");
+    rc = pHlp->pfnCFGMQueryStringDef(pCfg, "Mode", szMode, sizeof(szMode), "relative");
     if (RT_FAILURE(rc))
         return PDMUsbHlpVMSetError(pUsbIns, rc, RT_SRC_POS, N_("HID failed to query settings"));
@@ -2414 +2416 @@
         return PDMUsbHlpVMSetError(pUsbIns, VERR_PDM_MISSING_INTERFACE, RT_SRC_POS, N_("HID failed to query mouse interface"));
 
-    rc = CFGMR3QueryU8Def(pCfg, "CoordShift", &pThis->u8CoordShift, 1);
+    rc = pHlp->pfnCFGMQueryU8Def(pCfg, "CoordShift", &pThis->u8CoordShift, 1);
     if (RT_FAILURE(rc))
         return PDMUsbHlpVMSetError(pUsbIns, rc, RT_SRC_POS, N_("HID failed to query shift factor"));