Changeset 25966 in vbox for trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp

Timestamp:

Jan 22, 2010 11:15:43 AM (15 years ago)

Author:

vboxsync

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

56818

Message:

PDMIBASE refactoring; use UUID as interface IDs.

File:

• trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VBox storage devices:
- * ISO image media driver
+ * VBox storage devices: ISO image media driver
  */
 
@@ -28 +27 @@
 #include <iprt/assert.h>
 #include <iprt/file.h>
-
-#include <string.h>
+#include <iprt/string.h>
+#include <iprt/uuid.h>
 
 #include "Builtins.h"
+
 
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-
 /** Converts a pointer to MEDIAISO::IMedia to a PRDVMEDIAISO. */
 #define PDMIMEDIA_2_DRVMEDIAISO(pInterface) ( (PDRVMEDIAISO)((uintptr_t)pInterface - RT_OFFSETOF(DRVMEDIAISO, IMedia)) )
@@ -53 +52 @@
 /**
  * Block driver instance data.
+ *
+ * @implements PDMIMEDIA
  */
 typedef struct DRVMEDIAISO
@@ -82 +83 @@
 static DECLCALLBACK(int) drvMediaISOBiosSetLCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pLCHSGeometry);
 
-static DECLCALLBACK(void *) drvMediaISOQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
+static DECLCALLBACK(void *) drvMediaISOQueryInterface(PPDMIBASE pInterface, const char *pszIID);
 
 
@@ -286 +287 @@
 
 /**
- * Queries an interface to the driver.
- *
- * @returns Pointer to interface.
- * @returns NULL if the interface was not supported by the driver.
- * @param   pInterface          Pointer to this interface structure.
- * @param   enmInterface        The requested interface identification.
- * @thread  Any thread.
- */
-static DECLCALLBACK(void *) drvMediaISOQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+static DECLCALLBACK(void *) drvMediaISOQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS pDrvIns = PDMIBASE_2_DRVINS(pInterface);
     PDRVMEDIAISO pThis = PDMINS_2_DATA(pDrvIns, PDRVMEDIAISO);
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pDrvIns->IBase;
-        case PDMINTERFACE_MEDIA:
-            return &pThis->IMedia;
-        default:
-            return NULL;
-    }
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pDrvIns->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_MEDIA) == 0)
+        return &pThis->IMedia;
+    return NULL;
 }