diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-08-08 16:42:23 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-08-08 16:42:23 -0700 |
| commit | 9df53d903ed68073bf7d2c2a275b6f6556a85c0f (patch) | |
| tree | 271ea5b7d9e19e6ee2e2958057c43c96df192266 /hw/xfree86/int10 | |
| parent | 83ebf61ec03ff31005375900bee1e55e0e694c4b (diff) | |
Rename xf86ReadDomainMemory to xf86ReadLegacyVideoBIOS, since that's
what it is actually used for. Modify a few routines in linuxPci.c to
take pci_device structures as parameters in stead of PCITAGs.
Diffstat (limited to 'hw/xfree86/int10')
| -rw-r--r-- | hw/xfree86/int10/generic.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index eab2047ad..8f68ab43f 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -216,26 +216,15 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) setup_int_vect(pInt); set_return_trap(pInt); - /* - * Retrieve two segments: one at V_BIOS, the other 64kB beyond the first. - * This'll catch any BIOS that might have been initialised before server - * entry. + /* Retrieve the entire legacy video BIOS segment. This can be upto + * 128KiB. */ vbiosMem = (char *)base + V_BIOS; (void)memset(vbiosMem, 0, 2 * V_BIOS_SIZE); - if (xf86ReadDomainMemory(pInt->Tag, V_BIOS, V_BIOS_SIZE, vbiosMem) < - V_BIOS_SIZE) { + if (xf86ReadLegacyVideoBIOS(pInt->Tag, vbiosMem) < V_BIOS_SIZE) { xf86DrvMsg(screen, X_WARNING, "Unable to retrieve all of segment 0x0C0000.\n"); } - else if ((((unsigned char *)vbiosMem)[0] == 0x55) && - (((unsigned char *)vbiosMem)[1] == 0xAA) && - (((unsigned char *)vbiosMem)[2] > 0x80)) { - if (xf86ReadDomainMemory(pInt->Tag, V_BIOS + V_BIOS_SIZE, V_BIOS_SIZE, - (unsigned char *)vbiosMem + V_BIOS_SIZE) < V_BIOS_SIZE) - xf86DrvMsg(screen, X_WARNING, - "Unable to retrieve all of segment 0x0D0000.\n"); - } /* * If this adapter is the primary, use its post-init BIOS (if we can find |