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

Timestamp:

May 31, 2007 10:09:04 AM (18 years ago)

Author:

vboxsync

Message:

Made IHostFloppyDrive use libhal on Linux and added UDI strings to the host floppy and DVD devices

Location:

trunk/src/VBox/Main/include

Files:

• HostDVDDriveImpl.h (modified) (3 diffs)
• HostFloppyDriveImpl.h (modified) (3 diffs)
• HostImpl.h (modified) (2 diffs)

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

@@ -53 +53 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (INPTR BSTR aName, INPTR BSTR aDescription = NULL);
+    HRESULT init (INPTR BSTR aName, INPTR BSTR aUdi = NULL, INPTR BSTR aDescription = NULL);
     void uninit();
 
     // IHostDVDDrive properties
     STDMETHOD(COMGETTER(Name)) (BSTR *aName);
+    STDMETHOD(COMGETTER(Udi)) (BSTR *aUdi);
     STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
 
@@ -64 +65 @@
     /* @note Must be called from under the object read lock. */
     const Bstr &name() const { return mName; }
+    const Bstr &udi() const { return mUdi; }
+    const Bstr &description() const { return mDescription; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -72 +75 @@
     const Bstr mName;
     const Bstr mDescription;
+    const Bstr mUdi;
 };
 

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

@@ -53 +53 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (INPTR BSTR aName);
+    HRESULT init (INPTR BSTR aName, INPTR BSTR aUdi = NULL, INPTR BSTR aDescription = NULL);
     void uninit();
 
-    // IHostDVDDrive properties
+    // IHostFloppyDrive properties
     STDMETHOD(COMGETTER(Name)) (BSTR *aName);
+    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
+    STDMETHOD(COMGETTER(Udi)) (BSTR *aUdi);
 
     // public methods for internal purposes only
@@ -63 +65 @@
     /* @note Must be called from under the object read lock. */
     const Bstr &name() const { return mName; }
+    const Bstr &udi() const { return mUdi; }
+    const Bstr &description() const { return mDescription; }
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -70 +74 @@
 
     const Bstr mName;
+    const Bstr mDescription;
+    const Bstr mUdi;
 };
 

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

@@ -36 +36 @@
 class SessionMachine;
 class HostDVDDrive;
+class HostFloppyDrive;
 class Progress;
 
@@ -133 +134 @@
 # ifdef VBOX_USE_LIBHAL
     bool getDVDInfoFromHal(std::list <ComObjPtr <HostDVDDrive> > &list);
+    bool getFloppyInfoFromHal(std::list <ComObjPtr <HostFloppyDrive> > &list);
 # endif
     void parseMountTable(char *mountTable, std::list <ComObjPtr <HostDVDDrive> > &list);