Changeset 80963 in vbox

Timestamp:

Sep 23, 2019 11:17:02 PM (6 years ago)

Author:

vboxsync

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

133550

Message:

DevPci*,PDM: Doxygen fixes. bugrefx:9218

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (7 diffs)
• DevPciIch9.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -805 +805 @@
  * @callback_method_impl{FNIOMIOPORTNEWOUT, PCI address}
  */
-static DECLCALLBACK(VBOXSTRICTRC) pciIOPortAddressWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
-{
-    LogFunc(("Port=%#x u32=%#x cb=%d\n", Port, u32, cb));
-    RT_NOREF2(Port, pvUser);
+static DECLCALLBACK(VBOXSTRICTRC)
+pciIOPortAddressWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
+{
+    LogFunc(("uPort=%#x u32=%#x cb=%d\n", uPort, u32, cb));
+    RT_NOREF2(uPort, pvUser);
     if (cb == 4)
     {
@@ -825 +826 @@
  * @callback_method_impl{FNIOMIOPORTNEWIN, PCI address}
  */
-static DECLCALLBACK(VBOXSTRICTRC) pciIOPortAddressRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
-{
-    RT_NOREF2(Port, pvUser);
+static DECLCALLBACK(VBOXSTRICTRC)
+pciIOPortAddressRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
+{
+    RT_NOREF2(uPort, pvUser);
     if (cb == 4)
     {
@@ -834 +836 @@
         *pu32 = pThis->uConfigReg;
         PCI_UNLOCK(pDevIns);
-        LogFunc(("Port=%#x cb=%d -> %#x\n", Port, cb, *pu32));
+        LogFunc(("uPort=%#x cb=%d -> %#x\n", uPort, cb, *pu32));
         return VINF_SUCCESS;
     }
     /* else: 440FX does "pass through to the bus" for other writes, what ever that means.
      * Linux probes for cmd640 using byte writes/reads during ide init. We'll just ignore it. */
-    LogFunc(("Port=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", Port, cb));
+    LogFunc(("uPort=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", uPort, cb));
     return VERR_IOM_IOPORT_UNUSED;
 }
@@ -847 +849 @@
  * @callback_method_impl{FNIOMIOPORTNEWOUT, PCI data}
  */
-static DECLCALLBACK(VBOXSTRICTRC) pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
-{
-    LogFunc(("Port=%#x u32=%#x cb=%d\n", Port, u32, cb));
+static DECLCALLBACK(VBOXSTRICTRC)
+pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
+{
+    LogFunc(("uPort=%#x u32=%#x cb=%d\n", uPort, u32, cb));
     NOREF(pvUser);
     VBOXSTRICTRC rcStrict = VINF_SUCCESS;
-    if (!(Port % cb))
+    if (!(uPort % cb))
     {
         PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_WRITE);
-        rcStrict = pci_data_write(pDevIns, PDMINS_2_DATA(pDevIns, PDEVPCIROOT), Port, u32, cb);
+        rcStrict = pci_data_write(pDevIns, PDMINS_2_DATA(pDevIns, PDEVPCIROOT), uPort, u32, cb);
         PCI_UNLOCK(pDevIns);
     }
     else
-        AssertMsgFailed(("Write to port %#x u32=%#x cb=%d\n", Port, u32, cb));
+        AssertMsgFailed(("Write to port %#x u32=%#x cb=%d\n", uPort, u32, cb));
     return rcStrict;
 }
@@ -867 +870 @@
  * @callback_method_impl{FNIOMIOPORTNEWIN, PCI data}
  */
-static DECLCALLBACK(VBOXSTRICTRC) pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC)
+pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
 {
     NOREF(pvUser);
-    if (!(Port % cb))
+    if (!(uPort % cb))
     {
         PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_READ);
-        VBOXSTRICTRC rcStrict = pci_data_read(PDMINS_2_DATA(pDevIns, PDEVPCIROOT), Port, cb, pu32);
+        VBOXSTRICTRC rcStrict = pci_data_read(PDMINS_2_DATA(pDevIns, PDEVPCIROOT), uPort, cb, pu32);
         PCI_UNLOCK(pDevIns);
-        LogFunc(("Port=%#x cb=%#x -> %#x (%Rrc)\n", Port, cb, *pu32, VBOXSTRICTRC_VAL(rcStrict)));
+        LogFunc(("uPort=%#x cb=%#x -> %#x (%Rrc)\n", uPort, cb, *pu32, VBOXSTRICTRC_VAL(rcStrict)));
         return rcStrict;
     }
-    AssertMsgFailed(("Read from port %#x cb=%d\n", Port, cb));
+    AssertMsgFailed(("Read from port %#x cb=%d\n", uPort, cb));
     return VERR_IOM_IOPORT_UNUSED;
 }
@@ -888 +892 @@
  */
 static DECLCALLBACK(VBOXSTRICTRC)
-pciR3IOPortMagicPCIWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
-{
-    RT_NOREF2(pvUser, Port);
-    LogFunc(("Port=%#x u32=%#x cb=%d\n", Port, u32, cb));
+pciR3IOPortMagicPCIWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
+{
+    RT_NOREF2(pvUser, uPort);
+    LogFunc(("uPort=%#x u32=%#x cb=%d\n", uPort, u32, cb));
     if (cb == 4)
     {
-        if (u32 == UINT32_C(19200509)) // Richard Adams
+        if (u32 == UINT32_C(19200509)) // Richard Adams - Note! In decimal rather hex.
         {
             int rc = pciR3FakePCIBIOS(pDevIns);
@@ -908 +912 @@
  */
 static DECLCALLBACK(VBOXSTRICTRC)
-pciR3IOPortMagicPCIRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
-{
-    RT_NOREF5(pDevIns, pvUser, Port, pu32, cb);
-    LogFunc(("Port=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", Port, cb));
+pciR3IOPortMagicPCIRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
+{
+    RT_NOREF5(pDevIns, pvUser, uPort, pu32, cb);
+    LogFunc(("uPort=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", uPort, cb));
     return VERR_IOM_IOPORT_UNUSED;
 }

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -252 +252 @@
 /**
  * @callback_method_impl{FNIOMIOPORTNEWOUT,
- *                       Port I/O Handler for PCI address OUT operations.}
+ *      Port I/O Handler for PCI address OUT operations.}
  *
  * Emulates writes to Configuration Address Port at 0CF8h for Configuration
@@ -283 +283 @@
 /**
  * @callback_method_impl{FNIOMIOPORTNEWIN,
- *                       Port I/O Handler for PCI data IN operations.}
+ *      Port I/O Handler for PCI data IN operations.}
  *
  * Emulates reads from Configuration Address Port at 0CF8h for Configuration
@@ -363 +363 @@
 /**
  * @callback_method_impl{FNIOMIOPORTNEWOUT,
- *                       Port I/O Handler for PCI data OUT operations.
+ *      Port I/O Handler for PCI data OUT operations.}
  *
  * Emulates writes to Configuration Data Port at 0CFCh for Configuration
@@ -461 +461 @@
 /**
  * @callback_method_impl{FNIOMIOPORTNEWIN,
- *                       Port I/O Handler for PCI data IN operations.
+ *      Port I/O Handler for PCI data IN operations.}
  *
  * Emulates reads from Configuration Data Port at 0CFCh for Configuration
@@ -2109 +2109 @@
  *
  * @returns Max subordinate bus number.
- * @param   pPciRoot         Global device instance data used to generate unique bus numbers.
- * @param   pBus             The PCI bus to initialize.
- * @param   pbmUsed          Pointer to a 32-bit bitmap tracking which device
- *                           (ranges) has been used.
- * @param   uBusPrimary      The primary bus number the bus is connected to.
+ * @param   pDevIns         The device instance of the bus.
+ * @param   pPciRoot        Global device instance data used to generate unique bus numbers.
+ * @param   pBus            The PCI bus to initialize.
+ * @param   pbmUsed         Pointer to a 32-bit bitmap tracking which device
+ *                          (ranges) has been used.
+ * @param   uBusPrimary     The primary bus number the bus is connected to.
  */
 static uint8_t ich9pciBiosInitBridgeTopology(PPDMDEVINS pDevIns, PDEVPCIROOT pPciRoot, PDEVPCIBUS pBus,