diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/int10/generic.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/int10/generic.c')
| -rw-r--r-- | xorg-server/hw/xfree86/int10/generic.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/xorg-server/hw/xfree86/int10/generic.c b/xorg-server/hw/xfree86/int10/generic.c index a30dee103..0af7c1baa 100644 --- a/xorg-server/hw/xfree86/int10/generic.c +++ b/xorg-server/hw/xfree86/int10/generic.c @@ -176,7 +176,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) * have executable code there. Note that xf86ReadBIOS() can only read in * 64kB at a time. */ - (void)memset((char *)base + V_BIOS, 0, SYS_BIOS - V_BIOS); + memset((char *)base + V_BIOS, 0, SYS_BIOS - V_BIOS); #if 0 for (cs = V_BIOS; cs < SYS_BIOS; cs += V_BIOS_SIZE) if (xf86ReadBIOS(cs, 0, (unsigned char *)base + cs, V_BIOS_SIZE) < @@ -220,19 +220,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) INTPriv(pInt)->highMemory = GET_HIGH_BASE(rom_device->rom_size); break; } - case BUS_ISA: - vbiosMem = (unsigned char *)sysMem + bios_location; -#if 0 - (void)memset(vbiosMem, 0, V_BIOS_SIZE); - if (xf86ReadBIOS(bios_location, 0, vbiosMem, V_BIOS_SIZE) - < V_BIOS_SIZE) - xf86DrvMsg(screen, X_WARNING, - "Unable to retrieve all of segment 0x%x.\n",bios_location); -#endif - if (!int10_check_bios(screen, bios_location >> 4, vbiosMem)) { - xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (4)\n"); - goto error1; - } default: goto error1; } @@ -255,7 +242,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) * 128KiB. */ vbiosMem = (char *)base + V_BIOS; - (void)memset(vbiosMem, 0, 2 * V_BIOS_SIZE); + memset(vbiosMem, 0, 2 * V_BIOS_SIZE); if (read_legacy_video_BIOS(pInt->dev, vbiosMem) < V_BIOS_SIZE) { xf86DrvMsg(screen, X_WARNING, "Unable to retrieve all of segment 0x0C0000.\n"); |