Changeset 44508 in vbox for trunk/include/VBox/vmm

Timestamp:

Feb 1, 2013 12:46:33 PM (12 years ago)

Author:

vboxsync

Message:

Drop the pfnSaveExecR3 and pfnLoadExecR3 interfaces of the PCI buses (never used). Synced pciR3CommonRestoreConfig between the two PCI buses, dropping the constants in the table as they make double checking sizes and offsets harder. Also removing the pfnIOCtl device registration structure member, putting a pfnReserved in it's place.

File:

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

trunk/include/VBox/vmm/pdmdev.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -109 +109 @@
 
 /**
- * Device I/O Control interface.
- *
- * This is used by external components, such as the COM interface, to
- * communicate with devices using a class wide interface or a device
- * specific interface.
- *
- * @returns VBox status code.
- * @param   pDevIns     Pointer to the device instance.
- * @param   uFunction   Function to perform.
- * @param   pvIn        Pointer to input data.
- * @param   cbIn        Size of input data.
- * @param   pvOut       Pointer to output data.
- * @param   cbOut       Size of output data.
- * @param   pcbOut      Where to store the actual size of the output data.
- *
- * @remarks Not used.
- */
-typedef DECLCALLBACK(int) FNPDMDEVIOCTL(PPDMDEVINS pDevIns, uint32_t uFunction,
-                                        void *pvIn, uint32_t cbIn,
-                                        void *pvOut, uint32_t cbOut, PRTUINT pcbOut);
-/** Pointer to a FNPDMDEVIOCTL() function. */
-typedef FNPDMDEVIOCTL *PFNPDMDEVIOCTL;
-
-/**
  * Power On notification.
  *
@@ -305 +281 @@
      * Critical section NOT entered. */
     PFNPDMDEVRELOCATE   pfnRelocate;
-    /** I/O Control interface - optional.
-     * Not used.  */
-    PFNPDMDEVIOCTL      pfnIOCtl;
+    /** Unused member. (Was pfnIOCtl.) */
+    PFNRT               pfnUnused;
     /** Power on notification - optional.
      * Critical section is entered. */
@@ -504 +479 @@
      * @param   iDev            The device number ((dev << 3) | function) the device should have on the bus.
      *                          If negative, the pci bus device will assign one.
+     * @remarks Caller enters the PDM critical section.
      */
     DECLR3CALLBACKMEMBER(int, pfnRegisterR3,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, const char *pszName, int iDev));
@@ -514 +490 @@
      * @param   pPciDev         The PCI device structure.
      * @param   pMsiReg         MSI registration structure
+     * @remarks Caller enters the PDM critical section.
      */
     DECLR3CALLBACKMEMBER(int, pfnRegisterMsiR3,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PPDMMSIREG pMsiReg));
@@ -527 +504 @@
      * @param   iType           PCI_ADDRESS_SPACE_MEM, PCI_ADDRESS_SPACE_IO or PCI_ADDRESS_SPACE_MEM_PREFETCH.
      * @param   pfnCallback     Callback for doing the mapping.
+     * @remarks Caller enters the PDM critical section.
      */
     DECLR3CALLBACKMEMBER(int, pfnIORegionRegisterR3,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, int iRegion, uint32_t cbRegion, PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback));
@@ -543 +521 @@
      *                          PCI config write function. This way, user can decide when (and if)
      *                          to call default PCI config write function. Can be NULL.
+     * @remarks Caller enters the PDM critical section.
      * @thread  EMT
      */
@@ -556 +535 @@
      * @param   iLevel          IRQ level. See the PDM_IRQ_LEVEL_* \#defines.
      * @param   uTagSrc         The IRQ tag and source (for tracing).
+     * @remarks Caller enters the PDM critical section.
      */
     DECLR3CALLBACKMEMBER(void, pfnSetIrqR3,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, int iIrq, int iLevel, uint32_t uTagSrc));
-
-    /**
-     * Saves a state of the PCI device.
-     *
-     * @returns VBox status code.
-     * @param   pDevIns         Device instance of the PCI Bus.
-     * @param   pPciDev         Pointer to PCI device.
-     * @param   pSSMHandle      The handle to save the state to.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnSaveExecR3,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSMHandle));
-
-    /**
-     * Loads a saved PCI device state.
-     *
-     * @returns VBox status code.
-     * @param   pDevIns         Device instance of the PCI Bus.
-     * @param   pPciDev         Pointer to PCI device.
-     * @param   pSSMHandle      The handle to the saved state.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnLoadExecR3,(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSMHandle));
 
     /**
@@ -586 +546 @@
      * @returns VBox status.
      * @param   pDevIns     Device instance of the first bus.
+     * @remarks Caller enters the PDM critical section.
      */
     DECLR3CALLBACKMEMBER(int, pfnFakePCIBIOSR3,(PPDMDEVINS pDevIns));
@@ -600 +561 @@
 
 /** Current PDMPCIBUSREG version number. */
-#define PDM_PCIBUSREG_VERSION                   PDM_VERSION_MAKE(0xfffe, 3, 0)
+#define PDM_PCIBUSREG_VERSION                   PDM_VERSION_MAKE(0xfffe, 4, 0)
 
 /**