From ce834215a70ff69e7e222827437116eee2f9ac6f Mon Sep 17 00:00:00 2001
From: Kazutaka YOKOTA <yokota@FreeBSD.org>
Date: Tue, 15 Jul 1997 14:49:39 +0000
Subject: Incorporated lots of fixes and suggestions from Bruce and changes to
 facilitate the new saver loading/unloading notification interface in syscons.

daemon_saver:
- M_NOWAIT was wrong, since NULL returns are not handled.  Just use
  M_WAITOK.
- use `ostype' instead of hard-coded "FreeBSD". Now there is no more
  hard-coded string! (But, who will run this screen saver on other
  OS?!)
- put macros and data declarations in a consistent order.
- -DDEAMON_ONLY and -DSHOW_HOSTNAME options added in the previous commit
  are removed. Options of this kind can go stale and no one notices
  because no one uses them. DEAMON_ONLY is just removed. SHOW_HOSTNAME
  is made default.

snake_saver:
- use `ostype' and `osrelease' as in the daemon saver. The string changes
  slightly - there was a hyphen after "FreeBSD"; now there is a space.
  (It is consistent with uname -a, like the daemon server already is.)

all screen savers:
- Use the new add_scrn_saver()/remove_scrn_saver() in syscons.c
  to declare loading/unloading of a screen saver. Removed reference
  to `current_saver' and the variable `old_saver' as they are not
  necessary anymore.
- The blank, fade and green screen savers manipulate VGA registers.
  Module loading should fail for non-VGA cards.
- `scrn_blanked' is consistently treated as a number/counter rather
  than boolean.
- Some savers touch `scp->start' and `scp->end' to force entire screen
  update when stopping themselves. This is unnecessary now because
  syscons.c takes care of that.
- cleared up many unused or unnecessary #include statements.
- Removed -DLKM from Makefiles.

YOU NEED TO RECOMPILE BOTH SCREEN SAVERS AND KERNEL AS OF THIS CHANGE.
---
 sys/dev/syscons/star/star_saver.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'sys/dev/syscons/star')

diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 465c493a3dcf2..d025b16afdba9 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,26 +25,22 @@
  * (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.10 1997/02/22 12:49:22 peter Exp $
+ *	$Id: star_saver.c,v 1.11 1997/04/06 11:07:01 dufault Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
-#include <sys/errno.h>
 
 #include <machine/md_var.h>
+#include <i386/include/pc/display.h>
 
-#include "saver.h"
+#include <saver.h>
 
 MOD_MISC(star_saver);
 
-void (*current_saver)(int blank);
-void (*old_saver)(int blank);
-
 #define NUM_STARS	50
 
 /*
@@ -62,7 +58,7 @@ star_saver(int blank)
 	static u_short 	stars[NUM_STARS][2];
 
 	if (blank) {
-		if (!scrn_blanked) {
+		if (scrn_blanked <= 0) {
 			scrn_blanked = 1;
 			fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat,
 			      scp->xsize * scp->ysize);
@@ -83,11 +79,9 @@ star_saver(int blank)
 		}
 	}
 	else {
-		if (scrn_blanked) {
+		if (scrn_blanked > 0) {
 			set_border(scp->border);
 			scrn_blanked = 0;
-			scp->start = 0;
-			scp->end = scp->xsize * scp->ysize;
 		}
 	}
 }
@@ -95,18 +89,13 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	old_saver = current_saver;
-	current_saver = star_saver;
-	return 0;
+	return add_scrn_saver(star_saver);
 }
 
 static int
 star_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
-	(*current_saver)(0);
-	current_saver = old_saver;
-	return 0;
+	return remove_scrn_saver(star_saver);
 }
 
 int
-- 
cgit v1.3