Changeset 17669 in vbox for trunk/src/VBox/Main/include/HardDiskAttachmentImpl.h

Timestamp:

Mar 11, 2009 9:56:29 AM (16 years ago)

Author:

vboxsync

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

44161

Message:

Main: Rework storage controller handling to allow an arbitrary number of different storage controllers and remove code duplication:

• XML format changed
• New StorageController class
• Removed SATAController (obsolete)
• Removed the IDE controller code from BIOSSettings, handled in StorageController now

File:

• trunk/src/VBox/Main/include/HardDiskAttachmentImpl.h (modified) (6 diffs)

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

@@ -39 +39 @@
         : public std::unary_function <ComObjPtr<HardDiskAttachment>, bool>
     {
-        explicit EqualsTo (StorageBus_T aBus, LONG aChannel, LONG aDevice)
-            : bus (aBus), channel (aChannel), device (aDevice) {}
+        explicit EqualsTo (CBSTR aController, LONG aPort, LONG aDevice)
+            : controller(aController), port (aPort), device (aDevice) {}
 
         bool operator() (const argument_type &aThat) const
         {
-            return aThat->bus() == bus && aThat->channel() == channel &&
+            return aThat->controller() == controller && aThat->port() == port &&
                    aThat->device() == device;
         }
 
-        const StorageBus_T bus;
-        const LONG channel;
+        const Bstr controller;
+        const LONG port;
         const LONG device;
     };
@@ -82 +82 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(HardDisk *aHD, StorageBus_T aBus, LONG aChannel,
+    HRESULT init(HardDisk *aHD, IN_BSTR aController, LONG aPort,
                  LONG aDevice, bool aImplicit = false);
     void uninit();
@@ -88 +88 @@
     // IHardDiskAttachment properties
     STDMETHOD(COMGETTER(HardDisk))   (IHardDisk **aHardDisk);
-    STDMETHOD(COMGETTER(Bus))        (StorageBus_T *aBus);
-    STDMETHOD(COMGETTER(Channel))    (LONG *aChannel);
+    STDMETHOD(COMGETTER(Controller)) (BSTR *aController);
+    STDMETHOD(COMGETTER(Port))       (LONG *aPort);
     STDMETHOD(COMGETTER(Device))     (LONG *aDevice);
 
@@ -99 +99 @@
 
     const ComObjPtr<HardDisk> &hardDisk() const { return m.hardDisk; }
-    StorageBus_T bus() const { return m.bus; }
-    LONG channel() const { return m.channel; }
+    Bstr controller() const { return m.controller; }
+    LONG port()   const { return m.port; }
     LONG device() const { return m.device; }
 
@@ -117 +117 @@
     struct Data
     {
-        Data() : bus (StorageBus_Null), channel (0), device (0)
+        Data() : port (0), device (0)
                , implicit (false) {}
 
@@ -123 +123 @@
         /// rid of locks at all in this simple readonly structure-like interface
         ComObjPtr<HardDisk> hardDisk;
-        const StorageBus_T bus;
-        const LONG channel;
+        const Bstr controller;
+        const LONG port;
         const LONG device;