1 files changed, 56 insertions, 5 deletions

diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index 83496fa1f597..fb785346202d 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -1,5 +1,29 @@
 /*-
- * $Id: $
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer as
+ *    the first lines of this file unmodified.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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: splashreg.h,v 1.1 1999/01/09 02:44:49 yokota Exp $
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
@@ -9,13 +33,18 @@
 
 struct video_adapter;
 
-typedef struct splash_decoder {
+struct image_decoder {
 	char		*name;
-	int		(*init)(struct video_adapter *adp, void *data,
-				size_t size);
+	int		(*init)(struct video_adapter *adp);
 	int		(*term)(struct video_adapter *adp);
 	int		(*splash)(struct video_adapter *adp, int on);
-} splash_decoder_t;
+	char		*data_type;
+	void		*data;
+	size_t		data_size;
+};
+
+typedef struct image_decoder	splash_decoder_t;
+typedef struct image_decoder	scrn_saver_t;
 
 #define SPLASH_DECODER(name, sw)				\
 	static int name##_modevent(module_t mod, int type, void *data) \
@@ -25,6 +54,8 @@ typedef struct splash_decoder {
 			return splash_register(&sw);		\
 		case MOD_UNLOAD:				\
 			return splash_unregister(&sw);		\
+		default:					\
+			break;					\
 		}						\
 		return 0;					\
 	}							\
@@ -35,6 +66,26 @@ typedef struct splash_decoder {
 	};							\
 	DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_ANY)
 
+#define SAVER_MODULE(name, sw)					\
+	static int name##_modevent(module_t mod, int type, void *data) \
+	{							\
+		switch ((modeventtype_t)type) {			\
+		case MOD_LOAD:					\
+			return splash_register(&sw);		\
+		case MOD_UNLOAD:				\
+			return splash_unregister(&sw);		\
+		default:					\
+			break;					\
+		}						\
+		return 0;					\
+	}							\
+	static moduledata_t name##_mod = {			\
+		#name, 						\
+		name##_modevent,				\
+		NULL						\
+	};							\
+	DECLARE_MODULE(name, name##_mod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE)
+
 /* entry point for the splash image decoder */
 int	splash_register(splash_decoder_t *decoder);
 int	splash_unregister(splash_decoder_t *decoder);