Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch return the right values for ioctl(WSKBDIO_GTYPE) an...
details: https://anonhg.NetBSD.org/src/rev/eb5df8ed5157
branches: trunk
changeset: 759453:eb5df8ed5157
user: macallan <macallan%NetBSD.org@localhost>
date: Fri Dec 10 00:17:08 2010 +0000
description:
return the right values for ioctl(WSKBDIO_GTYPE) and ioctl(WSMOUSEIO_GTYPE)
fixes PR 23991
diffstat:
sys/arch/mac68k/dev/akbd.c | 6 +++---
sys/arch/mac68k/dev/ams.c | 12 +++++++++---
sys/arch/macppc/dev/ams.c | 10 ++++++++--
3 files changed, 20 insertions(+), 8 deletions(-)
diffs (91 lines):
diff -r caa2e15d9e11 -r eb5df8ed5157 sys/arch/mac68k/dev/akbd.c
--- a/sys/arch/mac68k/dev/akbd.c Thu Dec 09 23:40:12 2010 +0000
+++ b/sys/arch/mac68k/dev/akbd.c Fri Dec 10 00:17:08 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: akbd.c,v 1.21 2007/03/10 16:35:14 hauke Exp $ */
+/* $NetBSD: akbd.c,v 1.22 2010/12/10 00:17:08 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.21 2007/03/10 16:35:14 hauke Exp $");
+__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.22 2010/12/10 00:17:08 macallan Exp $");
#include "opt_adb.h"
@@ -464,7 +464,7 @@
switch (cmd) {
case WSKBDIO_GTYPE:
- *(int *)data = 0; /* XXX */
+ *(int *)data = WSKBD_TYPE_ADB;
return 0;
case WSKBDIO_SETLEDS:
return 0;
diff -r caa2e15d9e11 -r eb5df8ed5157 sys/arch/mac68k/dev/ams.c
--- a/sys/arch/mac68k/dev/ams.c Thu Dec 09 23:40:12 2010 +0000
+++ b/sys/arch/mac68k/dev/ams.c Fri Dec 10 00:17:08 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ams.c,v 1.19 2007/03/05 21:05:35 he Exp $ */
+/* $NetBSD: ams.c,v 1.20 2010/12/10 00:17:08 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.19 2007/03/05 21:05:35 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.20 2010/12/10 00:17:08 macallan Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -522,7 +522,13 @@
int
ams_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
- return (EPASSTHROUGH);
+
+ switch (cmd) {
+ case WSMOUSEIO_GTYPE:
+ *(u_int *)data = WSMOUSE_TYPE_ADB;
+ break;
+ }
+ return EPASSTHROUGH;
}
void
diff -r caa2e15d9e11 -r eb5df8ed5157 sys/arch/macppc/dev/ams.c
--- a/sys/arch/macppc/dev/ams.c Thu Dec 09 23:40:12 2010 +0000
+++ b/sys/arch/macppc/dev/ams.c Fri Dec 10 00:17:08 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ams.c,v 1.25 2007/03/05 10:47:06 tsutsui Exp $ */
+/* $NetBSD: ams.c,v 1.26 2010/12/10 00:17:08 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.25 2007/03/05 10:47:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.26 2010/12/10 00:17:08 macallan Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -629,6 +629,12 @@
int
ams_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
+
+ switch (cmd) {
+ case WSMOUSEIO_GTYPE:
+ *(u_int *)data = WSMOUSE_TYPE_ADB;
+ break;
+ }
return EPASSTHROUGH;
}
Home |
Main Index |
Thread Index |
Old Index