From 11afcc8f9f96d657b8e6f7547c02c1957331fc96 Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Thu, 6 Aug 1998 09:14:26 +0000
Subject: The daemon, snake and star savers should refuse to load if the
 current video mode is the VESA mode, because they cannot work properly under
 the VESA mode support as in the current form.

---
 sys/modules/syscons/daemon/daemon_saver.c | 5 ++++-
 sys/modules/syscons/snake/snake_saver.c   | 5 ++++-
 sys/modules/syscons/star/star_saver.c     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'sys/modules')

diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index d5583c8275197..f3cf3dce7736c 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.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: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -333,6 +333,9 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 1449ae3769792..c3fa1fe7ce382 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.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: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
+ *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -110,6 +110,9 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 15525cb838191..517a5579968f7 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.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: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
+ *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
  */
 
 #include <sys/param.h>
@@ -89,6 +89,9 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	return add_scrn_saver(star_saver);
 }
 
-- 
cgit v1.3