5 files changed, 36 insertions, 21 deletions

diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 226d7d31221e..83a03866a5ef 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_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: blank_saver.c,v 1.3 1995/10/28 12:35:09 peter Exp $
+ *	$Id: blank_saver.c,v 1.4 1995/11/13 07:18:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -37,10 +37,10 @@
 #include <sys/errno.h>
 #include <saver.h>
 
-MOD_MISC("blank_saver")
+MOD_MISC(blank_saver);
 
-void (*current_saver)();
-void (*old_saver)();
+void (*current_saver)(int blank);
+void (*old_saver)(int blank);
 
 static void
 blank_saver(int blank)
@@ -58,6 +58,7 @@ blank_saver(int blank)
 	}
 }
 
+static int
 blank_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -67,6 +68,7 @@ blank_saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+static int
 blank_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -75,6 +77,7 @@ blank_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+int
 blank_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, blank_saver_load, blank_saver_unload,
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 9dc522598a41..c7b4f417d7c3 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_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: fade_saver.c,v 1.3 1995/10/28 12:35:10 peter Exp $
+ *	$Id: fade_saver.c,v 1.4 1995/11/13 07:18:48 bde Exp $
  */
 
 #include <sys/param.h>
@@ -37,10 +37,10 @@
 #include <sys/errno.h>
 #include <saver.h>
 
-MOD_MISC("fade_saver")
+MOD_MISC(fade_saver);
 
-void (*current_saver)();
-void (*old_saver)();
+void (*current_saver)(int blank);
+void (*old_saver)(int blank);
 
 static void
 fade_saver(int blank)
@@ -73,6 +73,7 @@ fade_saver(int blank)
 	}
 }
 
+static int
 fade_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -82,6 +83,7 @@ fade_saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+static int
 fade_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -90,6 +92,7 @@ fade_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+int
 fade_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, fade_saver_load, fade_saver_unload,
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index b52e8ad7ae04..17716e9ffa22 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_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: green_saver.c,v 1.3 1995/10/28 12:35:11 peter Exp $
+ *	$Id: green_saver.c,v 1.4 1995/11/13 07:18:58 bde Exp $
  */
 
 #include <sys/param.h>
@@ -37,10 +37,10 @@
 #include <sys/errno.h>
 #include <saver.h>
 
-MOD_MISC("green_saver")
+MOD_MISC(green_saver);
 
-void (*current_saver)();
-void (*old_saver)();
+void (*current_saver)(int blank);
+void (*old_saver)(int blank);
 
 static void
 green_saver(int blank)
@@ -62,6 +62,7 @@ green_saver(int blank)
 	}
 }
 
+static int
 green_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -71,6 +72,7 @@ green_saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+static int
 green_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -79,6 +81,7 @@ green_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+int
 green_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, green_saver_load, green_saver_unload,
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index d8ae95a95fc6..b48ea8e05f90 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/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.6 1995/10/28 12:35:12 peter Exp $
+ *	$Id: snake_saver.c,v 1.7 1995/11/13 07:19:03 bde Exp $
  */
 
 #include <sys/param.h>
@@ -37,10 +37,10 @@
 #include <sys/errno.h>
 #include <saver.h>
 
-MOD_MISC("snake_saver")
+MOD_MISC(snake_saver);
 
-void (*current_saver)();
-void (*old_saver)();
+void (*current_saver)(int blank);
+void (*old_saver)(int blank);
 
 static void
 snake_saver(int blank)
@@ -99,6 +99,7 @@ snake_saver(int blank)
 	}
 }
 
+static int
 snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -108,6 +109,7 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+static int
 snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -116,6 +118,7 @@ snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+int
 snake_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, snake_saver_load, snake_saver_unload,
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 6090f3e30bce..d96b453f8839 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/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.4 1995/10/28 12:35:14 peter Exp $
+ *	$Id: star_saver.c,v 1.5 1995/11/13 07:19:10 bde Exp $
  */
 
 #include <sys/param.h>
@@ -37,10 +37,10 @@
 #include <sys/errno.h>
 #include <saver.h>
 
-MOD_MISC("star_saver")
+MOD_MISC(star_saver);
 
-void (*current_saver)();
-void (*old_saver)();
+void (*current_saver)(int blank);
+void (*old_saver)(int blank);
 
 #define NUM_STARS	50
 
@@ -48,7 +48,7 @@ void (*old_saver)();
  * Alternate saver that got its inspiration from a well known utility
  * package for an inferior^H^H^H^H^H^Hfamous OS.
  */
-void
+static void
 star_saver(int blank)
 {
 	scr_stat	*scp = cur_console;
@@ -89,6 +89,7 @@ star_saver(int blank)
 	}
 }
 
+static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -98,6 +99,7 @@ star_saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+static int
 star_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
@@ -106,6 +108,7 @@ star_saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
+int
 star_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, star_saver_load, star_saver_unload,