diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-05-10 16:41:08 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2011-09-22 13:52:45 -0400 |
| commit | 8f2f08455d3b013b27c55d1f3b8fc8b3dc38f686 (patch) | |
| tree | 8917d57449c2b329721cb1ccbdb02bc445afbb0c | |
| parent | 26fb49e477140f491b35617141efcfd4eeb93c4f (diff) | |
pci: Remove the PCITAG type
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | hw/xfree86/int10/helper_exec.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/xf86Pci.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 8b52e882a..f74da4787 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -475,7 +475,7 @@ static struct pci_device* pci_device_for_cfg_address (CARD32 addr) { struct pci_device *dev = NULL; - PCITAG tag = PCI_TAG(addr); + CARD32 tag = PCI_TAG(addr); struct pci_slot_match slot_match = { .domain = PCI_DOM_FROM_TAG(tag), .bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)), diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index f1dbfc216..0362a00e3 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -126,12 +126,6 @@ #include "Pci.h" -PCITAG -pciTag(int busnum, int devnum, int funcnum) -{ - return(PCI_MAKE_TAG(busnum,devnum,funcnum)); -} - Bool xf86scanpci(void) { diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index 4f2f07e07..929dea262 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -235,7 +235,6 @@ /* Primitive Types */ typedef unsigned long ADDRESS; /* Memory/PCI address */ -typedef unsigned long PCITAG; typedef enum { PCI_MEM, @@ -250,7 +249,6 @@ typedef enum { /* Public PCI access functions */ -extern _X_EXPORT PCITAG pciTag(int busnum, int devnum, int funcnum); extern _X_EXPORT Bool xf86scanpci(void); /* Domain access functions. Some of these probably shouldn't be public */ |