diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-30 20:26:42 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-18 11:26:02 -0800 |
| commit | 1f5baa924a5907978f564372265d9830ac72a077 (patch) | |
| tree | 0334a929ce2a8a3aa7fdba41dd562778413b5235 | |
| parent | eb3377ffb8a7baa26c9831e56ed782d48b28fa71 (diff) | |
xfree86: Deprecate the use of xf86PciInfo.h
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Tormod Volden <debian.tormod@gmail.com>
| -rw-r--r-- | hw/xfree86/common/xf86PciInfo.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86pciBus.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/doc/ddxDesign.xml | 7 | ||||
| -rw-r--r-- | hw/xfree86/fbdevhw/fbdevhw.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 1 | ||||
| -rwxr-xr-x | hw/xfree86/sdksyms.sh | 1 |
6 files changed, 3 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index 356c7db4d..e2d78627b 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -47,6 +47,8 @@ #ifndef _XF86_PCIINFO_H #define _XF86_PCIINFO_H +#warning "xf86PciInfo.h is deprecated. For greater compatibility, drivers should include necessary PCI IDs locally rather than relying on this file from xorg-server." + /* PCI Pseudo Vendor */ #define PCI_VENDOR_GENERIC 0x00FF diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index bc09bd20c..87dc02512 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -49,6 +49,7 @@ #define XF86_OS_PRIVS #include "xf86_OSproc.h" +#define PCI_VENDOR_GENERIC 0x00FF /* Bus-specific globals */ Bool pciSlotClaimed = FALSE; diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index 0d5e952a2..c406cd744 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -3553,13 +3553,6 @@ The following include files are typically required by video drivers: </para> <para> - Drivers that need to access PCI vendor/device definitions need this: - <literallayout><filename> - "xf86PciInfo.h" - </filename></literallayout> - </para> - - <para> Drivers that need to access the PCI config space need this: <literallayout><filename> "xf86Pci.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index dee731be4..30a2a9133 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -9,7 +9,6 @@ #include "xf86_OSproc.h" /* pci stuff */ -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86cmap.h" diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 88560ecdc..5709bd841 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -108,7 +108,6 @@ #define _PCI_H 1 #include "xf86Pci.h" -#include "xf86PciInfo.h" /* * Global Definitions diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index b8e7023f3..4a4e1f64d 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -121,7 +121,6 @@ cat > sdksyms.c << EOF #include "xf86Module.h" #include "xf86Opt.h" #ifdef XSERVER_LIBPCIACCESS - #include "xf86PciInfo.h" #include "xf86VGAarbiter.h" #endif #include "xf86Priv.h" |