Changeset 64387 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 24, 2016 2:06:02 PM (8 years ago)

Author:

vboxsync

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

111495

Message:

PDM,Devices: Some PCI device type cleanup.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (4 diffs)
• DevATA.cpp (modified) (2 diffs)
• DevBusLogic.cpp (modified) (3 diffs)
• DevLsiLogicSCSI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -482 +482 @@
 {
     /** The PCI device structure. */
-    PCIDEVICE                       dev;
+    PDMPCIDEV                       dev;
     /** Pointer to the device instance - R3 ptr */
     PPDMDEVINSR3                    pDevInsR3;
@@ -2449 +2449 @@
  * @callback_method_impl{FNPCIIOREGIONMAP}
  */
-static DECLCALLBACK(int) ahciR3MMIOMap(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion,
+static DECLCALLBACK(int) ahciR3MMIOMap(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                        RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {
@@ -2493 +2493 @@
  *      controller.}
  */
-static DECLCALLBACK(int) ahciR3LegacyFakeIORangeMap(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion,
+static DECLCALLBACK(int) ahciR3LegacyFakeIORangeMap(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                                     RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {
@@ -2533 +2533 @@
  *      Map the BMDMA I/O port range (used for the Index/Data pair register access)}
  */
-static DECLCALLBACK(int) ahciR3IdxDataIORangeMap(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion,
+static DECLCALLBACK(int) ahciR3IdxDataIORangeMap(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                                  RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -480 +480 @@
  * The state of the ATA PCI device.
  *
- * @extends     PCIDEVICE
+ * @extends     PDMPCIDEV
  * @implements  PDMILEDPORTS
  */
 typedef struct PCIATAState
 {
-    PCIDEVICE           dev;
+    PDMPCIDEV           dev;
     /** The controllers. */
     ATACONTROLLER       aCts[2];
@@ -6112 +6112 @@
  * @callback_method_impl{FNPCIIOREGIONMAP}
  */
-static DECLCALLBACK(int) ataR3BMDMAIORangeMap(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion,
+static DECLCALLBACK(int) ataR3BMDMAIORangeMap(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                               RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -322 +322 @@
  * Main BusLogic device state.
  *
- * @extends     PCIDEVICE
+ * @extends     PDMPCIDEV
  * @implements  PDMILEDPORTS
  */
@@ -328 +328 @@
 {
     /** The PCI device structure. */
-    PCIDEVICE                       dev;
+    PDMPCIDEV                       dev;
     /** Pointer to the device instance - HC ptr */
     PPDMDEVINSR3                    pDevInsR3;
@@ -2780 +2780 @@
  * @callback_method_impl{FNPCIIOREGIONMAP}
  */
-static DECLCALLBACK(int) buslogicR3MmioMap(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion,
+static DECLCALLBACK(int) buslogicR3MmioMap(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                            RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -189 +189 @@
 {
     /** PCI device structure. */
-    PCIDEVICE            PciDev;
+    PDMPCIDEV            PciDev;
     /** Pointer to the device instance. - R3 ptr. */
     PPDMDEVINSR3         pDevInsR3;
@@ -3990 +3990 @@
  * @callback_method_impl{FNPCIIOREGIONMAP}
  */
-static DECLCALLBACK(int) lsilogicR3Map(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion,
+static DECLCALLBACK(int) lsilogicR3Map(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
                                        RTGCPHYS GCPhysAddress, RTGCPHYS cb,
                                        PCIADDRESSSPACE enmType)