frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missed file from previous commit. 

Convert xf86ReadLegacyVideoBIOS to take a 'struct pci_device *'
parameter instead of a PCITAG.
This commit is contained in:
Ian Romanick 2007-01-12 09:56:00 -08:00
parent ca9c41e09d
commit c3016a2996
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/os-support/bus/linuxPci.c
View File

@ -593,18 +593,13 @@ xf86MapLegacyIO(struct pci_device *dev)
* The number of bytes read on success or -1 on failure. * The number of bytes read on success or -1 on failure.
*/ */
_X_EXPORT int _X_EXPORT int
xf86ReadLegacyVideoBIOS(PCITAG Tag, unsigned char *Buf) xf86ReadLegacyVideoBIOS(struct pci_device *dev, unsigned char *Buf)
{ {
const ADDRESS Base = V_BIOS; const ADDRESS Base = V_BIOS;
const int Len = V_BIOS_SIZE * 2; const int Len = V_BIOS_SIZE * 2;
const int pagemask = getpagesize() - 1; const int pagemask = getpagesize() - 1;
const ADDRESS offset = Base & ~pagemask; const ADDRESS offset = Base & ~pagemask;
const unsigned long size = ((Base + Len + pagemask) & ~pagemask) - offset; const unsigned long size = ((Base + Len + pagemask) & ~pagemask) - offset;
const struct pci_device * const dev =
pci_device_find_by_slot(PCI_DOM_FROM_TAG(Tag),
PCI_BUS_NO_DOM(PCI_BUS_FROM_TAG(Tag)),
PCI_DEV_FROM_TAG(Tag),
PCI_FUNC_FROM_TAG(Tag));
unsigned char *ptr, *src; unsigned char *ptr, *src;
int len; int len;
@ -615,7 +610,7 @@ xf86ReadLegacyVideoBIOS(PCITAG Tag, unsigned char *Buf)
return dev->rom_size; return dev->rom_size;
} }
ptr = xf86MapDomainMemory(-1, VIDMEM_READONLY, Tag, offset, size); ptr = xf86MapDomainMemory(-1, VIDMEM_READONLY, dev, offset, size);
if (!ptr) if (!ptr)
return -1; return -1;