Changeset 45029 in vbox for trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

Timestamp:

Mar 13, 2013 8:57:11 PM (12 years ago)

Author:

vboxsync

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

84273

Message:

Main: drvDestruct/drvConstruct cleanups.

File:

• trunk/src/VBox/Main/src-client/VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -746 +746 @@
 
 /**
- * Destruct a VMMDev driver instance.
- *
- * @returns VBox status.
- * @param   pDrvIns     The driver instance data.
+ * @interface_method_impl{PDMDRVREG,pfnReset}
+ */
+DECLCALLBACK(void) VMMDev::drvReset(PPDMDRVINS pDrvIns)
+{
+    LogFlow(("VMMDev::drvReset: iInstance=%d\n", pDrvIns->iInstance));
+#ifdef VBOX_WITH_HGCM
+    HGCMHostReset ();
+#endif /* VBOX_WITH_HGCM */
+}
+
+/**
+ * @interface_method_impl{PDMDRVREG,pfnDestruct}
  */
 DECLCALLBACK(void) VMMDev::drvDestruct(PPDMDRVINS pDrvIns)
 {
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
     PDRVMAINVMMDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
     LogFlow(("VMMDev::drvDestruct: iInstance=%d\n", pDrvIns->iInstance));
+
 #ifdef VBOX_WITH_HGCM
     /* HGCM is shut down on the VMMDev destructor. */
@@ -763 +773 @@
 
 /**
- * Reset notification.
- *
- * @returns VBox status.
- * @param   pDrvIns     The driver instance data.
- */
-DECLCALLBACK(void) VMMDev::drvReset(PPDMDRVINS pDrvIns)
-{
-    LogFlow(("VMMDev::drvReset: iInstance=%d\n", pDrvIns->iInstance));
-#ifdef VBOX_WITH_HGCM
-    HGCMHostReset ();
-#endif /* VBOX_WITH_HGCM */
-}
-
-/**
- * Construct a VMMDev driver instance.
- *
- * @copydoc FNPDMDRVCONSTRUCT
+ * @interface_method_impl{PDMDRVREG,pfnConstruct}
  */
 DECLCALLBACK(int) VMMDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
 {
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVMAINVMMDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINVMMDEV);
     LogFlow(("Keyboard::drvConstruct: iInstance=%d\n", pDrvIns->iInstance));