[PATCH] int10: Delete #if 0'd implementation that's older than our git history.

Jeremy Huddleston jeremyhu at apple.com
Thu Sep 15 00:39:52 PDT 2011


Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On Sep 14, 2011, at 12:27 PM, Jamey Sharp wrote:

> Throughout the xserver git history, the generic portion of the int10
> module has always used other methods for reading the video BIOS. For
> some time now it's been purely libpciaccess based. This commented-out
> use of xf86ReadBIOS is entirely superfluous.
> 
> Signed-off-by: Jamey Sharp <jamey at minilop.net>
> ---
> hw/xfree86/int10/generic.c |   14 +-------------
> 1 files changed, 1 insertions(+), 13 deletions(-)
> 
> diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
> index fe8bb69..9940854 100644
> --- a/hw/xfree86/int10/generic.c
> +++ b/hw/xfree86/int10/generic.c
> @@ -128,10 +128,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
>     int screen;
>     legacyVGARec vga;
> 
> -#if 0
> -    CARD32 cs;
> -#endif
> -
>     screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
> 
>     options = xf86HandleInt10Options(xf86Screens[screen],entityIndex);
> @@ -174,17 +170,9 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
> 
>     /*
>      * Retrieve everything between V_BIOS and SYS_BIOS as some system BIOSes
> -     * have executable code there.  Note that xf86ReadBIOS() can only read in
> -     * 64kB at a time.
> +     * have executable code there.
>      */
>     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) <
> -		V_BIOS_SIZE)
> -	    xf86DrvMsg(screen, X_WARNING,
> -		       "Unable to retrieve all of segment 0x%06X.\n", cs);
> -#endif
>     INTPriv(pInt)->highMemory = V_BIOS;
> 
>     if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) {
> -- 
> 1.7.5.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 

---
Jeremy Huddleston

Rebuild Sudan
 - Board of Directors
 - http://www.rebuildsudan.org

Berkeley Foundation for Opportunities in Information Technology
 - Advisory Board
 - http://www.bfoit.org



More information about the xorg-devel mailing list