From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 26 Mar 2014 19:21:20 +0000 Subject: Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2. --- src/VBox/Main/include/USBControllerImpl.h | 36 +++++++------------------------ 1 file changed, 8 insertions(+), 28 deletions(-) (limited to 'src/VBox/Main/include/USBControllerImpl.h') diff --git a/src/VBox/Main/include/USBControllerImpl.h b/src/VBox/Main/include/USBControllerImpl.h index 63ba58f2..814f4b53 100644 --- a/src/VBox/Main/include/USBControllerImpl.h +++ b/src/VBox/Main/include/USBControllerImpl.h @@ -51,47 +51,27 @@ public: void FinalRelease(); // public initializer/uninitializer for internal purposes only - HRESULT init(Machine *aParent); - HRESULT init(Machine *aParent, USBController *aThat); + HRESULT init(Machine *aParent, const Utf8Str &aName, USBControllerType_T enmType); + HRESULT init(Machine *aParent, USBController *aThat, bool fReshare = false); HRESULT initCopy(Machine *aParent, USBController *aThat); void uninit(); // IUSBController properties - STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled); - STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled); - STDMETHOD(COMGETTER(EnabledEHCI))(BOOL *aEnabled); - STDMETHOD(COMSETTER(EnabledEHCI))(BOOL aEnabled); - STDMETHOD(COMGETTER(ProxyAvailable))(BOOL *aEnabled); + STDMETHOD(COMGETTER(Name))(BSTR *aName); + STDMETHOD(COMGETTER(Type))(USBControllerType_T *enmType); STDMETHOD(COMGETTER(USBStandard))(USHORT *aUSBStandard); - STDMETHOD(COMGETTER(DeviceFilters))(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters)); - - // IUSBController methods - STDMETHOD(CreateDeviceFilter)(IN_BSTR aName, IUSBDeviceFilter **aFilter); - STDMETHOD(InsertDeviceFilter)(ULONG aPosition, IUSBDeviceFilter *aFilter); - STDMETHOD(RemoveDeviceFilter)(ULONG aPosition, IUSBDeviceFilter **aFilter); // public methods only for internal purposes - HRESULT loadSettings(const settings::USBController &data); - HRESULT saveSettings(settings::USBController &data); - void rollback(); void commit(); void copyFrom(USBController *aThat); + void unshare(); -#ifdef VBOX_WITH_USB - HRESULT onDeviceFilterChange(USBDeviceFilter *aFilter, - BOOL aActiveChanged = FALSE); - - bool hasMatchingFilter(const ComObjPtr &aDevice, ULONG *aMaskedIfs); - bool hasMatchingFilter(IUSBDevice *aUSBDevice, ULONG *aMaskedIfs); - - HRESULT notifyProxy(bool aInsertFilters); -#endif /* VBOX_WITH_USB */ + const Utf8Str &getName() const; + USBControllerType_T getControllerType() const; - // public methods for internal purposes only - // (ensure there is a caller and a read lock before calling them!) - Machine* getMachine(); + ComObjPtr getPeer(); private: -- cgit v1.2.1