Module Name: src
Committed By: macallan
Date: Fri Dec 10 00:17:08 UTC 2010
Modified Files:
src/sys/arch/mac68k/dev: akbd.c ams.c
src/sys/arch/macppc/dev: ams.c
Log Message:
return the right values for ioctl(WSKBDIO_GTYPE) and ioctl(WSMOUSEIO_GTYPE)
fixes PR 23991
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mac68k/dev/akbd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mac68k/dev/ams.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/dev/ams.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/dev/akbd.c
diff -u src/sys/arch/mac68k/dev/akbd.c:1.21 src/sys/arch/mac68k/dev/akbd.c:1.22
--- src/sys/arch/mac68k/dev/akbd.c:1.21 Sat Mar 10 16:35:14 2007
+++ src/sys/arch/mac68k/dev/akbd.c Fri Dec 10 00:17:08 2010
@@ -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;
Index: src/sys/arch/mac68k/dev/ams.c
diff -u src/sys/arch/mac68k/dev/ams.c:1.19 src/sys/arch/mac68k/dev/ams.c:1.20
--- src/sys/arch/mac68k/dev/ams.c:1.19 Mon Mar 5 21:05:35 2007
+++ src/sys/arch/mac68k/dev/ams.c Fri Dec 10 00:17:08 2010
@@ -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
Index: src/sys/arch/macppc/dev/ams.c
diff -u src/sys/arch/macppc/dev/ams.c:1.25 src/sys/arch/macppc/dev/ams.c:1.26
--- src/sys/arch/macppc/dev/ams.c:1.25 Mon Mar 5 10:47:06 2007
+++ src/sys/arch/macppc/dev/ams.c Fri Dec 10 00:17:08 2010
@@ -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;
}
