Changeset 34876 in vbox

Timestamp:

Dec 9, 2010 11:16:00 AM (14 years ago)

Author:

vboxsync

Message:

PCI: some infrastructure work

Location:

trunk

Files:

• include/VBox/pci.h (modified) (1 diff)
• src/VBox/Devices/Builtins.h (modified) (1 diff)
• src/VBox/Devices/Bus/DevPciRaw.cpp (added)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/include/BusAssignmentManager.h (modified) (1 diff)

trunk/include/VBox/pci.h

@@ -986 +986 @@
 #endif
 
+#ifdef __cplusplus
+struct PciBusAddress
+{
+    int  iBus;
+    int  iDevice;
+    int  iFn;
+
+    PciBusAddress()
+    {
+        clear();
+    }
+
+    PciBusAddress(int bus, int device, int fn)
+    {
+        init(bus, device, fn);
+    }
+
+    PciBusAddress& clear()
+    {
+        iBus = iDevice = iFn = -1;
+        return *this;
+    }
+
+    void init(int bus, int device, int fn)
+    {
+        iBus = bus;
+        iDevice = device;
+        iFn = fn;
+    }
+
+    void init(const PciBusAddress &a)
+    {
+        iBus = a.iBus;
+        iDevice = a.iDevice;
+        iFn = a.iFn;
+    }
+
+    bool operator<(const PciBusAddress &a) const
+    {
+        if (iBus < a.iBus)
+            return true;
+
+        if (iBus > a.iBus)
+            return false;
+
+        if (iDevice < a.iDevice)
+            return true;
+
+        if (iDevice > a.iDevice)
+            return false;
+
+        if (iFn < a.iFn)
+            return true;
+
+        if (iFn > a.iFn)
+            return false;
+
+        return false;
+    }
+
+    bool operator==(const PciBusAddress &a) const
+    {
+        return     (iBus == a.iBus)
+                && (iDevice == a.iDevice)
+                && (iFn == a.iFn);
+    }
+
+    bool operator!=(const PciBusAddress &a) const
+    {
+        return     (iBus != a.iBus)
+                || (iDevice != a.iDevice)
+                || (iFn  != a.iFn);
+    }
+
+    bool valid() const
+    {
+        return (iBus != -1) && (iDevice != -1) && (iFn != -1);
+    }
+
+    int32_t asLong() const
+    {
+        Assert(valid());
+        return (iBus << 8) | (iDevice << 3) | iFn;
+    }
+
+    void fromLong(int32_t value)
+    {
+        iBus = (value >> 8) & 0xff;
+        iDevice = (value & 0xff) >> 3;
+        iFn = (value & 7);
+    }
+};
+#endif /* __cplusplus */
+
 /** @} */
 

trunk/src/VBox/Devices/Builtins.h

@@ -84 +84 @@
 extern const PDMDEVREG g_DeviceEFI;
 #endif
+extern const PDMDEVREG g_DevicePciRaw;
 
 extern const PDMDRVREG g_DrvMouseQueue;

trunk/src/VBox/Devices/Makefile.kmk

@@ -272 +272 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
+        Bus/DevPciRaw.cpp \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -533 +534 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
+        Bus/DevPciRaw.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -636 +638 @@
         Bus/MsiCommon.cpp \
         Bus/MsixCommon.cpp \
+        Bus/DevPciRaw.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \

trunk/src/VBox/Main/include/BusAssignmentManager.h

@@ -21 +21 @@
 
 #include "VBox/types.h"
+#include "VBox/pci.h"
 #include "VirtualBoxBase.h"
-
-struct PciBusAddress
-{
-    int  iBus;
-    int  iDevice;
-    int  iFn;
-
-    PciBusAddress()
-    {
-        clear();
-    }
-
-    PciBusAddress(int bus, int device, int fn)
-        : iBus(bus), iDevice(device), iFn(fn)
-    {
-    }
-
-    PciBusAddress& clear()
-    {
-        iBus = iDevice = iFn = -1;
-        return *this;
-    }
-
-    bool operator<(const PciBusAddress &a) const
-    {
-        if (iBus < a.iBus)
-            return true;
-
-        if (iBus > a.iBus)
-            return false;
-
-        if (iDevice < a.iDevice)
-            return true;
-
-        if (iDevice > a.iDevice)
-            return false;
-
-        if (iFn < a.iFn)
-            return true;
-
-        if (iFn > a.iFn)
-            return false;
-
-        return false;
-    }
-
-    bool operator==(const PciBusAddress &a) const
-    {
-        return     (iBus == a.iBus)
-                && (iDevice == a.iDevice)
-                && (iFn == a.iFn);
-    }
-
-    bool operator!=(const PciBusAddress &a) const
-    {
-        return     (iBus != a.iBus)
-                || (iDevice != a.iDevice)
-                || (iFn  != a.iFn);
-    }
-
-    bool valid() const
-    {
-        return (iBus != -1) && (iDevice != -1) && (iFn != -1);
-    }
-    
-    LONG asLong() const
-    {
-        Assert(valid());
-        return (iBus << 8) | (iDevice << 3) | iFn;
-    }
-
-    void fromLong(LONG value)
-    {
-        iBus = (value >> 8) & 0xff;
-        iDevice = (value & 0xff) >> 3;
-        iFn = (value & 7);
-    }
-};
 
 class BusAssignmentManager