vbox的更動 86083 路徑 trunk/include/VBox/pci.h

時間撮記:

2020-9-10 下午01:10:04 (5 年 以前)

作者:

vboxsync

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

140312

訊息:

VBox/pci.h: Make extra sure we only mask in 3 bits of the PCI function when constructing the DevFn.

檔案:

• trunk/include/VBox/pci.h (修改) (2 筆差異)

trunk/include/VBox/pci.h ¶

@@ -613 +613 @@
 /** Number of devices per bus. */
 #define VBOX_PCI_MAX_DEVICES        32
-/** The device number shift count for a device+function number. */
+/** The function number mask for a device+function number. */
 #define VBOX_PCI_DEVFN_FUN_MASK     0x7
 /** The device number shift count for a device+function number. */
@@ -624 +624 @@
 #define VBOX_PCI_BUS_MASK           0xff
 /** Make a device+function number.   */
-#define VBOX_PCI_DEVFN_MAKE(a_uPciDevNo, a_uPciFunNo) (((a_uPciDevNo) << VBOX_PCI_DEVFN_DEV_SHIFT) | (a_uPciFunNo))
+#define VBOX_PCI_DEVFN_MAKE(a_uPciDevNo, a_uPciFunNo) (  ((a_uPciDevNo) << VBOX_PCI_DEVFN_DEV_SHIFT) \
+                                                       | ((a_uPciFunNo) & VBOX_PCI_DEVFN_FUN_MASK))
 
 /** Checks whether the PCIBDF is valid. */