summaryrefslogtreecommitdiff
path: root/sys/dev/wscons
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2005-12-05 11:46:19 +0000
committermacallan <macallan@NetBSD.org>2005-12-05 11:46:19 +0000
commit91d47a92dfd0ac33835133f33d0cd22b01031ac9 (patch)
tree786cef024100dca46e9d8d827e22dd22ea6b3a46 /sys/dev/wscons
parentcb3b3765552a061e04290a14fa7180b601353591 (diff)
- remove a leftover debug printf()
- fix the other cases of _IO() type ioctl() abuse ( mainly keyboard related stuff )
Diffstat (limited to 'sys/dev/wscons')
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 2b271389d21..dea6b61aef6 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.27 2005/12/04 14:03:42 macallan Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.28 2005/12/05 11:46:19 macallan Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.27 2005/12/04 14:03:42 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.28 2005/12/05 11:46:19 macallan Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -309,7 +309,6 @@ wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
*/
idx = *(long *)data - 1;
- printf("VT_ACTIVATE %d\n", idx);
if (idx < 0)
return (EINVAL);
return (wsdisplay_switch((struct device *)sc, idx, 1));
@@ -433,7 +432,7 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
*/
case KDSETMODE:
req = WSDISPLAYIO_SMODE;
-#define d (*(int *)data)
+#define d (*(long *)data)
switch (d) {
case KD_GRAPHICS:
intarg = WSDISPLAYIO_MODE_MAPPED;
@@ -470,7 +469,7 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
case KDSETLED:
req = WSKBDIO_SETLEDS;
intarg = 0;
-#define d (*(int *)data)
+#define d (*(long *)data)
if (d & LED_CAP)
intarg |= WSKBD_LED_CAPS;
if (d & LED_NUM)
@@ -487,7 +486,7 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
#ifdef WSDISPLAY_COMPAT_RAWKBD
case KDSKBMODE:
req = WSKBDIO_SETMODE;
- switch (*(int *)data) {
+ switch (*(long *)data) {
case K_RAW:
intarg = WSKBD_RAW;
break;