From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 26 Mar 2014 19:21:20 +0000 Subject: Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2. --- src/VBox/Main/src-client/PCIRawDevImpl.cpp | 38 +++++++++++++----------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'src/VBox/Main/src-client/PCIRawDevImpl.cpp') diff --git a/src/VBox/Main/src-client/PCIRawDevImpl.cpp b/src/VBox/Main/src-client/PCIRawDevImpl.cpp index 35617c8a..b60adf43 100644 --- a/src/VBox/Main/src-client/PCIRawDevImpl.cpp +++ b/src/VBox/Main/src-client/PCIRawDevImpl.cpp @@ -14,6 +14,7 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + #include "Logging.h" #include "PCIRawDevImpl.h" #include "PCIDeviceAttachmentImpl.h" @@ -104,41 +105,33 @@ DECLCALLBACK(int) PCIRawDev::drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pIn /** - * Destruct a PCI raw driver instance. - * - * @returns VBox status. - * @param pDrvIns The driver instance data. + * @interface_method_impl{PDMDRVREG,pfnReset} */ -DECLCALLBACK(void) PCIRawDev::drvDestruct(PPDMDRVINS pDrvIns) +DECLCALLBACK(void) PCIRawDev::drvReset(PPDMDRVINS pDrvIns) { - PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV); - PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns); - - if (pData->pPCIRawDev) - pData->pPCIRawDev->mpDrv = NULL; } /** - * Reset notification. - * - * @returns VBox status. - * @param pDrvIns The driver instance data. + * @interface_method_impl{PDMDRVREG,pfnReset} */ -DECLCALLBACK(void) PCIRawDev::drvReset(PPDMDRVINS pDrvIns) +DECLCALLBACK(void) PCIRawDev::drvDestruct(PPDMDRVINS pDrvIns) { + PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns); + PDRVMAINPCIRAWDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV); + + if (pThis->pPCIRawDev) + pThis->pPCIRawDev->mpDrv = NULL; } /** - * Construct a raw PCI driver instance. - * - * @copydoc FNPDMDRVCONSTRUCT + * @interface_method_impl{PDMDRVREG,pfnConstruct} */ DECLCALLBACK(int) PCIRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags) { - PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV); PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); + PDRVMAINPCIRAWDEV pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV); /* * Validate configuration. @@ -158,7 +151,7 @@ DECLCALLBACK(int) PCIRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHand /* * IConnector. */ - pData->IConnector.pfnDeviceConstructComplete = PCIRawDev::drvDeviceConstructComplete; + pThis->IConnector.pfnDeviceConstructComplete = PCIRawDev::drvDeviceConstructComplete; /* * Get the object pointer and update the mpDrv member. @@ -171,8 +164,8 @@ DECLCALLBACK(int) PCIRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHand return rc; } - pData->pPCIRawDev = (PCIRawDev *)pv; - pData->pPCIRawDev->mpDrv = pData; + pThis->pPCIRawDev = (PCIRawDev *)pv; + pThis->pPCIRawDev->mpDrv = pThis; return VINF_SUCCESS; } @@ -227,3 +220,4 @@ const PDMDRVREG PCIRawDev::DrvReg = /* u32EndVersion */ PDM_DRVREG_VERSION }; + -- cgit v1.2.1