Changeset 59120 in vbox

Timestamp:

Dec 14, 2015 2:34:53 PM (9 years ago)

Author:

vboxsync

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

104691

Message:

Main: build fixes

Location:

trunk/src/VBox/Main/src-server

Files:

• darwin/USBProxyBackendDarwin.cpp (modified) (2 diffs)
• freebsd/USBProxyBackendFreeBSD.cpp (modified) (1 diff)
• solaris/USBProxyBackendSolaris.cpp (modified) (2 diffs)
• win/USBProxyBackendWindows.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp

@@ -224 +224 @@
     AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
     /* Nothing special here so far, so fall back on parent. */
-    return USBProxyService::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
+    return USBProxyBackend::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }
 
@@ -279 +279 @@
 void DarwinFreeUSBDeviceFromIOKit(PUSBDEVICE pCur)
 {
-    USBProxyService::freeDevice(pCur);
-}
-
+    USBProxyBackend::freeDevice(pCur);
+}
+

trunk/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp

@@ -163 +163 @@
                                          PUSBDEVICE aUSBDevice)
 {
-    USBProxyService::deviceAdded(aDevice, llOpenedMachines, aUSBDevice);
+    USBProxyBackend::deviceAdded(aDevice, llOpenedMachines, aUSBDevice);
 }
 

trunk/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp

@@ -443 +443 @@
     AssertReturn(aDevice, false);
     AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
-    return USBProxyService::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
+    return USBProxyBackend::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }
 
@@ -453 +453 @@
 void solarisFreeUSBDevice(PUSBDEVICE pDevice)
 {
-    USBProxyService::freeDevice(pDevice);
-}
+    USBProxyBackend::freeDevice(pDevice);
+}

trunk/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp

@@ -39 +39 @@
  */
 USBProxyBackendWindows::USBProxyBackendWindows(USBProxyService *aUsbProxyService)
-    : USBProxyBackend(aHost), mhEventInterrupt(INVALID_HANDLE_VALUE)
+    : USBProxyBackend(aUsbProxyService), mhEventInterrupt(INVALID_HANDLE_VALUE)
 {
     LogFlowThisFunc(("aUsbProxyService=%p\n", aUsbProxyService));
@@ -114 +114 @@
     AssertReturn(aFilter, NULL);
 
-    LogFlow(("USBProxyServiceWindows::insertFilter()\n"));
+    LogFlow(("USBProxyBackendWindows::insertFilter()\n"));
 
     void *pvId = USBLibAddFilter(aFilter);
 
-    LogFlow(("USBProxyServiceWindows::insertFilter(): returning pvId=%p\n", pvId));
+    LogFlow(("USBProxyBackendWindows::insertFilter(): returning pvId=%p\n", pvId));
 
     return pvId;
@@ -126 +126 @@
 void USBProxyBackendWindows::removeFilter(void *aID)
 {
-    LogFlow(("USBProxyServiceWindows::removeFilter(): id=%p\n", aID));
+    LogFlow(("USBProxyBackendWindows::removeFilter(): id=%p\n", aID));
 
     AssertReturnVoid(aID);
@@ -225 +225 @@
     AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
     /* Nothing special here so far, so fall back on parent */
-    return USBProxyService::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
+    return USBProxyBackend::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }
 
@@ -248 +248 @@
     uint32_t cDevices = 0;
 
-    Log(("USBProxyServiceWindows::getDevices\n"));
+    Log(("USBProxyBackendWindows::getDevices\n"));
     USBLibGetDevices(&pDevices, &cDevices);
     return pDevices;