diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2010-11-29 22:20:44 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2010-11-29 22:20:44 +0000 |
| commit | 82515b4f1fc46f5d0fd55042f54c7432e2178219 (patch) | |
| tree | 1ebe37c68eb8271529e2d73ab15343f8bb3e0306 /sys/dev/syscons | |
| parent | 0cb06f72d5d79253450d23b72b42d869b339b52e (diff) | |
Notes
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index d2c3ba270f79..f005c8e9525c 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3119,27 +3119,18 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp) scp->ypixel = scp->ysize*info.vi_cheight; } - scp->font_size = info.vi_cheight; - scp->font_width = info.vi_cwidth; - if (info.vi_cheight < 14) { + scp->font_size = info.vi_cheight; + scp->font_width = info.vi_cwidth; #ifndef SC_NO_FONT_LOADING - scp->font = sc->font_8; -#else - scp->font = NULL; -#endif - } else if (info.vi_cheight >= 16) { -#ifndef SC_NO_FONT_LOADING - scp->font = sc->font_16; -#else - scp->font = NULL; -#endif - } else { -#ifndef SC_NO_FONT_LOADING - scp->font = sc->font_14; + if (info.vi_cheight < 14) + scp->font = sc->font_8; + else if (info.vi_cheight >= 16) + scp->font = sc->font_16; + else + scp->font = sc->font_14; #else - scp->font = NULL; + scp->font = NULL; #endif - } sc_vtb_init(&scp->vtb, VTB_MEMORY, 0, 0, NULL, FALSE); #ifndef __sparc64__ |