diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 10:44:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 10:44:43 +0200 |
| commit | 9f986778bd4393c5a9108426969d45aa7f10f334 (patch) | |
| tree | 27d7bd08dac54a54a923e76dccf2b8e388be2a03 /xorg-server/hw/xfree86/os-support/bus/xf86Pci.h | |
| parent | afbd3947071a33f59dda122f1ac396442a02c128 (diff) | |
| download | vcxsrv-9f986778bd4393c5a9108426969d45aa7f10f334.tar.gz vcxsrv-9f986778bd4393c5a9108426969d45aa7f10f334.tar.bz2 vcxsrv-9f986778bd4393c5a9108426969d45aa7f10f334.zip | |
libX11 libXext libXft mesa libxcb mkfontscale pixman xserver
xkeyboard-config git update 19 oct 2011
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/bus/xf86Pci.h')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/bus/xf86Pci.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h b/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h index ce1336bf2..74ead201e 100644 --- a/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h +++ b/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h @@ -235,8 +235,8 @@ /* Primitive Types */ typedef unsigned long ADDRESS; /* Memory/PCI address */ -typedef unsigned long IOADDRESS; /* Must be large enough for a pointer */ -typedef unsigned long PCITAG; +typedef unsigned long IOADDRESS _X_DEPRECATED; /* Must be large enough for a pointer */ +typedef CARD32 PCITAG _X_DEPRECATED; typedef enum { PCI_MEM, @@ -251,12 +251,10 @@ 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 */ -extern _X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev, - ADDRESS Base, unsigned long Size); -extern _X_EXPORT IOADDRESS xf86MapLegacyIO(struct pci_device *dev); +extern _X_EXPORT struct pci_io_handle *xf86MapLegacyIO(struct pci_device *dev); +extern _X_EXPORT void xf86UnmapLegacyIO(struct pci_device *, struct pci_io_handle *); #endif /* _XF86PCI_H */ |