Changeset 25966 in vbox for trunk/src/VBox/Devices/Parallel

Timestamp:

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

Author:

vboxsync

Message:

PDMIBASE refactoring; use UUID as interface IDs.

Location:

trunk/src/VBox/Devices/Parallel

Files:

• DevParallel.cpp (modified) (3 diffs)
• DrvHostParallel.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Parallel/DevParallel.cpp

@@ -93 +93 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
+/**
+ * Parallel device state.
+ *
+ * @implements  PDMIBASE
+ * @implements  PDMIHOSTPARALLELPORT
+ */
 typedef struct ParallelState
 {
@@ -105 +111 @@
     PPDMDEVINSRC                        pDevInsRC;
     RTRCPTR                             Alignment0; /**< Alignment. */
-    /** The base interface. */
+    /** LUN\#0: The base interface. */
     PDMIBASE                            IBase;
-    /** The host device port interface. */
+    /** LUN\#0: The host device port interface. */
     PDMIHOSTPARALLELPORT                IHostParallelPort;
     /** Pointer to the attached base driver. */
@@ -644 +650 @@
 }
 
-/** @copydoc PIBASE::pfnqueryInterface */
-static DECLCALLBACK(void *) parallelQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
+/**
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+static DECLCALLBACK(void *) parallelQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     ParallelState *pThis = PDMIBASE_2_PARALLELSTATE(pInterface);
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pThis->IBase;
-        case PDMINTERFACE_HOST_PARALLEL_PORT:
-            return &pThis->IHostParallelPort;
-        default:
-            return NULL;
-    }
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pThis->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_HOST_PARALLEL_PORT) == 0)
+        return &pThis->IHostParallelPort;
+    return NULL;
 }
 

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/file.h>
+#include <iprt/semaphore.h>
 #include <iprt/stream.h>
-#include <iprt/semaphore.h>
-#include <iprt/file.h>
+#include <iprt/uuid.h>
 
 #ifdef RT_OS_LINUX
@@ -48 +49 @@
 #include "Builtins.h"
 
+
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -53 +55 @@
 /**
  * Host parallel port driver instance data.
+ * @implements PDMIHOSTPARALLELCONNECTOR
  */
 typedef struct DRVHOSTPARALLEL
@@ -62 +65 @@
     /** Our host device interface. */
     PDMIHOSTPARALLELCONNECTOR     IHostParallelConnector;
-    /** Our host device port interface. */
-    PDMIHOSTPARALLELPORT          IHostParallelPort;
     /** Device Path */
-    char                          *pszDevicePath;
+    char                         *pszDevicePath;
     /** Device Handle */
     RTFILE                        FileDevice;
@@ -78 +79 @@
 /** Converts a pointer to DRVHOSTPARALLEL::IHostDeviceConnector to a PDRHOSTPARALLEL. */
 #define PDMIHOSTPARALLELCONNECTOR_2_DRVHOSTPARALLEL(pInterface) ( (PDRVHOSTPARALLEL)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTPARALLEL, IHostParallelConnector)) )
-/** Converts a pointer to DRVHOSTPARALLEL::IHostDevicePort to a PDRHOSTPARALLEL. */
-#define PDMIHOSTPARALLELPORT_2_DRVHOSTPARALLEL(pInterface) ( (PDRVHOSTPARALLEL)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTPARALLEL, IHostParallelPort)) )
+
 
 /* -=-=-=-=- IBase -=-=-=-=- */
 
 /**
- * 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.
- */
-static DECLCALLBACK(void *) drvHostParallelQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
-{
-    PPDMDRVINS  pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-    PDRVHOSTPARALLEL    pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pDrvIns->IBase;
-        case PDMINTERFACE_HOST_PARALLEL_CONNECTOR:
-            return &pThis->IHostParallelConnector;
-        default:
-            return NULL;
-    }
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+static DECLCALLBACK(void *) drvHostParallelQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    PPDMDRVINS          pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVHOSTPARALLEL    pThis   = PDMINS_2_DATA(pDrvIns, PDRVHOSTPARALLEL);
+
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pDrvIns->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_HOST_PARALLEL_CONNECTOR) == 0)
+        return &pThis->IHostParallelConnector;
+    return NULL;
 }