summaryrefslogtreecommitdiffstats
path: root/sys/dev/syscons
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2010-11-30 17:34:15 +0000
committerjkim <jkim@FreeBSD.org>2010-11-30 17:34:15 +0000
commit2864fd3ea87395a9c7f1b745c8a865cc28158bc7 (patch)
tree3f1aaab52a6cb9a0cb90cb744fab0ae8bc5fe55c /sys/dev/syscons
parentfcf43494490bbe116c8bcdfe4bb57000eca9e8a5 (diff)
downloadFreeBSD-src-2864fd3ea87395a9c7f1b745c8a865cc28158bc7.zip
FreeBSD-src-2864fd3ea87395a9c7f1b745c8a865cc28158bc7.tar.gz
Rename a variable to match scvidctl.c.
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r--sys/dev/syscons/syscons.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 2146aac..477f877 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -350,7 +350,7 @@ sc_set_vesa_mode(scr_stat *scp, sc_softc_t *sc, int unit)
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_t *sc, int unit)
}
#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_t *sc, int unit)
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;
OpenPOWER on IntegriCloud