Re: [PATCH 37/66] i386/i386at/kd.c: simplify code

[Samuel Thibault]

Marin Ramesa, le Thu 05 Dec 2013 22:03:31 +0100, a écrit :
> Variable font_byte_width is always zero. Use this to simplify
> the code.

Ditto.

> * i386/i386at/kd.c (font_byte_width): Remove variable.
> (i, from): Remove variables.
> Remove for loop.
> * i386/i386at/kdsoft.h (font_byte_width): Remove declaration.
> 
> ---
>  i386/i386at/kd.c     | 7 -------
>  i386/i386at/kdsoft.h | 7 -------
>  2 files changed, 14 deletions(-)
> 
> diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
> index 1d0b84f..1a2d9fd 100644
> --- a/i386/i386at/kd.c
> +++ b/i386/i386at/kd.c
> @@ -350,7 +350,6 @@ u_char    char_white      = 0xff;
>  short        xstart          = 0;
>  short        ystart          = 0;
>  
> -short        font_byte_width = 0;            /* num bytes in 1 scan line of 
> font */
>  
>  /*
>   * Switch for poll vs. interrupt.
> @@ -2710,18 +2709,12 @@ csrpos_t pos;
>  char ch, chattr;
>  {
>       short xbit, ybit;               /* u/l corner of char pos */
> -     u_char *from;
> -     short i;
>  
>       if ((u_char)ch >= chars_in_font)
>               ch = K_QUES;
>  
>       bmpch2bit(pos, &xbit, &ybit);
>       bit2fbptr(xbit, ybit);
> -     from = font_start;
> -     for (i = 0; i < char_height; ++i) {
> -             from += font_byte_width;
> -     }
>  }
>  
>  /*
> diff --git a/i386/i386at/kdsoft.h b/i386/i386at/kdsoft.h
> index a9aba78..b370807 100644
> --- a/i386/i386at/kdsoft.h
> +++ b/i386/i386at/kdsoft.h
> @@ -198,11 +198,4 @@ extern u_char    char_white;             /* 8 white (on) 
> bits */
>  
>  extern short xstart, ystart;
>  
> -
> -/*
> - * Accelerators for bitmap displays.
> - */
> -
> -extern short font_byte_width;        /* num bytes in 1 scan line of font */
> -
>  #endif /* _KDSOFT_H_ */
> -- 
> 1.8.1.4
> 
> 

-- 
Samuel
<erno> hm. I've lost a machine.. literally _lost_. it responds to ping, it 
works completely, I just can't figure out where in my apartment it is.