2 files changed, 19 insertions, 6 deletions

diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 46f0343d0edd..5b7902a1bd53 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -23,7 +23,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: fbreg.h,v 1.1 1999/01/09 02:44:49 yokota Exp $
+ * $Id: fbreg.h,v 1.3 1999/04/12 13:34:56 des Exp $
  */
 
 #ifndef _DEV_FB_FBREG_H_
@@ -99,6 +99,23 @@ typedef struct video_switch {
     vi_diag_t		*diag;
 } video_switch_t;
 
+#define save_palette(adp, pal)				\
+	(*vidsw[(adp)->va_index]->save_palette)((adp), (pal))
+#define load_palette(adp, pal)				\
+	(*vidsw[(adp)->va_index]->load_palette)((adp), (pal))
+#define get_mode_info(adp, mode, buf)			\
+	(*vidsw[(adp)->va_index]->get_info)((adp), (mode), (buf))
+#define set_video_mode(adp, mode)			\
+	(*vidsw[(adp)->va_index]->set_mode)((adp), (mode))
+#if 0 /* XXX conflicts with syscons' set_border() */
+#define set_border(adp, border)				\
+	(*vidsw[(adp)->va_index]->set_border)((adp), (border))
+#endif
+#define set_origin(adp, o)				\
+	(*vidsw[(adp)->va_index]->set_win_org)(adp, o)
+
+/* XXX - add more macros */
+
 /* video driver */
 typedef struct video_driver {
     char		*name;
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 1a88a8c7b5ae..d73834fc8772 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -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: syscons.h,v 1.45 1999/01/11 03:18:29 yokota Exp $
+ *	$Id: syscons.h,v 1.47 1999/04/12 13:34:56 des Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
@@ -215,10 +215,6 @@ scr_stat *sc_get_scr_stat(dev_t dev);
 
 void copy_font(scr_stat *scp, int operation, int font_size, u_char *font_image);
 void set_border(scr_stat *scp, int color);
-#define save_palette(adp, pal)				\
-	(*vidsw[(adp)->va_index]->save_palette)((adp), (pal))
-#define load_palette(adp, pal)				\
-	(*vidsw[(adp)->va_index]->load_palette)((adp), (pal))
 
 void sc_touch_scrn_saver(void);
 void sc_clear_screen(scr_stat *scp);