Clear sti display on console attach, now that the bootloader leaves us

with scribbles around; ok mickey@

3 files changed, 12 insertions, 3 deletions

diff --git a/sys/arch/hp300/dev/sti_sgc.c b/sys/arch/hp300/dev/sti_sgc.c
index 83381be7e0d..56f86728dac 100644
--- a/sys/arch/hp300/dev/sti_sgc.c
+++ b/sys/arch/hp300/dev/sti_sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti_sgc.c,v 1.8 2006/04/20 20:26:52 deraadt Exp $	*/
+/*	$OpenBSD: sti_sgc.c,v 1.9 2006/08/22 21:04:31 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -182,6 +182,7 @@ sticninit()
 	base = (bus_addr_t)sgc_slottopa(CONSCODE_TO_SGC_SLOT(conscode));
 
 	sti_cnattach(&stifb_cn, iot, base, STI_CODEBASE_M68K);
+	sti_clear(&stifb_cn);
 
 	/*
 	 * Since the copyright notice could not be displayed before,
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index a6d00a3f0fa..7e6afa2e8b4 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti.c,v 1.43 2006/04/16 21:03:45 miod Exp $	*/
+/*	$OpenBSD: sti.c,v 1.44 2006/08/22 21:04:32 miod Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -1038,6 +1038,13 @@ sti_alloc_attr(v, fg, bg, flags, pattr)
  * Console support
  */
 
+void
+sti_clear(struct sti_screen *scr)
+{
+	sti_bmove(scr, 0, 0, 0, 0,
+	    scr->scr_cfg.scr_height, scr->scr_cfg.scr_width, bmf_clear);
+}
+
 int
 sti_cnattach(struct sti_screen *scr, bus_space_tag_t iot, bus_addr_t base,
     u_int codebase)
diff --git a/sys/dev/ic/stivar.h b/sys/dev/ic/stivar.h
index 30fae98c4f6..6f246d50af5 100644
--- a/sys/dev/ic/stivar.h
+++ b/sys/dev/ic/stivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stivar.h,v 1.18 2006/04/16 21:03:45 miod Exp $	*/
+/*	$OpenBSD: stivar.h,v 1.19 2006/08/22 21:04:32 miod Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -91,6 +91,7 @@ struct sti_softc {
 };
 
 void	sti_attach_common(struct sti_softc *sc, u_int codebase);
+void	sti_clear(struct sti_screen *);
 int	sti_cnattach(struct sti_screen *, bus_space_tag_t, bus_addr_t, u_int);
 void	sti_describe(struct sti_softc *);
 void	sti_end_attach(void *);