Changeset 36678 in vbox for trunk/src/VBox/HostDrivers/VBoxPci

Timestamp:

Apr 15, 2011 9:24:13 AM (14 years ago)

Author:

vboxsync

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

71177

Message:

PCI: cleanups, R3 mapping work

File:

• trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (9 diffs)

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -190 +190 @@
 
     vboxPciDevLock(pThis);
-    
+
     if (pThis->IrqHandler.pfnIrqHandler)
     {
@@ -243 +243 @@
 static DECLCALLBACK(int) vboxPciDevGetRegionInfo(PRAWPCIDEVPORT pPort,
                                                  int32_t        iRegion,
-                                                 RTHCPHYS       *pRegionStart,
-                                                 uint64_t       *pu64RegionSize,
-                                                 bool           *pfPresent,
+                                                 RTHCPHYS       *pRegionStart,
+                                                 uint64_t       *pu64RegionSize,
+                                                 bool           *pfPresent,
                                                  uint32_t        *pfFlags)
 {
@@ -266 +266 @@
 static DECLCALLBACK(int) vboxPciDevMapRegion(PRAWPCIDEVPORT pPort,
                                              int32_t        iRegion,
-                                             RTHCPHYS       RegionStart,
-                                             uint64_t       u64RegionSize,
+                                             RTHCPHYS       RegionStart,
+                                             uint64_t       u64RegionSize,
                                              int32_t        fFlags,
                                              RTR0PTR        *pRegionBase)
@@ -288 +288 @@
 static DECLCALLBACK(int) vboxPciDevUnmapRegion(PRAWPCIDEVPORT pPort,
                                                int32_t        iRegion,
-                                               RTHCPHYS       RegionStart,
-                                               uint64_t       u64RegionSize,
+                                               RTHCPHYS       RegionStart,
+                                               uint64_t       u64RegionSize,
                                                RTR0PTR        RegionBase)
 {
@@ -307 +307 @@
  * @copydoc RAWPCIDEVPORT:: pfnPciCfgRead
  */
-static DECLCALLBACK(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, uint32_t Register, PCIRAWMEMLOC *pValue)
+static DECLCALLBACK(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, 
+                                              uint32_t       Register, 
+                                              PCIRAWMEMLOC   *pValue)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -325 +327 @@
  * @copydoc RAWPCIDEVPORT:: pfnPciCfgWrite
  */
-static DECLCALLBACK(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, uint32_t Register, PCIRAWMEMLOC *pValue)
+static DECLCALLBACK(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, 
+                                               uint32_t       Register, 
+                                               PCIRAWMEMLOC   *pValue)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -339 +343 @@
 }
 
-static DECLCALLBACK(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT pPort, PFNRAWPCIISR pfnHandler, void* pIrqContext, PCIRAWISRHANDLE *phIsr)
+static DECLCALLBACK(int) vboxPciDevRegisterIrqHandler(PRAWPCIDEVPORT  pPort, 
+                                                      PFNRAWPCIISR    pfnHandler, 
+                                                      void*           pIrqContext, 
+                                                      PCIRAWISRHANDLE *phIsr)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
     int     rc;
-    int32_t iHostIrq = 0;    
+    int32_t iHostIrq = 0;
 
     if (pfnHandler == NULL)
@@ -365 +372 @@
         }
     }
-        
-    vboxPciDevUnlock(pThis);
-
-    return rc;
-}
-
-static DECLCALLBACK(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT pPort, PCIRAWISRHANDLE hIsr)
+
+    vboxPciDevUnlock(pThis);
+
+    return rc;
+}
+
+static DECLCALLBACK(int) vboxPciDevUnregisterIrqHandler(PRAWPCIDEVPORT  pPort, 
+                                                        PCIRAWISRHANDLE hIsr)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -393 +401 @@
 }
 
-static DECLCALLBACK(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT pPort, PCIRAWPOWERSTATE  aState, uint64_t *pu64Param)
+static DECLCALLBACK(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT    pPort, 
+                                                    PCIRAWPOWERSTATE  aState, 
+                                                    uint64_t          *pu64Param)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);