From acdf858c9b85df29f3deb661cedf06e68c6ea1bd Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Thu, 20 Jan 2000 13:21:47 +0000
Subject: [PATCH] Fix wrong usage of FONT_NONE. It was not meant to be set in
scp->font_size in the first place. It is redundant now and is removed.
Found by: bde
---
sys/dev/syscons/scmouse.c | 2 +-
sys/dev/syscons/scvidctl.c | 4 ++--
sys/dev/syscons/syscons.c | 2 +-
sys/dev/syscons/syscons.h | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index e55946c0211d..961c00f51fe0 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -879,7 +879,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
s = spltty();
sc_remove_all_mouse(scp->sc);
#ifndef SC_NO_FONT_LOADING
- if (ISTEXTSC(cur_scp) && (cur_scp->font_size != FONT_NONE))
+ if (ISTEXTSC(cur_scp) && (cur_scp->font != NULL))
sc_load_font(cur_scp, 0, cur_scp->font_size, cur_scp->font,
cur_scp->sc->mouse_char, 4);
#endif
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 3c03ee573f86..686a3c4f8f83 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -273,7 +273,7 @@ sc_set_graphics_mode(scr_stat *scp, struct tty *tp, int mode)
scp->xpixel = info.vi_width;
scp->ypixel = info.vi_height;
scp->font = NULL;
- scp->font_size = FONT_NONE;
+ scp->font_size = 0;
#ifndef SC_NO_SYSMOUSE
/* move the mouse cursor at the center of the screen */
sc_mouse_move(scp, scp->xpixel / 2, scp->ypixel / 2);
@@ -316,7 +316,7 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize,
return ENODEV; /* this shouldn't happen */
/* adjust argument values */
- if ((fontsize <= 0) || (fontsize == FONT_NONE))
+ if (fontsize <= 0)
fontsize = info.vi_cheight;
if (fontsize < 14) {
fontsize = 8;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 6d46128a4efb..351c33eda483 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -2802,7 +2802,7 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp)
scp->ypixel = info.vi_height;
scp->xsize = info.vi_width/8;
scp->ysize = info.vi_height/info.vi_cheight;
- scp->font_size = FONT_NONE;
+ scp->font_size = 0;
scp->font = NULL;
} else {
scp->xsize = info.vi_width;
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index de4c3e15107c..7b0a98763215 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -196,7 +196,6 @@ typedef struct sc_softc {
#ifndef SC_NO_FONT_LOADING
int fonts_loaded;
-#define FONT_NONE 1
#define FONT_8 2
#define FONT_14 4
#define FONT_16 8