Re: scr_*() audit

From: Olaf Hering (olh@suse.de)
Date: Thu Aug 23 2001 - 16:11:43 EST


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... - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Aug 23 2001 - 21:01:02 EST