Changeset 81031 in vbox for trunk/src/VBox/Devices/Samples

Timestamp:

Sep 26, 2019 7:26:33 PM (6 years ago)

Author:

vboxsync

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

133634

Message:

PDM,Devices: Moving the PDMPCIDEV structures into the PDMDEVINS allocation. Preps for extending the config space to 4KB. bugref:9218

File:

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

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

@@ -51 +51 @@
 typedef struct VBOXPLAYGROUNDDEVICEFUNCTION
 {
-    /** The PCI devices. */
-    PDMPCIDEV   PciDev;
     /** The function number. */
     uint8_t     iFun;
@@ -203 +201 @@
 
     uint8_t uNumFunctions;
+    AssertCompile(RT_ELEMENTS(pThis->aPciFuns) <= RT_ELEMENTS(pDevIns->apPciDevs));
     rc = CFGMR3QueryU8Def(pCfg, "NumFunctions", &uNumFunctions, RT_ELEMENTS(pThis->aPciFuns));
     if (RT_FAILURE(rc))
@@ -258 +257 @@
     for (uint32_t iPciFun = 0; iPciFun < uNumFunctions; iPciFun++)
     {
-        PVBOXPLAYGROUNDDEVICEFUNCTION pFun = &pThis->aPciFuns[iPciFun];
-        RTStrPrintf(pFun->szName, sizeof(pThis->aPciFuns[iPciFun].PciDev), "playground%u", iPciFun);
+        PPDMPCIDEV                    pPciDev = pDevIns->apPciDevs[iPciFun];
+        PVBOXPLAYGROUNDDEVICEFUNCTION pFun    = &pThis->aPciFuns[iPciFun];
+        RTStrPrintf(pFun->szName, sizeof(pFun->szName), "playground%u", iPciFun);
         pFun->iFun = iPciFun;
 
-        PCIDevSetVendorId( &pFun->PciDev, 0x80ee);
-        PCIDevSetDeviceId( &pFun->PciDev, 0xde4e);
-        PCIDevSetClassBase(&pFun->PciDev, 0x07);   /* communications device */
-        PCIDevSetClassSub( &pFun->PciDev, 0x80);   /* other communications device */
-        if (iPciFun == 0)       /* only for the primary function */
-            PCIDevSetHeaderType(&pFun->PciDev, 0x80); /* normal, multifunction device */
-
-        rc = PDMDevHlpPCIRegisterEx(pDevIns, &pFun->PciDev, iPciFun, 0 /*fFlags*/, iPciDevNo, iPciFun,
-                                    pThis->aPciFuns[iPciFun].szName);
+        PDMPCIDEV_ASSERT_VALID(pDevIns, pPciDev);
+
+        PDMPciDevSetVendorId(pPciDev,       0x80ee);
+        PDMPciDevSetDeviceId(pPciDev,       0xde4e);
+        PDMPciDevSetClassBase(pPciDev,      0x07);  /* communications device */
+        PDMPciDevSetClassSub(pPciDev,       0x80);  /* other communications device */
+        if (iPciFun == 0) /* only for the primary function */
+            PDMPciDevSetHeaderType(pPciDev, 0x80);  /* normal, multifunction device */
+
+        rc = PDMDevHlpPCIRegisterEx(pDevIns, pPciDev, 0 /*fFlags*/, iPciDevNo, iPciFun, pThis->aPciFuns[iPciFun].szName);
         AssertLogRelRCReturn(rc, rc);
 
         /* First region. */
         RTGCPHYS const cbFirst = iPciFun == 0 ? cbFirstBAR : iPciFun * _4K;
-        rc = PDMDevHlpPCIIORegionRegisterEx(pDevIns, &pFun->PciDev, 0, cbFirst,
+        rc = PDMDevHlpPCIIORegionRegisterEx(pDevIns, pPciDev, 0, cbFirst,
                                             (PCIADDRESSSPACE)(  PCI_ADDRESS_SPACE_MEM | PCI_ADDRESS_SPACE_BAR64
                                                               | (iPciFun == 0 ? PCI_ADDRESS_SPACE_MEM_PREFETCH : 0)),
@@ -283 +284 @@
         RTStrAPrintf(&pszRegionName, "PG-F%d-BAR0", iPciFun);
         Assert(pszRegionName);
-        rc = PDMDevHlpMMIOExPreRegister(pDevIns, &pFun->PciDev, 0, cbFirst,
+        rc = PDMDevHlpMMIOExPreRegister(pDevIns, pPciDev, 0, cbFirst,
                                         IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU, pszRegionName,
                                         NULL /*pvUser*/,  devPlaygroundMMIOWrite, devPlaygroundMMIORead, NULL /*pfnFill*/,
@@ -292 +293 @@
         /* Second region. */
         RTGCPHYS const cbSecond = iPciFun == 0  ? cbSecondBAR : iPciFun * _32K;
-        rc = PDMDevHlpPCIIORegionRegisterEx(pDevIns, &pFun->PciDev, 2, cbSecond,
+        rc = PDMDevHlpPCIIORegionRegisterEx(pDevIns, pPciDev, 2, cbSecond,
                                             (PCIADDRESSSPACE)(  PCI_ADDRESS_SPACE_MEM | PCI_ADDRESS_SPACE_BAR64
                                                               | (iPciFun == 0 ? PCI_ADDRESS_SPACE_MEM_PREFETCH : 0)),
@@ -300 +301 @@
         RTStrAPrintf(&pszRegionName, "PG-F%d-BAR2", iPciFun);
         Assert(pszRegionName);
-        rc = PDMDevHlpMMIOExPreRegister(pDevIns, &pFun->PciDev, 2, cbSecond,
+        rc = PDMDevHlpMMIOExPreRegister(pDevIns, pPciDev, 2, cbSecond,
                                         IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU, pszRegionName,
                                         NULL /*pvUser*/,  devPlaygroundMMIOWrite, devPlaygroundMMIORead, NULL /*pfnFill*/,
@@ -351 +352 @@
     /* .cbInstanceCC = */           0,
     /* .cbInstanceRC = */           0,
-    /* .cMaxPciDevices = */         1,
+    /* .cMaxPciDevices = */         8,
     /* .cMaxMsixVectors = */        0,
     /* .pszDescription = */         "VBox Playground Device.",