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

[Jung-uk Kim]

Author: jkim
Date: Mon Nov 29 22:20:44 2010
New Revision: 216068
URL: http://svn.freebsd.org/changeset/base/216068

Log:
  Clean up code a bit to make it more readable.

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

Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c	Mon Nov 29 22:19:19 2010	(r216067)
+++ head/sys/dev/syscons/syscons.c	Mon Nov 29 22:20:44 2010	(r216068)
@@ -3119,27 +3119,18 @@ init_scp(sc_softc_t *sc, int vty, scr_st
 	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__