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

pci: Deprecate the PCITAG type 

It is kept around to help drivers through the API transition and will be
removed at some point in the future.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Adam Jackson 2011-05-10 16:41:08 -04:00 committed by Jeremy Huddleston
parent a248fa3a33
commit 492ed3e53b
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/int10/helper_exec.c
View File

@ -475,7 +475,7 @@ static struct pci_device*
pci_device_for_cfg_address (CARD32 addr) pci_device_for_cfg_address (CARD32 addr)
{ {
struct pci_device *dev = NULL; struct pci_device *dev = NULL;
PCITAG tag = PCI_TAG(addr); CARD32 tag = PCI_TAG(addr);
struct pci_slot_match slot_match = { struct pci_slot_match slot_match = {
.domain = PCI_DOM_FROM_TAG(tag), .domain = PCI_DOM_FROM_TAG(tag),
.bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)), .bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)),

6
hw/xfree86/os-support/bus/Pci.c
View File

@ -126,12 +126,6 @@
#include "Pci.h" #include "Pci.h"
PCITAG
pciTag(int busnum, int devnum, int funcnum)
{
return(PCI_MAKE_TAG(busnum,devnum,funcnum));
}
Bool Bool
xf86scanpci(void) xf86scanpci(void)
{ {

3
hw/xfree86/os-support/bus/xf86Pci.h
View File

@ -236,7 +236,7 @@
/* Primitive Types */ /* Primitive Types */
typedef unsigned long ADDRESS; /* Memory/PCI address */ typedef unsigned long ADDRESS; /* Memory/PCI address */
typedef unsigned long IOADDRESS _X_DEPRECATED; /* Must be large enough for a pointer */ typedef unsigned long IOADDRESS _X_DEPRECATED; /* Must be large enough for a pointer */
typedef unsigned long PCITAG; typedef CARD32 PCITAG _X_DEPRECATED;
typedef enum { typedef enum {
PCI_MEM, PCI_MEM,
@ -251,7 +251,6 @@ typedef enum {
/* Public PCI access functions */ /* Public PCI access functions */
extern _X_EXPORT PCITAG pciTag(int busnum, int devnum, int funcnum);
extern _X_EXPORT Bool xf86scanpci(void); extern _X_EXPORT Bool xf86scanpci(void);
/* Domain access functions. Some of these probably shouldn't be public */ /* Domain access functions. Some of these probably shouldn't be public */