diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-01-11 21:09:20 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-01-11 21:09:20 -0800 |
| commit | ca9c41e09ddb72d150d86f5d372eb07eeca7c1a2 (patch) | |
| tree | 0df86da01666441c32db5fe429eb13093b489b2a /hw/xfree86/vgahw | |
| parent | da09964a931cc64d05ab571bf545fdad35a6d395 (diff) | |
Convert int10 and vgaHW to use 'struct pci_device' instead of PCITAG.
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.
Diffstat (limited to 'hw/xfree86/vgahw')
| -rw-r--r-- | hw/xfree86/vgahw/vgaHW.c | 7 | ||||
| -rw-r--r-- | hw/xfree86/vgahw/vgaHW.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 59fd92974..ccbd19574 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -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; } diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index ff7d1e5e0..a38ea7559 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -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 */ |