diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-03-12 22:53:03 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-03-12 22:53:03 +0000 |
| commit | f59907c012f8920c4a611098e427b7cb0a054109 (patch) | |
| tree | a751b00e08aebfab1bccc7f9bd13059094806cac /sys/arch/hp300/dev | |
| parent | 1b5498f9605cca0b29b572f11c1a76f4882fb27b (diff) | |
Previous fix was half-done, move the wsscreen_list array into the softc
as well.
Diffstat (limited to 'sys/arch/hp300/dev')
| -rw-r--r-- | sys/arch/hp300/dev/diofb.c | 7 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/diofbvar.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hp300/dev/diofb.c b/sys/arch/hp300/dev/diofb.c index a408c05493d..c3159e5b9b5 100644 --- a/sys/arch/hp300/dev/diofb.c +++ b/sys/arch/hp300/dev/diofb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diofb.c,v 1.9 2006/03/12 22:22:39 miod Exp $ */ +/* $OpenBSD: diofb.c,v 1.10 2006/03/12 22:52:59 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -300,7 +300,6 @@ diofb_end_attach(void *sc, struct wsdisplay_accessops *accessops, struct diofb *fb, int console, const char *descr) { struct wsemuldisplaydev_attach_args waa; - struct wsscreen_descr *scrlist[1]; printf(": %dx%d", fb->dwidth, fb->dheight); @@ -313,9 +312,9 @@ diofb_end_attach(void *sc, struct wsdisplay_accessops *accessops, printf(" %s", descr); printf(" frame buffer\n"); - scrlist[0] = &fb->wsd; + fb->scrlist[0] = &fb->wsd; fb->wsl.nscreens = 1; - fb->wsl.screens = (const struct wsscreen_descr **)scrlist; + fb->wsl.screens = (const struct wsscreen_descr **)fb->scrlist; waa.console = console; waa.scrdata = &fb->wsl; diff --git a/sys/arch/hp300/dev/diofbvar.h b/sys/arch/hp300/dev/diofbvar.h index c3304ba24ee..e7a37ee1f38 100644 --- a/sys/arch/hp300/dev/diofbvar.h +++ b/sys/arch/hp300/dev/diofbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diofbvar.h,v 1.6 2006/03/12 22:22:39 miod Exp $ */ +/* $OpenBSD: diofbvar.h,v 1.7 2006/03/12 22:52:59 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -92,6 +92,7 @@ struct diofb { /* wsdisplay information */ struct wsscreen_descr wsd; struct wsscreen_list wsl; + struct wsscreen_descr *scrlist[1]; int nscreens; u_int mapmode; |