Changeset 34331 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 24, 2010 4:24:17 PM (14 years ago)

Author:

vboxsync

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

68094

Message:

PCI: more 4.0 interfaces

Location:

trunk/src/VBox/Devices

Files:

• Bus/PCIInternal.h (modified) (1 diff)
• VMMDev/VMMDev.cpp (modified) (2 diffs)

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

@@ -24 +24 @@
 typedef struct PCIIOREGION
 {
-    /** Current PCI mapping address, 0xffffffff means not mapped. 
+    /** Current PCI mapping address, 0xffffffff means not mapped.
         @todo: make address and size 64-bit. */
     uint32_t                        addr;

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -2877 +2877 @@
 
     /* PCI vendor, just a free bogus value */
-    pThis->dev.config[0x00] = 0xee;
-    pThis->dev.config[0x01] = 0x80;
+    PCIDevSetVendorId(&pThis->dev, 0x80ee);
     /* device ID */
-    pThis->dev.config[0x02] = 0xfe;
-    pThis->dev.config[0x03] = 0xca;
+    PCIDevSetDeviceId(&pThis->dev, 0xcafe);
     /* class sub code (other type of system peripheral) */
-    pThis->dev.config[0x0a] = 0x80;
+    PCIDevSetClassSub(&pThis->dev, 0x80);
     /* class base code (base system peripheral) */
-    pThis->dev.config[0x0b] = 0x08;
+    PCIDevSetClassBase(&pThis->dev, 0x08);
     /* header type */
-    pThis->dev.config[0x0e] = 0x00;
+    PCIDevSetHeaderType(&pThis->dev, 0x00);
     /* interrupt on pin 0 */
-    pThis->dev.config[0x3d] = 0x01;
+    PCIDevSetInterruptPin(&pThis->dev, 0x01);
 
     /*
@@ -3044 +3042 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (pThis->dev.devfn == 32 || iInstance != 0)
+    if (pThis->dev.devfn != 32 || iInstance != 0)
         Log(("!!WARNING!!: pThis->dev.devfn=%d (ignore if testcase or no started by Main)\n", pThis->dev.devfn));
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 0, 0x20, PCI_ADDRESS_SPACE_IO, vmmdevIOPortRegionMap);