Re: scr_*() audit

[Olaf Hering <olh@suse.de>]

On Wed, Aug 22, Geert Uytterhoeven wrote:

> +				q++

typo :)

> diff -ur linux-2.4.8-ac9/drivers/video/hgafb.c scr-audit-2.4.8-ac9/drivers/video/hgafb.c
> --- linux-2.4.8-ac9/drivers/video/hgafb.c	Mon May 28 11:07:02 2001
> +++ scr-audit-2.4.8-ac9/drivers/video/hgafb.c	Wed Aug 22 18:48:32 2001
> @@ -203,7 +203,7 @@
>  		fillchar = 0x00;
>  	spin_unlock_irqrestore(&hga_reg_lock, flags);
>  	if (fillchar != 0xbf)
> -		memset((char *)hga_vram_base, fillchar, hga_vram_len);
> +		isa_memset_io((char *)hga_vram_base, fillchar, hga_vram_len);
>  }
>  
>  
> @@ -279,7 +279,8 @@
>  	char *logo = linux_logo_bw;
>  	for (y = 134; y < 134 + 80 ; y++) /* this needs some cleanup */
>  		for (x = 0; x < 10 ; x++)
> -			*(dest + (y%4)*8192 + (y>>2)*90 + x + 40) = ~*(logo++);
> +			isa_writeb(~*(logo++),
> +				   (dest + (y%4)*8192 + (y>>2)*90 + x + 40));
>  }

That expands to

static void hga_show_logo(void)
{
        int x, y;
        char *dest = (char *)hga_vram_base;
        char *logo = linux_logo_bw;
        for (y = 134; y < 134 + 80 ; y++)
                for (x = 0; x < 10 ; x++)
                        (*(volatile unsigned char *) ((void *)(  ((char
*)(((unsigned long)(0xC0000000) ) ))  + (
                                   (dest + (y%4)*8192 + (y>>2)*90 + x +
40) )  ))  = (  ~*(logo++)  ))  ;
}

drivers/video/hgafb.c: In function `hga_show_logo':
drivers/video/hgafb.c:297: invalid operands to binary +


I have no idea how to fix that...
its a 2.4.9 tree, but I think that makes no difference.


Gruss Olaf

-- 
 $ man clone

BUGS
       Main feature not yet implemented...