summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-05-24 17:42:30 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-05-24 17:42:30 +0000
commit999ad6ac1fb3ab689e3e3d8269b1e95d844f444d (patch)
tree0d2299b22302c10780c25210c8ba65b4e37bcfee /sys/dev
parent064081e02b2779e366c4db7c8de52a5713772e22 (diff)
Disable off-screen font loading. We still need to use the pdc console routines
before we switch to wsdisplay, and this can clobber the font image in some cases, especially lower (<= 1024x768) resolutions.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/sti.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index a3c1d81e4d8..288fef8e885 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sti.c,v 1.24 2003/04/03 23:09:36 mickey Exp $ */
+/* $OpenBSD: sti.c,v 1.25 2003/05/24 17:42:29 miod Exp $ */
/*
* Copyright (c) 2000-2003 Michael Shalayeff
@@ -374,12 +374,15 @@ int
sti_fetchfonts(struct sti_softc *sc, struct sti_inqconfout *cfg, u_int32_t addr)
{
struct sti_font *fp = &sc->sc_curfont;
- int uc, size;
+ int size;
+#ifdef notyet
+ int uc;
struct {
struct sti_unpmvflags flags;
struct sti_unpmvin in;
struct sti_unpmvout out;
} a;
+#endif
/*
* Get the first PROM font in memory
@@ -423,6 +426,7 @@ sti_fetchfonts(struct sti_softc *sc, struct sti_inqconfout *cfg, u_int32_t addr)
addr = NULL; /* fp->next */
} while (addr);
+#ifdef notyet
/*
* If there is enough room in the off-screen framebuffer memory,
* display all the characters there in order to display them
@@ -456,6 +460,7 @@ sti_fetchfonts(struct sti_softc *sc, struct sti_inqconfout *cfg, u_int32_t addr)
free(sc->sc_romfont, M_DEVBUF);
sc->sc_romfont = NULL;
}
+#endif
return (0);
}