frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Deprecate the use of xf86PciInfo.h 

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Tormod Volden <debian.tormod@gmail.com>
This commit is contained in:
Jeremy Huddleston 2011-10-30 20:26:42 -07:00
parent eb3377ffb8
commit 1f5baa924a
6 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86PciInfo.h
View File

@ -47,6 +47,8 @@
#ifndef _XF86_PCIINFO_H #ifndef _XF86_PCIINFO_H
#define _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 */ /* PCI Pseudo Vendor */
#define PCI_VENDOR_GENERIC 0x00FF #define PCI_VENDOR_GENERIC 0x00FF

1
hw/xfree86/common/xf86pciBus.c
View File

@ -49,6 +49,7 @@
#define XF86_OS_PRIVS #define XF86_OS_PRIVS
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#define PCI_VENDOR_GENERIC 0x00FF
/* Bus-specific globals */ /* Bus-specific globals */
Bool pciSlotClaimed = FALSE; Bool pciSlotClaimed = FALSE;

7
hw/xfree86/doc/ddxDesign.xml
View File

@ -3552,13 +3552,6 @@ The following include files are typically required by video drivers:
Note: in drivers, this must be included after <filename>"xf86_ansic.h"</filename>. Note: in drivers, this must be included after <filename>"xf86_ansic.h"</filename>.
</para> </para>
<para>
Drivers that need to access PCI vendor/device definitions need this:
<literallayout><filename>
"xf86PciInfo.h"
</filename></literallayout>
</para>
<para> <para>
Drivers that need to access the PCI config space need this: Drivers that need to access the PCI config space need this:
<literallayout><filename> <literallayout><filename>

1
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -9,7 +9,6 @@
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
/* pci stuff */ /* pci stuff */
#include "xf86PciInfo.h"
#include "xf86Pci.h" #include "xf86Pci.h"
#include "xf86cmap.h" #include "xf86cmap.h"

1
hw/xfree86/os-support/bus/Pci.h
View File

@ -108,7 +108,6 @@
#define _PCI_H 1 #define _PCI_H 1
#include "xf86Pci.h" #include "xf86Pci.h"
#include "xf86PciInfo.h"
/* /*
* Global Definitions * Global Definitions

1
hw/xfree86/sdksyms.sh
View File

@ -121,7 +121,6 @@ cat > sdksyms.c << EOF
#include "xf86Module.h" #include "xf86Module.h"
#include "xf86Opt.h" #include "xf86Opt.h"
#ifdef XSERVER_LIBPCIACCESS #ifdef XSERVER_LIBPCIACCESS
#include "xf86PciInfo.h"
#include "xf86VGAarbiter.h" #include "xf86VGAarbiter.h"
#endif #endif
#include "xf86Priv.h" #include "xf86Priv.h"