diff options
Diffstat (limited to 'sys/arch/sparc/dev/cgfourteen.c')
| -rw-r--r-- | sys/arch/sparc/dev/cgfourteen.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c index 56073f72045..705d905a92d 100644 --- a/sys/arch/sparc/dev/cgfourteen.c +++ b/sys/arch/sparc/dev/cgfourteen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfourteen.c,v 1.26 2003/06/28 17:05:33 miod Exp $ */ +/* $OpenBSD: cgfourteen.c,v 1.27 2004/11/29 22:07:36 miod Exp $ */ /* $NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */ /* @@ -137,19 +137,6 @@ struct cgfourteen_softc { int sc_nscreens; }; -struct wsscreen_descr cgfourteen_stdscreen = { - "std", -}; - -const struct wsscreen_descr *cgfourteen_scrlist[] = { - &cgfourteen_stdscreen, -}; - -struct wsscreen_list cgfourteen_screenlist = { - sizeof(cgfourteen_scrlist) / sizeof(struct wsscreen_descr *), - cgfourteen_scrlist -}; - int cgfourteen_ioctl(void *, u_long, caddr_t, int, struct proc *); int cgfourteen_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); @@ -234,7 +221,6 @@ cgfourteenattach(parent, self, args) { struct cgfourteen_softc *sc = (struct cgfourteen_softc *)self; struct confargs *ca = args; - struct wsemuldisplaydev_attach_args waa; int node, i; u_int32_t *lut; int isconsole = 0; @@ -330,22 +316,12 @@ cgfourteenattach(parent, self, args) fbwscons_init(&sc->sc_sunfb, isconsole ? 0 : RI_CLEAR); fbwscons_setcolormap(&sc->sc_sunfb, cgfourteen_setcolor); - cgfourteen_stdscreen.capabilities = sc->sc_sunfb.sf_ro.ri_caps; - cgfourteen_stdscreen.nrows = sc->sc_sunfb.sf_ro.ri_rows; - cgfourteen_stdscreen.ncols = sc->sc_sunfb.sf_ro.ri_cols; - cgfourteen_stdscreen.textops = &sc->sc_sunfb.sf_ro.ri_ops; - if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, &cgfourteen_stdscreen, - -1, cgfourteen_burner); + fbwscons_console_init(&sc->sc_sunfb, -1, cgfourteen_burner); shutdownhook_establish(cgfourteen_prom, sc); } - waa.console = isconsole; - waa.scrdata = &cgfourteen_screenlist; - waa.accessops = &cgfourteen_accessops; - waa.accesscookie = sc; - config_found(self, &waa, wsemuldisplaydevprint); + fbwscons_attach(&sc->sc_sunfb, &cgfourteen_accessops, isconsole); } int |