Changeset 81616 in vbox for trunk/include/VBox

Timestamp:

Oct 31, 2019 7:43:07 PM (5 years ago)

Author:

vboxsync

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

134373

Message:

DevPlayground,pdmdev.h: Converted the playground sample device. (untested) bugref:9218

File:

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

trunk/include/VBox/vmm/pdmdev.h

@@ -5897 +5897 @@
 DECLINLINE(int) PDMDevHlpMmioCreate(PPDMDEVINS pDevIns, RTGCPHYS cbRegion, PPDMPCIDEV pPciDev, uint32_t iPciRegion,
                                     PFNIOMMMIONEWWRITE pfnWrite, PFNIOMMMIONEWREAD pfnRead, void *pvUser,
-                                    const char *pszDesc, PIOMMMIOHANDLE phRegion)
-{
-    return pDevIns->pHlpR3->pfnMmioCreateEx(pDevIns, cbRegion, 0, pPciDev, iPciRegion,
+                                    uint32_t fFlags, const char *pszDesc, PIOMMMIOHANDLE phRegion)
+{
+    return pDevIns->pHlpR3->pfnMmioCreateEx(pDevIns, cbRegion, fFlags, pPciDev, iPciRegion,
                                             pfnWrite, pfnRead, NULL, pvUser, pszDesc, phRegion);
 }
@@ -6817 +6817 @@
  * @param   pDevIns         The device instance to register the ports with.
  * @param   cbPorts         The size of the region in I/O ports.
- * @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   iPciRegion      The PCI device region.
  * @param   pfnOut          Pointer to function which is gonna handle OUT
  *                          operations. Optional.
@@ -6835 +6834 @@
 
 {
-    int rc = pDevIns->pHlpR3->pfnIoPortCreateEx(pDevIns, cbPorts, 0 /*fFlags*/, pDevIns->apPciDevs[0], iPciRegion,
+    int rc = pDevIns->pHlpR3->pfnIoPortCreateEx(pDevIns, cbPorts, 0 /*fFlags*/, pDevIns->apPciDevs[0], iPciRegion << 16,
                                                 pfnOut, pfnIn, NULL, NULL, pvUser, pszDesc, paExtDescs, phIoPorts);
     if (RT_SUCCESS(rc))
@@ -6868 +6867 @@
 
 /**
+ * Registers an MMIO region for the default PCI device, extended version.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns         The device instance.
+ * @param   pPciDev         The PCI device structure.
+ * @param   iRegion         The region number.
+ * @param   cbRegion        Size of the region.
+ * @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   hMmioRegion     Handle to the MMIO region.
+ * @param   pfnCallback     Callback for doing the mapping, optional.  The
+ *                          callback will be invoked holding only the PDM lock.
+ *                          The device lock will _not_ be taken (due to lock
+ *                          order).
+ */
+DECLINLINE(int) PDMDevHlpPCIIORegionRegisterMmioEx(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
+                                                   RTGCPHYS cbRegion, PCIADDRESSSPACE enmType, IOMMMIOHANDLE hMmioRegion,
+                                                   PFNPCIIOREGIONMAP pfnCallback)
+{
+    return pDevIns->pHlpR3->pfnPCIIORegionRegister(pDevIns, pPciDev, iRegion, cbRegion, enmType,
+                                                   PDMPCIDEV_IORGN_F_MMIO_HANDLE, hMmioRegion, pfnCallback);
+}
+
+/**
  * Combines PDMDevHlpMmioCreate and PDMDevHlpPCIIORegionRegisterMmio, creating
  * and registering an MMIO region for the default PCI device.
@@ -6874 +6898 @@
  * @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   iPciRegion      The PCI device region.
  * @param   enmType         PCI_ADDRESS_SPACE_MEM or
  *                          PCI_ADDRESS_SPACE_MEM_PREFETCH, optionally or-ing in
@@ -6894 +6917 @@
 
 {
-    int rc = pDevIns->pHlpR3->pfnMmioCreateEx(pDevIns, cbRegion, fFlags, pDevIns->apPciDevs[0], iPciRegion,
+    int rc = pDevIns->pHlpR3->pfnMmioCreateEx(pDevIns, cbRegion, fFlags, pDevIns->apPciDevs[0], iPciRegion << 16,
                                               pfnWrite, pfnRead, NULL /*pfnFill*/, pvUser, pszDesc, phRegion);
     if (RT_SUCCESS(rc))