vbox的更動 54118 路徑 trunk/src/VBox/ValidationKit/testdriver

時間撮記:

2015-2-9 下午08:21:45 (10 年 以前)

作者:

vboxsync

訊息:

ValidationKit/USB: Updates for the automated USB testing system

檔案:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (修改) (3 筆差異)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1024 +1024 @@
             fRc = False;
         else:
-            reporter.log('changed UsbHid to %s for "%s"' % (fEnable, self.sName));
+            reporter.log('changed OHCI to %s for "%s"' % (fEnable, self.sName));
         self.oTstDrv.processPendingEvents();
         return fRc;
@@ -1049 +1049 @@
             else:
                 if self.fpApiVer >= 4.3:
-                    cEhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_ECI);
+                    cEhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_EHCI);
                     if cEhciCtls == 1:
                         self.o.machine.RemoveUSBController('EHCI');
@@ -1058 +1058 @@
             fRc = False;
         else:
-            reporter.log('changed UsbHid to %s for "%s"' % (fEnable, self.sName));
+            reporter.log('changed EHCI to %s for "%s"' % (fEnable, self.sName));
         self.oTstDrv.processPendingEvents();
         return fRc;
 
+    def enableUsbXhci(self, fEnable):
+        """
+        Enables or disables the USB XHCI controller. Error information is logged.
+        """
+        fRc = True;
+        try:
+            if fEnable:
+                    cXhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_XHCI);
+                    if cXhciCtls == 0:
+                        self.o.machine.addUSBController('XHCI', vboxcon.USBControllerType_XHCI);
+            else:
+                cXhciCtls = self.o.machine.getUSBControllerCountByType(vboxcon.USBControllerType_XHCI);
+                if cXhciCtls == 1:
+                    self.o.machine.RemoveUSBController('XHCI');
+        except:
+            reporter.errorXcpt('failed to change XHCI to %s for "%s"' % (fEnable, self.sName));
+            fRc = False;
+        else:
+            reporter.log('changed XHCI to %s for "%s"' % (fEnable, self.sName));
+        self.oTstDrv.processPendingEvents();
+        return fRc;
 
     def setFirmwareType(self, eType):