diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-08-29 20:20:27 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-08-29 20:20:27 +0000 |
| commit | d637448fd22fc504f151fe93a6fa57817b4ce8cc (patch) | |
| tree | 12c1482d3d68d48bf40c9ead0d97e6a70205dd58 /sys/dev | |
| parent | 05536921e8cc58554ab25ff86d52c2addd3677fa (diff) | |
make set/get screen work now
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 6 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index a0fd53aac1e..f942e0b8aa8 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.11 2001/06/29 20:16:22 mickey Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.12 2001/08/29 20:20:26 mickey Exp $ */ /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */ /* @@ -358,8 +358,8 @@ struct wsdisplay_delscreendata { }; #define WSDISPLAYIO_DELSCREEN _IOW('W', 84, struct wsdisplay_delscreendata) -#define WSDISPLAYIO_GETSCREEN _IOR('W', 85, struct wsdisplay_addscreendata) -#define WSDISPLAYIO_SETSCREEN _IOR('W', 86, u_int) +#define WSDISPLAYIO_GETSCREEN _IOWR('W', 85, struct wsdisplay_addscreendata) +#define WSDISPLAYIO_SETSCREEN _IOW('W', 86, u_int) /* Display information: number of bytes per row, may be same as pixels */ #define WSDISPLAYIO_LINEBYTES _IOR('W', 95, u_int) diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index 849c1996ee8..2a7a6110a10 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.31 2001/07/10 11:07:25 espie Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.32 2001/08/29 20:20:26 mickey Exp $ */ /* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */ /* @@ -1133,6 +1133,12 @@ wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p) } return (error); #undef d + case WSDISPLAYIO_GETSCREEN: +#define d ((struct wsdisplay_addscreendata *)data) + return (wsdisplay_getscreen(sc, d)); +#undef d + case WSDISPLAYIO_SETSCREEN: + return (wsdisplay_switch((void *)sc, *(int *)data, 1)); } /* check ioctls for display */ |