diff options
Diffstat (limited to 'sys/arch/sparc/dev/p9000.c')
| -rw-r--r-- | sys/arch/sparc/dev/p9000.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c index 9aecf26c0db..a61fe87e483 100644 --- a/sys/arch/sparc/dev/p9000.c +++ b/sys/arch/sparc/dev/p9000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9000.c,v 1.9 2004/09/29 07:35:11 miod Exp $ */ +/* $OpenBSD: p9000.c,v 1.10 2004/11/29 22:07:37 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -80,19 +80,6 @@ struct p9000_softc { u_int32_t sc_junk; /* throwaway value */ }; -struct wsscreen_descr p9000_stdscreen = { - "std", -}; - -const struct wsscreen_descr *p9000_scrlist[] = { - &p9000_stdscreen, -}; - -struct wsscreen_list p9000_screenlist = { - sizeof(p9000_scrlist) / sizeof(struct wsscreen_descr *), - p9000_scrlist -}; - int p9000_ioctl(void *, u_long, caddr_t, int, struct proc *); int p9000_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); @@ -204,7 +191,6 @@ p9000attach(struct device *parent, struct device *self, void *args) { struct p9000_softc *sc = (struct p9000_softc *)self; struct confargs *ca = args; - struct wsemuldisplaydev_attach_args waa; int node, row, isconsole, scr; struct device *btdev; extern struct cfdriver btcham_cd; @@ -284,11 +270,6 @@ p9000attach(struct device *parent, struct device *self, void *args) */ p9000_ras_init(sc); - p9000_stdscreen.capabilities = sc->sc_sunfb.sf_ro.ri_caps; - p9000_stdscreen.nrows = sc->sc_sunfb.sf_ro.ri_rows; - p9000_stdscreen.ncols = sc->sc_sunfb.sf_ro.ri_cols; - p9000_stdscreen.textops = &sc->sc_sunfb.sf_ro.ri_ops; - sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); /* enable video */ @@ -300,15 +281,10 @@ p9000attach(struct device *parent, struct device *self, void *args) else row = -1; - fbwscons_console_init(&sc->sc_sunfb, &p9000_stdscreen, row, - p9000_burner); + fbwscons_console_init(&sc->sc_sunfb, row, p9000_burner); } - waa.console = isconsole; - waa.scrdata = &p9000_screenlist; - waa.accessops = &p9000_accessops; - waa.accesscookie = sc; - config_found(self, &waa, wsemuldisplaydevprint); + fbwscons_attach(&sc->sc_sunfb, &p9000_accessops, isconsole); } int |