From 9402dfb01aa74ae54cb5d18b400473c2fcfc1403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Sat, 16 Jan 1999 10:20:16 +0000
Subject: [PATCH] Move the definition of set_origin from logo_saver.c to
 saver.h.

---
 sys/dev/syscons/logo/logo_saver.c     | 4 +---
 sys/modules/syscons/logo/logo_saver.c | 4 +---
 sys/modules/syscons/saver.h           | 4 +++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 105fcae16e8c..1db8dcc496b6 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_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: logo_saver.c,v 1.2 1999/01/01 14:40:49 des Exp $
+ *	$Id: logo_saver.c,v 1.3 1999/01/11 03:18:49 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -42,8 +42,6 @@ static int blanked;
 
 #include "logo.c"
 
-#define set_origin(adp, o) (*vidsw[(adp)->va_index]->set_win_org)(adp, o)
-
 static void
 logo_blit(video_adapter_t *adp, int x, int y)
 {
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index 105fcae16e8c..1db8dcc496b6 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_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: logo_saver.c,v 1.2 1999/01/01 14:40:49 des Exp $
+ *	$Id: logo_saver.c,v 1.3 1999/01/11 03:18:49 yokota Exp $
  */
 
 #include <sys/param.h>
@@ -42,8 +42,6 @@ static int blanked;
 
 #include "logo.c"
 
-#define set_origin(adp, o) (*vidsw[(adp)->va_index]->set_win_org)(adp, o)
-
 static void
 logo_blit(video_adapter_t *adp, int x, int y)
 {
diff --git a/sys/modules/syscons/saver.h b/sys/modules/syscons/saver.h
index 6e4c8f532a84..661b15acaba9 100644
--- a/sys/modules/syscons/saver.h
+++ b/sys/modules/syscons/saver.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: saver.h,v 1.14 1998/12/31 13:40:26 des Exp $
+ *	$Id: saver.h,v 1.15 1999/01/11 03:18:42 yokota Exp $
  */
 #include <machine/apm_bios.h>
 #include <machine/console.h>
@@ -43,6 +43,8 @@
 	}
 #define get_mode_info(adp, mode, buf)					\
 	(*vidsw[(adp)->va_index]->get_info)((adp), (mode), (buf))
+#define set_origin(adp, o)						\
+	(*vidsw[(adp)->va_index]->set_win_org)(adp, o)
 	
 extern scr_stat	*cur_console;
 extern char	scr_map[];