Changeset 2596 in vbox

Timestamp:

May 11, 2007 5:13:13 PM (17 years ago)

Author:

vboxsync

Message:

Moved PFNPCICONFIGREAD and PFNPCICONFIGWRITE out in the open.

Location:

trunk

Files:

• include/VBox/pci.h (modified) (1 diff)
• src/VBox/Devices/Bus/DevPCI.cpp (modified) (2 diffs)
• src/VBox/Devices/Bus/PCIInternal.h (modified) (1 diff)

trunk/include/VBox/pci.h

@@ -77 +77 @@
 typedef FNPCIIOREGIONMAP *PFNPCIIOREGIONMAP;
 
+/** 
+ * Callback function for reading from the PCI configuration space.
+ *
+ * @returns The register value.
+ * @param   pPciDev         Pointer to PCI device. Use pPciDev->pDevIns to get the device instance.
+ * @param   Address         The configuration space register address. [0..255]
+ * @param   cb              The register size. [1,2,4]
+ */
+typedef DECLCALLBACK(uint32_t) FNPCICONFIGREAD(PPCIDEVICE pPciDev, uint32_t Address, unsigned cb);
+/** Pointer to a FNPCICONFIGREAD() function. */
+typedef FNPCICONFIGREAD *PFNPCICONFIGREAD;
+/** Pointer to a PFNPCICONFIGREAD. */
+typedef PFNPCICONFIGREAD *PPFNPCICONFIGREAD;
+
+/** 
+ * Callback function for writing to the PCI configuration space.
+ *
+ * @param   pPciDev         Pointer to PCI device. Use pPciDev->pDevIns to get the device instance.
+ * @param   Address         The configuration space register address. [0..255]
+ * @param   u32Value        The value that's being written. The number of bits actually used from 
+ *                          this value is determined by the cb parameter.
+ * @param   cb              The register size. [1,2,4]
+ */
+typedef DECLCALLBACK(void) FNPCICONFIGWRITE(PPCIDEVICE pPciDev, uint32_t Address, uint32_t u32Value, unsigned cb);
+/** Pointer to a FNPCICONFIGWRITE() function. */
+typedef FNPCICONFIGWRITE *PFNPCICONFIGWRITE;
+/** Pointer to a PFNPCICONFIGWRITE. */
+typedef PFNPCICONFIGWRITE *PPFNPCICONFIGWRITE;
+
 /** Fixed I/O region number for ROM. */
 #define PCI_ROM_SLOT 6

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

@@ -309 +309 @@
 }
 
-static uint32_t pci_default_read_config(PCIDevice *d,
-                                        uint32_t address, int len)
+
+static DECLCALLBACK(uint32_t) pci_default_read_config(PCIDevice *d, uint32_t address, unsigned len)
 {
     uint32_t val;
@@ -328 +328 @@
 }
 
-static void pci_default_write_config(PCIDevice *d,
-                                     uint32_t address, uint32_t val, int len)
-{
-    int can_write, i;
+static DECLCALLBACK(void) pci_default_write_config(PCIDevice *d, uint32_t address, uint32_t val, unsigned len)
+{
+    int can_write;
+    unsigned i;
     uint32_t end, addr;
 

trunk/src/VBox/Devices/Bus/PCIInternal.h

@@ -40 +40 @@
 typedef PCIIOREGION *PPCIIOREGION;
 
-/** Pointer to pci_default_read_config. */
-typedef uint32_t    (*PFNPCICONFIGREAD)(PPCIDEVICE pPciDev, uint32_t u32CfgAddress, int cb);
-/** Pointer to pci_default_write_config. */
-typedef void        (*PFNPCICONFIGWRITE)(PPCIDEVICE pPciDev, uint32_t u32CfgAddress, uint32_t u32Data, int cb);
-
 /**
  * PCI Device - Internal data.