d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up code a bit to make it more readable.

Browse Source
This commit is contained in:
Jung-uk Kim 2010-11-30 16:46:15 +00:00
parent 84d8f5b8d0
commit fd7a9ebcca
1 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
sys/dev/syscons/scvidctl.c
View File

@ -150,34 +150,33 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
fontwidth = info.vi_cwidth; fontwidth = info.vi_cwidth;
if (fontsize <= 0) if (fontsize <= 0)
fontsize = info.vi_cheight; fontsize = info.vi_cheight;
if (fontsize < 14) { if (fontsize < 14)
fontsize = 8; fontsize = 8;
#ifndef SC_NO_FONT_LOADING else if (fontsize >= 16)
if (!(scp->sc->fonts_loaded & FONT_8))
return EINVAL;
font = scp->sc->font_8;
#else
font = NULL;
#endif
} else if (fontsize >= 16) {
fontsize = 16; fontsize = 16;
#ifndef SC_NO_FONT_LOADING else
if (!(scp->sc->fonts_loaded & FONT_16))
return EINVAL;
font = scp->sc->font_16;
#else
font = NULL;
#endif
} else {
fontsize = 14; fontsize = 14;
#ifndef SC_NO_FONT_LOADING #ifndef SC_NO_FONT_LOADING
if (!(scp->sc->fonts_loaded & FONT_14)) switch (fontsize) {
return EINVAL; case 8:
if ((scp->sc->fonts_loaded & FONT_8) == 0)
return (EINVAL);
font = scp->sc->font_8;
break;
case 14:
if ((scp->sc->fonts_loaded & FONT_14) == 0)
return (EINVAL);
font = scp->sc->font_14; font = scp->sc->font_14;
#else break;
font = NULL; case 16:
#endif if ((scp->sc->fonts_loaded & FONT_16) == 0)
return (EINVAL);
font = scp->sc->font_16;
break;
} }
#else
font = NULL;
#endif
if ((xsize <= 0) || (xsize > info.vi_width)) if ((xsize <= 0) || (xsize > info.vi_width))
xsize = info.vi_width; xsize = info.vi_width;
if ((ysize <= 0) || (ysize > info.vi_height)) if ((ysize <= 0) || (ysize > info.vi_height))
@ -333,34 +332,33 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
/* adjust argument values */ /* adjust argument values */
if (fontsize <= 0) if (fontsize <= 0)
fontsize = info.vi_cheight; fontsize = info.vi_cheight;
if (fontsize < 14) { if (fontsize < 14)
fontsize = 8; fontsize = 8;
#ifndef SC_NO_FONT_LOADING else if (fontsize >= 16)
if (!(scp->sc->fonts_loaded & FONT_8))
return EINVAL;
font = scp->sc->font_8;
#else
font = NULL;
#endif
} else if (fontsize >= 16) {
fontsize = 16; fontsize = 16;
#ifndef SC_NO_FONT_LOADING else
if (!(scp->sc->fonts_loaded & FONT_16))
return EINVAL;
font = scp->sc->font_16;
#else
font = NULL;
#endif
} else {
fontsize = 14; fontsize = 14;
#ifndef SC_NO_FONT_LOADING #ifndef SC_NO_FONT_LOADING
if (!(scp->sc->fonts_loaded & FONT_14)) switch (fontsize) {
return EINVAL; case 8:
if ((scp->sc->fonts_loaded & FONT_8) == 0)
return (EINVAL);
font = scp->sc->font_8;
break;
case 14:
if ((scp->sc->fonts_loaded & FONT_14) == 0)
return (EINVAL);
font = scp->sc->font_14; font = scp->sc->font_14;
#else break;
font = NULL; case 16:
#endif if ((scp->sc->fonts_loaded & FONT_16) == 0)
return (EINVAL);
font = scp->sc->font_16;
break;
} }
#else
font = NULL;
#endif
if (xsize <= 0) if (xsize <= 0)
xsize = info.vi_width/8; xsize = info.vi_width/8;
if (ysize <= 0) if (ysize <= 0)