Changeset 63910 in vbox

Timestamp:

Sep 20, 2016 10:14:30 AM (8 years ago)

Author:

vboxsync

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

110788

Message:

DevPlayground.cpp: Use the macros.

File:

• trunk/src/VBox/Devices/Samples/DevPlayground.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Samples/DevPlayground.cpp

@@ -54 +54 @@
 *   Device Functions                                                                                                             *
 *********************************************************************************************************************************/
-/**
- * @interface_method_impl{PDMDEVREG,pfnDestruct}
- */
-static DECLCALLBACK(int) devPlaygroundDestruct(PPDMDEVINS pDevIns)
-{
-    /*
-     * Check the versions here as well since the destructor is *always* called.
-     */
-    AssertMsgReturn(pDevIns->u32Version            == PDM_DEVINS_VERSION, ("%#x, expected %#x\n", pDevIns->u32Version,            PDM_DEVINS_VERSION), VERR_VERSION_MISMATCH);
-    AssertMsgReturn(pDevIns->pHlpR3->u32Version == PDM_DEVHLPR3_VERSION, ("%#x, expected %#x\n", pDevIns->pHlpR3->u32Version, PDM_DEVHLPR3_VERSION), VERR_VERSION_MISMATCH);
-
-    return VINF_SUCCESS;
-}
-
 
 PDMBOTHCBDECL(int) devPlaygroundMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
@@ -122 +108 @@
 
 /**
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
+ */
+static DECLCALLBACK(int) devPlaygroundDestruct(PPDMDEVINS pDevIns)
+{
+    /*
+     * Check the versions here as well since the destructor is *always* called.
+     */
+    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
+
+    return VINF_SUCCESS;
+}
+
+
+/**
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
 static DECLCALLBACK(int) devPlaygroundConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    NOREF(iInstance);
+    RT_NOREF(iInstance, pCfg);
 
     /*
      * Check that the device instance and device helper structures are compatible.
      */
-    AssertLogRelMsgReturn(pDevIns->u32Version            == PDM_DEVINS_VERSION, ("%#x, expected %#x\n", pDevIns->u32Version,            PDM_DEVINS_VERSION), VERR_VERSION_MISMATCH);
-    AssertLogRelMsgReturn(pDevIns->pHlpR3->u32Version == PDM_DEVHLPR3_VERSION, ("%#x, expected %#x\n", pDevIns->pHlpR3->u32Version, PDM_DEVHLPR3_VERSION), VERR_VERSION_MISMATCH);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -146 +145 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg,
-                              "Whatever1\0"
-                              "Whatever2\0"))
-        return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "Whatever1|Whatever2", "");
 
     /*