Changeset 47401 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 25, 2013 7:12:24 PM (12 years ago)

Author:

vboxsync

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

87551

Message:

Main,Frontends: Second step of USB controller rework. There is one controller instance for every USB controller now. Adapt frontends and testsuite to work with the changed API

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (5 diffs)
• SystemPropertiesImpl.h (modified) (1 diff)
• USBControllerImpl.h (modified) (1 diff)
• USBDeviceFiltersImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/include/MachineImpl.h

@@ -457 +457 @@
     STDMETHOD(COMGETTER(VRDEServer))(IVRDEServer **vrdeServer);
     STDMETHOD(COMGETTER(AudioAdapter))(IAudioAdapter **audioAdapter);
-    STDMETHOD(COMGETTER(USBController))(IUSBController * *aUSBController);
+    STDMETHOD(COMGETTER(USBControllers))(ComSafeArrayOut(IUSBController *, aUSBControllers));
     STDMETHOD(COMGETTER(USBDeviceFilters))(IUSBDeviceFilters * *aUSBDeviceFilters);
     STDMETHOD(COMGETTER(SettingsFilePath))(BSTR *aFilePath);
@@ -529 +529 @@
     STDMETHOD(COMGETTER(Icon))(ComSafeArrayOut(BYTE, aIcon));
     STDMETHOD(COMSETTER(Icon))(ComSafeArrayIn(BYTE, aIcon));
+    STDMETHOD(COMGETTER(USBProxyAvailable))(BOOL *aAvailable);
 
     // IMachine methods
@@ -593 +594 @@
     STDMETHOD(GetStorageControllerByInstance(ULONG aInstance, IStorageController **storageController));
     STDMETHOD(SetStorageControllerBootable)(IN_BSTR aName, BOOL fBootable);
+    STDMETHOD(AddUSBController)(IN_BSTR aName, StorageBus_T aConnectionType, IUSBController **controller);
+    STDMETHOD(RemoveUSBController(IN_BSTR aName));
+    STDMETHOD(GetUSBControllerByName(IN_BSTR aName, IUSBController **usbController));
+    STDMETHOD(GetUSBControllerCountByType(USBControllerType_T aType, ULONG *aControllers));
     STDMETHOD(QuerySavedGuestScreenInfo)(ULONG uScreenId, ULONG *puOriginX, ULONG *puOriginY, ULONG *puWidth, ULONG *puHeight, BOOL *pfEnabled);
     STDMETHOD(QuerySavedThumbnailSize)(ULONG aScreenId, ULONG *aSize, ULONG *aWidth, ULONG *aHeight);
@@ -886 +891 @@
     HRESULT getMediumAttachmentsOfController(CBSTR aName,
                                              MediaData::AttachmentList &aAttachments);
+
+    HRESULT getUSBControllerByName(const Utf8Str &aName,
+                                   ComObjPtr<USBController> &aUSBController,
+                                   bool aSetError = false);
+
+    ULONG   getUSBControllerCountByType(USBControllerType_T enmType);
 
     enum
@@ -998 +1009 @@
     const ComObjPtr<ParallelPort>      mParallelPorts[SchemaDefs::ParallelPortCount];
     const ComObjPtr<AudioAdapter>      mAudioAdapter;
-    const ComObjPtr<USBController>     mUSBController;
     const ComObjPtr<USBDeviceFilters>  mUSBDeviceFilters;
     const ComObjPtr<BIOSSettings>      mBIOSSettings;
+    const ComObjPtr<BandwidthControl>  mBandwidthControl;
+
     typedef std::vector<ComObjPtr<NetworkAdapter> > NetworkAdapterVector;
-    NetworkAdapterVector            mNetworkAdapters;
-    const ComObjPtr<BandwidthControl> mBandwidthControl;
+    NetworkAdapterVector               mNetworkAdapters;
 
     typedef std::list<ComObjPtr<StorageController> > StorageControllerList;
-    Backupable<StorageControllerList> mStorageControllers;
+    Backupable<StorageControllerList>  mStorageControllers;
+
+    typedef std::list<ComObjPtr<USBController> > USBControllerList;
+    Backupable<USBControllerList>      mUSBControllers;
 
     uint64_t                        uRegistryNeedsSaving;

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -109 +109 @@
     STDMETHOD(GetDeviceTypesForStorageBus)(StorageBus_T aBus, ComSafeArrayOut(DeviceType_T, aDeviceTypes));
     STDMETHOD(GetDefaultIoCacheSettingForStorageController)(StorageControllerType_T aControllerType, BOOL *aEnabled);
+    STDMETHOD(GetMaxInstancesOfUSBControllerType)(ChipsetType_T aChipset, USBControllerType_T aType, ULONG *aMaxInstances);
 
     // public methods only for internal purposes

trunk/src/VBox/Main/include/USBControllerImpl.h

@@ -52 +52 @@
 
     // 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);
 
     // 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();
+
+    const Utf8Str &getName() const;
+    USBControllerType_T getControllerType() const;
+
+    ComObjPtr<USBController> getPeer();
 
 private:

trunk/src/VBox/Main/include/USBDeviceFiltersImpl.h

@@ -28 +28 @@
 namespace settings
 {
-    struct USBController;
+    struct USB;
 }
 
@@ -67 +67 @@
     // public methods only for internal purposes
 
-    HRESULT loadSettings(const settings::USBController &data);
-    HRESULT saveSettings(settings::USBController &data);
+    HRESULT loadSettings(const settings::USB &data);
+    HRESULT saveSettings(settings::USB &data);
 
     void rollback();