hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-01 03:03:58 +00:00
Code Issues Projects Releases Wiki Activity

Convert int10 and vgaHW to use 'struct pci_device' instead of PCITAG.

Browse source 
Convert all uses of PCITAG in int10 and vgaHW to 'struct pci_device'.
This allows the conversion of xf86ReadLegacyVideoBIOS and
xf86MapDomainMemory to 'struct pci_device' from PCITAG.
This commit is contained in:
Ian Romanick 2007-01-11 21:09:20 -08:00
commit ca9c41e09d
9 changed files with 21 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/xfree86/os-support/bus/Pci.c
View file

@ -319,7 +319,7 @@ xf86GetPciDomain(PCITAG Tag)
}
_X_EXPORT pointer
xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev,
ADDRESS Base, unsigned long Size)
{
return xf86MapVidMem(ScreenNum, Flags, Base, Size);
@ -333,7 +333,7 @@ xf86MapLegacyIO(struct pci_device *dev)
}
_X_EXPORT int
xf86ReadLegacyVideoBIOS(PCITAG Tag, unsigned char *Buf)
xf86ReadLegacyVideoBIOS(struct pci_device *dev, unsigned char *Buf)
{
const unsigned Len = (2 * 0x10000);
ADDRESS Base = 0xC0000;

4
hw/xfree86/os-support/bus/linuxPci.c
View file

@ -513,11 +513,9 @@ linuxOpenLegacy(struct pci_device *dev, char *name)
* the legacy ISA memory space (memory in a domain between 0 and 1MB).
*/
_X_EXPORT pointer
xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev,
ADDRESS Base, unsigned long Size)
{
int domain = xf86GetPciDomain(Tag);
const struct pci_device *dev = xf86GetPciHostConfigFromTag(Tag);
int fd = -1;
pointer addr;

6
hw/xfree86/os-support/bus/xf86Pci.h
View file

@ -260,9 +260,9 @@ extern int pciNumBuses;
/* Domain access functions. Some of these probably shouldn't be public */
int xf86GetPciDomain(PCITAG tag);
pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
ADDRESS Base, unsigned long Size);
pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev,
ADDRESS Base, unsigned long Size);
IOADDRESS xf86MapLegacyIO(struct pci_device *dev);
int xf86ReadLegacyVideoBIOS(PCITAG Tag, unsigned char *Buf);
int xf86ReadLegacyVideoBIOS(struct pci_device *dev, unsigned char *Buf);
#endif /* _XF86PCI_H */