hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +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

7
hw/xfree86/vgahw/vgaHW.c
View file

@ -1638,7 +1638,6 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
{
vgaRegPtr regp;
vgaHWPtr hwp;
struct pci_device * pvp;
int i;
/*
@ -1724,9 +1723,7 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
vgaHWSetStdFuncs(hwp);
hwp->PIOOffset = scrp->domainIOBase;
if ((pvp = xf86GetPciInfoForEntity(scrp->entityList[0])))
hwp->Tag = pciTag( PCI_MAKE_BUS( pvp->domain, pvp->bus ),
pvp->dev, pvp->func );
hwp->dev = xf86GetPciInfoForEntity(scrp->entityList[0]);
return TRUE;
}
@ -1778,7 +1775,7 @@ vgaHWMapMem(ScrnInfoPtr scrp)
#ifdef DEBUG
ErrorF("Mapping VGAMem\n");
#endif
hwp->Base = xf86MapDomainMemory(scr_index, VIDMEM_MMIO_32BIT, hwp->Tag,
hwp->Base = xf86MapDomainMemory(scr_index, VIDMEM_MMIO_32BIT, hwp->dev,
hwp->MapPhys, hwp->MapSize);
return hwp->Base != NULL;
}

2
hw/xfree86/vgahw/vgaHW.h
View file

@ -156,7 +156,7 @@ typedef struct _vgaHWRec {
= pioreg */
vgaHWReadProcPtr readEnable;
vgaHWWriteProcPtr writeEnable;
PCITAG Tag;
struct pci_device *dev;
} vgaHWRec;
/* Some macros that VGA drivers can use in their ChipProbe() function */