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

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.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (2 diffs)
• DrvACPI.cpp (modified) (4 diffs)
• DrvAcpiCpu.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -33 +33 @@
 # include <iprt/alloc.h>
 # include <iprt/string.h>
+# include <iprt/uuid.h>
 #endif /* IN_RING3 */
 
@@ -1935 +1936 @@
 
 /**
- * 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.
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) acpiQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
-{
-    ACPIState *pThis = (ACPIState*)((uintptr_t)pInterface - RT_OFFSETOF(ACPIState, IBase));
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pThis->IBase;
-        case PDMINTERFACE_ACPI_PORT:
-            return &pThis->IACPIPort;
-        default:
-            return NULL;
-    }
+static DECLCALLBACK(void *) acpiQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    ACPIState *pThis = RT_FROM_MEMBER(pInterface, ACPIState, IBase);
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pThis->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_ACPI_PORT) == 0)
+        return &pThis->IACPIPort;
+    return NULL;
 }
 

trunk/src/VBox/Devices/PC/DrvACPI.cpp

@@ -33 +33 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+#include <iprt/uuid.h>
 
 #ifdef RT_OS_LINUX
@@ -66 +67 @@
 /**
  * ACPI driver instance data.
+ *
+ * @implements  PDMIACPICONNECTOR
  */
 typedef struct DRVACPI
@@ -79 +82 @@
 
 /**
- * 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.
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvACPIQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
+static DECLCALLBACK(void *) drvACPIQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
     PDRVACPI pThis = PDMINS_2_DATA(pDrvIns, PDRVACPI);
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pDrvIns->IBase;
-        case PDMINTERFACE_ACPI_CONNECTOR:
-            return &pThis->IACPIConnector;
-        default:
-            return NULL;
-    }
+
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pDrvIns->IBase;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_ACPI_CONNECTOR) == 0)
+        return &pThis->IACPIConnector;
+    return NULL;
 }
 
@@ -117 +111 @@
     {
         /* running on battery? */
-        if (    (powerStatus.ACLineStatus == 0)
-             || (powerStatus.ACLineStatus == 255)
-             && (powerStatus.BatteryFlag & 15))
+        if (    powerStatus.ACLineStatus == 0   /* Offline */
+             || powerStatus.ACLineStatus == 255 /* Unknown */
+             && (powerStatus.BatteryFlag & 15)  /* high | low | critical | charging */
+           ) /** @todo why is 'charging' included in the flag test?  Add parenthesis around the right bits so the code is clearer. */
         {
             *pPowerSource = PDM_ACPI_POWER_SOURCE_BATTERY;

trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp

@@ -5 +5 @@
 
 /*
- * 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
@@ -29 +29 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+#include <iprt/uuid.h>
 
 #include "Builtins.h"
 
+
 /**
- * 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.
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvACPICpuQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
+static DECLCALLBACK(void *) drvACPICpuQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pDrvIns->IBase;
-        default:
-            return NULL;
-    }
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pDrvIns->IBase;
+    return NULL;
 }