Changeset 81525 in vbox for trunk/include

Timestamp:

Oct 25, 2019 9:53:00 AM (5 years ago)

Author:

vboxsync

Message:

PDM/DevHlp: Adding PDMDevHlpTimerDestroy and PDMDevHlpPCIIORegionCreateMmio. bugref:9218

File:

• trunk/include/VBox/vmm/pdmdev.h (modified) (5 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -2276 +2276 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 27, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 28, 0)
 
 /**
@@ -2992 +2992 @@
     DECLR3CALLBACKMEMBER(int,      pfnTimerSave,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PSSMHANDLE pSSM));
     DECLR3CALLBACKMEMBER(int,      pfnTimerLoad,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, PSSMHANDLE pSSM));
+    DECLR3CALLBACKMEMBER(int,      pfnTimerDestroy,(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer));
     /** @} */
 
@@ -6372 +6373 @@
 
 /**
+ * @copydoc PDMDEVHLPR3::pfnTimerDestroy
+ */
+DECLINLINE(int) PDMDevHlpTimerDestroy(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer)
+{
+    return pDevIns->pHlpR3->pfnTimerDestroy(pDevIns, hTimer);
+}
+
+/**
  * @copydoc PDMDEVHLPR3::pfnTMUtcNow
  */
@@ -6724 +6733 @@
 
 /**
- * Registers an MMIO port region for the default PCI device.
+ * Registers an MMIO region for the default PCI device.
  *
  * @returns VBox status code.
@@ -6746 +6755 @@
 }
 
+/**
+ * Combines PDMDevHlpMmioCreate and PDMDevHlpPCIIORegionRegisterMmio, creating
+ * and registering an MMIO region for the default PCI device.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns         The device instance to register the ports with.
+ * @param   cbRegion        The size of the region in bytes.
+ * @param   iPciRegion      The PCI device region in the high 16-bit word and
+ *                          sub-region in the low 16-bit word.  UINT32_MAX if NA.
+ * @param   enmType         PCI_ADDRESS_SPACE_MEM or
+ *                          PCI_ADDRESS_SPACE_MEM_PREFETCH, optionally or-ing in
+ *                          PCI_ADDRESS_SPACE_BAR64 or PCI_ADDRESS_SPACE_BAR32.
+ * @param   fFlags          Flags, IOMMMIO_FLAGS_XXX.
+ * @param   pfnWrite        Pointer to function which is gonna handle Write
+ *                          operations.
+ * @param   pfnRead         Pointer to function which is gonna handle Read
+ *                          operations.
+ * @param   pvUser          User argument to pass to the callbacks.
+ * @param   pszDesc         Pointer to description string. This must not be freed.
+ * @param   phRegion        Where to return the MMIO region handle.
+ *
+ */
+DECLINLINE(int) PDMDevHlpPCIIORegionCreateMmio(PPDMDEVINS pDevIns, uint32_t iPciRegion, RTGCPHYS cbRegion, PCIADDRESSSPACE enmType,
+                                               PFNIOMMMIONEWWRITE pfnWrite, PFNIOMMMIONEWREAD pfnRead, void *pvUser,
+                                               uint32_t fFlags, const char *pszDesc, PIOMMMIOHANDLE phRegion)
+
+{
+    int rc = pDevIns->pHlpR3->pfnMmioCreateEx(pDevIns, cbRegion, fFlags, pDevIns->apPciDevs[0], iPciRegion,
+                                              pfnWrite, pfnRead, NULL /*pfnFill*/, pvUser, pszDesc, phRegion);
+    if (RT_SUCCESS(rc))
+        rc = pDevIns->pHlpR3->pfnPCIIORegionRegister(pDevIns, pDevIns->apPciDevs[0], iPciRegion, cbRegion, enmType,
+                                                     PDMPCIDEV_IORGN_F_MMIO_HANDLE, *phRegion, NULL /*pfnCallback*/);
+    return rc;
+}
+
 
 /**