diff options
Diffstat (limited to 'sys/arch/sparc/dev/cgthree.c')
| -rw-r--r-- | sys/arch/sparc/dev/cgthree.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c index 6f077420d4c..b49e79cf254 100644 --- a/sys/arch/sparc/dev/cgthree.c +++ b/sys/arch/sparc/dev/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.25 2004/09/29 07:35:11 miod Exp $ */ +/* $OpenBSD: cgthree.c,v 1.26 2004/11/29 22:07:36 miod Exp $ */ /* $NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */ /* @@ -116,19 +116,6 @@ struct cgthree_softc { int sc_nscreens; }; -struct wsscreen_descr cgthree_stdscreen = { - "std", -}; - -const struct wsscreen_descr *cgthree_scrlist[] = { - &cgthree_stdscreen, -}; - -struct wsscreen_list cgthree_screenlist = { - sizeof(cgthree_scrlist) / sizeof(struct wsscreen_descr *), - cgthree_scrlist -}; - int cgthree_ioctl(void *, u_long, caddr_t, int, struct proc *); int cgthree_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); @@ -220,7 +207,6 @@ cgthreeattach(parent, self, args) { struct cgthree_softc *sc = (struct cgthree_softc *)self; struct confargs *ca = args; - struct wsemuldisplaydev_attach_args waa; int node = 0, isrdi = 0, i; volatile struct bt_regs *bt; int isconsole = 0, sbus = 1; @@ -323,13 +309,8 @@ cgthreeattach(parent, self, args) (sc->sc_sunfb.sf_width >= 1024) ? 0 : RI_CLEAR); fbwscons_setcolormap(&sc->sc_sunfb, cgthree_setcolor); - cgthree_stdscreen.capabilities = sc->sc_sunfb.sf_ro.ri_caps; - cgthree_stdscreen.nrows = sc->sc_sunfb.sf_ro.ri_rows; - cgthree_stdscreen.ncols = sc->sc_sunfb.sf_ro.ri_cols; - cgthree_stdscreen.textops = &sc->sc_sunfb.sf_ro.ri_ops; - if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, &cgthree_stdscreen, + fbwscons_console_init(&sc->sc_sunfb, sc->sc_sunfb.sf_width >= 1024 ? -1 : 0, cgthree_burner); } @@ -338,11 +319,7 @@ cgthreeattach(parent, self, args) sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); #endif - waa.console = isconsole; - waa.scrdata = &cgthree_screenlist; - waa.accessops = &cgthree_accessops; - waa.accesscookie = sc; - config_found(self, &waa, wsemuldisplaydevprint); + fbwscons_attach(&sc->sc_sunfb, &cgthree_accessops, isconsole); } int |