vbox的更動 32299 路徑 trunk/src/VBox/Main/testcase

時間撮記:

2010-9-7 下午09:25:05 (14 年 以前)

作者:

vboxsync

訊息:

Main/USBProxyServiceLinux: move the implementation of the device enumeration code out of the class and into static C-like functions

檔案:

• trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp (修改) (3 筆差異)

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -91 +91 @@
     }
 #ifdef VBOX_USB_WITH_SYSFS
-    VBoxMainUSBDeviceInfo deviceInfo;
-    VBoxMainUSBDevInfoInit(&deviceInfo);
-    rc = USBDevInfoUpdateDevices(&deviceInfo);
+    VECTOR_OBJ(USBDeviceInfo) vecDevInfo;
+    VEC_INIT_OBJ(&vecDevInfo, USBDeviceInfo, USBDevInfoCleanup);
+    rc = USBSysfsEnumerateHostDevices(&vecDevInfo);
     if (RT_FAILURE(rc))
     {
@@ -102 +102 @@
     RTPrintf ("Listing USB devices detected:\n");
     USBDeviceInfo *pInfo;
-    VEC_FOR_EACH(&deviceInfo.mvecDevInfo, USBDeviceInfo, pInfo)
+    VEC_FOR_EACH(&vecDevInfo, USBDeviceInfo, pInfo)
     {
         char szProduct[1024];
@@ -146 +146 @@
         }
     }
+    VEC_CLEANUP_OBJ(&vecDevInfo);
     VBoxMainHotplugWaiter waiter;
     RTPrintf ("Waiting for a hotplug event for five seconds...\n");