diff options
| -rw-r--r-- | share/man/man4/wsdisplay.4 | 16 | ||||
| -rw-r--r-- | sys/dev/wscons/files.wscons | 3 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 31 |
3 files changed, 5 insertions, 45 deletions
diff --git a/share/man/man4/wsdisplay.4 b/share/man/man4/wsdisplay.4 index b3eb44fef1f..46f31932864 100644 --- a/share/man/man4/wsdisplay.4 +++ b/share/man/man4/wsdisplay.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: wsdisplay.4,v 1.33 2005/05/15 19:36:21 miod Exp $ +.\" $OpenBSD: wsdisplay.4,v 1.34 2005/06/02 07:34:12 miod Exp $ .\" $NetBSD: wsdisplay.4,v 1.5 2000/05/13 15:22:19 mycroft Exp $ .\" .\" Copyright (c) 2005, Miodrag Vallat. @@ -82,17 +82,13 @@ framework. It attaches to the hardware specific display device driver and makes it available as text terminal or graphics interface. .Pp -A display device can have the ability to display characters on it +Display devices have the ability to display characters on them (without help of an X server), either directly by hardware or through software drawing pixel data into the display memory. -Such displays are called -.Dq emulating , -the +The .Nm driver will connect a terminal emulation module and provide a tty-like software interface. -In contrary, non-emulating displays can only be used by special programs -like X servers. .Pp The .Em console @@ -104,9 +100,6 @@ if the device is in use as system console. This way, the console device can be connected to a known .Nm wsdisplay device instance. -(Naturally, only -.Dq emulating -display devices are usable as console.) .Pp The .Em mux @@ -603,6 +596,3 @@ The terms and .Dq wsdisplay are not cleanly distinguished in the code and in manual pages. -.Pp -.Dq non-emulating -display devices are not tested. diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons index fe6daa2fce9..b746e42def4 100644 --- a/sys/dev/wscons/files.wscons +++ b/sys/dev/wscons/files.wscons @@ -1,4 +1,4 @@ -# $OpenBSD: files.wscons,v 1.9 2005/05/15 11:29:15 miod Exp $ +# $OpenBSD: files.wscons,v 1.10 2005/06/02 07:34:14 miod Exp $ # $NetBSD: files.wscons,v 1.34 2005/05/04 01:52:16 augustss Exp $ # @@ -16,7 +16,6 @@ # this loses, but there's no way to define attributes which have attributes device wsdisplay #tty? attach wsdisplay at wsemuldisplaydev with wsdisplay_emul -attach wsdisplay at wsdisplaydev with wsdisplay_noemul device wskbd attach wskbd at wskbddev device wsmouse diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index cdd69418661..c0afcc51d16 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.59 2005/06/02 07:31:17 miod Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.60 2005/06/02 07:34:14 miod Exp $ */ /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */ /* @@ -206,8 +206,6 @@ extern struct cfdriver wsdisplay_cd; /* Autoconfiguration definitions. */ int wsdisplay_emul_match(struct device *, void *, void *); void wsdisplay_emul_attach(struct device *, struct device *, void *); -int wsdisplay_noemul_match(struct device *, void *, void *); -void wsdisplay_noemul_attach(struct device *, struct device *, void *); struct cfdriver wsdisplay_cd = { NULL, "wsdisplay", DV_TTY @@ -218,11 +216,6 @@ struct cfattach wsdisplay_emul_ca = { wsdisplay_emul_attach, }; -struct cfattach wsdisplay_noemul_ca = { - sizeof(struct wsdisplay_softc), wsdisplay_noemul_match, - wsdisplay_noemul_attach, -}; - void wsdisplaystart(struct tty *); int wsdisplayparam(struct tty *, struct termios *); @@ -610,28 +603,6 @@ wsemuldisplaydevprint(void *aux, const char *pnp) return (UNCONF); } -int -wsdisplay_noemul_match(struct device *parent, void *match, void *aux) -{ -#if 0 /* -Wunused */ - struct wsdisplaydev_attach_args *ap = aux; -#endif - - /* Always match. */ - return (1); -} - -void -wsdisplay_noemul_attach(struct device *parent, struct device *self, void *aux) -{ - struct wsdisplay_softc *sc = (struct wsdisplay_softc *)self; - struct wsdisplaydev_attach_args *ap = aux; - - wsdisplay_common_attach(sc, 0, - sc->sc_dv.dv_cfdata->wsemuldisplaydevcf_mux, NULL, - ap->accessops, ap->accesscookie); -} - /* Print function (for parent devices). */ int wsdisplaydevprint(void *aux, const char *pnp) |