svn commit: r216082 - head/sys/dev/syscons

[Jung-uk Kim]

Author: jkim
Date: Tue Nov 30 17:34:15 2010
New Revision: 216082
URL: http://svn.freebsd.org/changeset/base/216082

Log:
  Rename a variable to match scvidctl.c.

Modified:
  head/sys/dev/syscons/syscons.c

Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c      Tue Nov 30 17:32:28 2010        
(r216081)
+++ head/sys/dev/syscons/syscons.c      Tue Nov 30 17:34:15 2010        
(r216082)
@@ -350,7 +350,7 @@ sc_set_vesa_mode(scr_stat *scp, sc_softc
        video_info_t info;
        u_char *font;
        int depth;
-       int font_size;
+       int fontsize;
        int i;
        int vmode;
 
@@ -380,18 +380,18 @@ sc_set_vesa_mode(scr_stat *scp, sc_softc
        }
 
 #if !defined(SC_NO_FONT_LOADING) && defined(SC_DFLT_FONT)
-       font_size = info.vi_cheight;
+       fontsize = info.vi_cheight;
 #else
-       font_size = scp->font_size;
+       fontsize = scp->font_size;
 #endif
-       if (font_size < 14)
-               font_size = 8;
-       else if (font_size >= 16)
-               font_size = 16;
+       if (fontsize < 14)
+               fontsize = 8;
+       else if (fontsize >= 16)
+               fontsize = 16;
        else
-               font_size = 14;
+               fontsize = 14;
 #ifndef SC_NO_FONT_LOADING
-       switch (font_size) {
+       switch (fontsize) {
        case 8:
                if ((sc->fonts_loaded & FONT_8) == 0)
                        return;
@@ -428,12 +428,12 @@ sc_set_vesa_mode(scr_stat *scp, sc_softc
        scp->xpixel = info.vi_width;
        scp->ypixel = info.vi_height;
        scp->xsize = scp->xpixel / 8;
-       scp->ysize = scp->ypixel / font_size;
+       scp->ysize = scp->ypixel / fontsize;
        scp->xpos = 0;
        scp->ypos = scp->ysize - 1;
        scp->xoff = scp->yoff = 0;
        scp->font = font;
-       scp->font_size = font_size;
+       scp->font_size = fontsize;
        scp->font_width = 8;
        scp->start = scp->xsize * scp->ysize - 1;
        scp->end = 0;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"