Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch keyboard to "event mode" on open. 

Nuke wskbd_set_translation(). It doesn't fit into the "screen" model.
This commit is contained in:
drochner 1998-07-23 14:33:01 +00:00
parent cf835b8a8d
commit 56a5adfaff
3 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/wscons/wscons_callbacks.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wscons_callbacks.h,v 1.3 1998/06/15 17:48:32 drochner Exp $ */
/* $NetBSD: wscons_callbacks.h,v 1.4 1998/07/23 14:33:01 drochner Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -65,4 +65,3 @@ void wskbd_set_display __P((struct device *, struct device *));
*/
int wskbd_displayioctl __P((struct device *dev, u_long cmd,
caddr_t data, int flag, struct proc *p));
void wskbd_set_translation __P((struct device *, int));

24
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.8 1998/06/15 17:48:33 drochner Exp $ */
/* $NetBSD: wsdisplay.c,v 1.9 1998/07/23 14:33:01 drochner Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -33,7 +33,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$NetBSD: wsdisplay.c,v 1.8 1998/06/15 17:48:33 drochner Exp $";
"$NetBSD: wsdisplay.c,v 1.9 1998/07/23 14:33:01 drochner Exp $";
#include <sys/param.h>
#include <sys/conf.h>
@ -544,12 +544,6 @@ wsdisplayclose(dev, flag, mode, p)
if (WSSCREEN_HAS_EMULATOR(scr))
scr->scr_flags &= ~SCR_GRAPHICS;
#if 0
if (sc->sc_kbddv != NULL)
wskbd_set_translation(sc->sc_kbddv,
((scr->scr_flags & SCR_GRAPHICS) ? 0 : 1));
#endif
#ifdef WSDISPLAY_COMPAT_RAWKBD
if (scr->scr_rawkbd) {
int kbmode = WSKBD_TRANSLATED;
@ -687,9 +681,6 @@ wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p)
struct proc *p;
{
int error;
#if 0
int flush;
#endif
void *buf;
if (sc->sc_kbddv != NULL) {
@ -731,16 +722,7 @@ wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p)
scr->scr_flags |= SCR_GRAPHICS;
} else if (d == WSDISPLAYIO_MODE_EMUL)
return (EINVAL);
#if 0
flush = (scr->scr_graphics != *(u_int *)data);
scr->scr_graphics = *(u_int *)data;
if (sc->sc_kbddv != NULL)
wskbd_set_translation(sc->sc_kbddv,
scr->scr_graphics == WSDISPLAYIO_MODE_EMUL);
if (flush)
ttyflush(scr->scr_tty, FREAD | FWRITE);
#endif
return (0);
return (0);
#undef d
case WSDISPLAYIO_SFONT:
#define d ((struct wsdisplay_font *)data)

17
sys/dev/wscons/wskbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wskbd.c,v 1.10 1998/07/04 22:18:51 jonathan Exp $ */
/* $NetBSD: wskbd.c,v 1.11 1998/07/23 14:33:02 drochner Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -36,7 +36,7 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$NetBSD: wskbd.c,v 1.10 1998/07/04 22:18:51 jonathan Exp $";
"$NetBSD: wskbd.c,v 1.11 1998/07/23 14:33:02 drochner Exp $";
/*
* Copyright (c) 1992, 1993
@ -490,6 +490,7 @@ wskbdopen(dev, flags, mode, p)
sc->sc_events.io = p;
wsevent_init(&sc->sc_events); /* may cause sleep */
sc->sc_translating = 0;
sc->sc_ready = 1; /* start accepting events */
/* XXX ENABLE THE DEVICE IF NOT CONSOLE? */
@ -518,6 +519,7 @@ wskbdclose(dev, flags, mode, p)
/* XXX DISABLE THE DEVICE IF NOT CONSOLE? */
sc->sc_ready = 0; /* stop accepting events */
sc->sc_translating = 1;
wsevent_fini(&sc->sc_events);
sc->sc_events.io = NULL;
#endif /* NWSKBD > 0 */
@ -810,17 +812,6 @@ wskbd_set_display(dv, displaydv)
sc->sc_displaydv = displaydv;
}
void
wskbd_set_translation(dv, on)
struct device *dv;
int on;
{
struct wskbd_softc *sc = (struct wskbd_softc *)dv;
KASSERT(sc != NULL);
sc->sc_translating = on;
}
/*
* Console interface.
*/