Changeset 25966 in vbox for trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.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/DevLsiLogicSCSI.cpp (modified) (5 diffs)

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

@@ -30 +30 @@
 #include <iprt/string.h>
 #ifdef IN_RING3
+# include <iprt/cache.h>
+# include <iprt/mem.h>
 # include <iprt/param.h>
-# include <iprt/alloc.h>
-# include <iprt/cache.h>
+# include <iprt/uuid.h>
 #endif
 
@@ -63 +64 @@
 } LSILOGICSCSIREPLY, *PLSILOGICSCSIREPLY;
 
-/*
+/**
  * State of a device attached to the buslogic host adapter.
+ *
+ * @implements  PDMIBASE
+ * @implements  PDMISCSIPORT
+ * @implements  PDMILEDPORTS
  */
 typedef struct LSILOGICDEVICE
@@ -266 +271 @@
     /** Cache for allocated tasks. */
     R3PTRTYPE(PRTOBJCACHE)         pTaskCache;
-    /** The base interface */
+    /** Status LUN: The base interface. */
     PDMIBASE                       IBase;
-    /** Status Port - Leds interface. */
+    /** Status LUN: Leds interface. */
     PDMILEDPORTS                   ILeds;
-    /** Partner of ILeds. */
+    /** Status LUN: Partner of ILeds. */
     R3PTRTYPE(PPDMILEDCONNECTORS)  pLedsConnector;
 
@@ -4188 +4193 @@
 }
 
-/**
- * Queries an interface to the driver.
- *
- * @returns Pointer to interface.
- * @returns NULL if the interface was not supported by the device.
- * @param   pInterface          Pointer to LSILOGICDEVICE::IBase.
- * @param   enmInterface        The requested interface identification.
- */
-static DECLCALLBACK(void *) lsilogicDeviceQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
+
+/**
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+static DECLCALLBACK(void *) lsilogicDeviceQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PLSILOGICDEVICE pDevice = PDMIBASE_2_PLSILOGICDEVICE(pInterface);
 
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_SCSI_PORT:
-            return &pDevice->ISCSIPort;
-        case PDMINTERFACE_LED_PORTS:
-            return &pDevice->ILed;
-        default:
-            return NULL;
-    }
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pDevice->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_SCSI_PORT) == 0)
+        return &pDevice->ISCSIPort;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_LED_PORTS) == 0)
+        return &pDevice->ILed;
+    return NULL;
 }
 
@@ -4232 +4231 @@
 
 /**
- * Queries an interface to the driver.
- *
- * @returns Pointer to interface.
- * @returns NULL if the interface was not supported by the device.
- * @param   pInterface          Pointer to ATADevState::IBase.
- * @param   enmInterface        The requested interface identification.
- */
-static DECLCALLBACK(void *) lsilogicStatusQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
-{
-    PLSILOGICSCSI pLsiLogic = PDMIBASE_2_PLSILOGICSCSI(pInterface);
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pLsiLogic->IBase;
-        case PDMINTERFACE_LED_PORTS:
-            return &pLsiLogic->ILeds;
-        default:
-            return NULL;
-    }
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+static DECLCALLBACK(void *) lsilogicStatusQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    PLSILOGICSCSI pThis = PDMIBASE_2_PLSILOGICSCSI(pInterface);
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pThis->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_LED_PORTS) == 0)
+        return &pThis->ILeds;
+    return NULL;
 }