diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-07-25 11:53:30 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-07-25 11:53:30 +0000 |
| commit | 38d8a113a9f15a10e66027a9baef5e02f6897364 (patch) | |
| tree | 6c1f7004e25060477e660f972bae90dc4945ee86 /sys/dev/syscons/syscons.c | |
| parent | 5d08f31126aaf5211661395a60c92389e04fc535 (diff) | |
Notes
Diffstat (limited to 'sys/dev/syscons/syscons.c')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index a2b843a31a63..6f901d0c9ef3 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $ + * $Id: syscons.c,v 1.226 1997/07/20 14:10:13 bde Exp $ */ #include "sc.h" @@ -119,10 +119,15 @@ static long scrn_time_stamp; u_char scr_map[256]; u_char scr_rmap[256]; char *video_mode_ptr = NULL; - int fonts_loaded = 0; + int fonts_loaded = 0 +#ifdef STD8X16FONT + | FONT_16 +#endif + ; + char font_8[256*8]; char font_14[256*14]; - char font_16[256*16]; +extern unsigned char font_16[256*16]; char palette[256*3]; static char vgaregs[64]; static char *cut_buffer; @@ -2696,8 +2701,12 @@ scinit(void) /* Save font and palette if VGA */ if (crtc_vga) { - copy_font(SAVE, FONT_16, font_16); - fonts_loaded = FONT_16; + if (fonts_loaded & FONT_16) { + copy_font(LOAD, FONT_16, font_16); + } else { + copy_font(SAVE, FONT_16, font_16); + fonts_loaded = FONT_16; + } save_palette(); set_destructive_cursor(console[0]); } |