Module Name: src
Committed By: macallan
Date: Thu Aug 30 01:27:45 UTC 2012
Modified Files:
src/sys/dev/adb: adb_kbd.c files.adb
Log Message:
add options ADBKBD_EMUL_USB to turn USB emulation on by default
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/adb/adb_kbd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/adb/files.adb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/adb/adb_kbd.c
diff -u src/sys/dev/adb/adb_kbd.c:1.18 src/sys/dev/adb/adb_kbd.c:1.19
--- src/sys/dev/adb/adb_kbd.c:1.18 Wed Aug 29 02:44:07 2012
+++ src/sys/dev/adb/adb_kbd.c Thu Aug 30 01:27:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_kbd.c,v 1.18 2012/08/29 02:44:07 macallan Exp $ */
+/* $NetBSD: adb_kbd.c,v 1.19 2012/08/30 01:27:44 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.18 2012/08/29 02:44:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.19 2012/08/30 01:27:44 macallan Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v
#include <dev/adb/adb_keymap.h>
#include "opt_wsdisplay_compat.h"
+#include "opt_adbkbd.h"
#include "adbdebug.h"
#include "wsmouse.h"
@@ -336,6 +337,10 @@ adbkbd_attach(device_t parent, device_t
a.accesscookie = sc;
sc->sc_wskbddev = config_found_ia(self, "wskbddev", &a, wskbddevprint);
+#ifdef ADBKBD_EMUL_USB
+ sc->sc_emul_usb = TRUE;
+ wskbd_set_evtrans(sc->sc_wskbddev, adb_to_usb, 128);
+#endif /* ADBKBD_EMUL_USB */
#if NWSMOUSE > 0
/* attach the mouse device */
Index: src/sys/dev/adb/files.adb
diff -u src/sys/dev/adb/files.adb:1.6 src/sys/dev/adb/files.adb:1.7
--- src/sys/dev/adb/files.adb:1.6 Wed Aug 29 02:44:07 2012
+++ src/sys/dev/adb/files.adb Thu Aug 30 01:27:44 2012
@@ -1,5 +1,5 @@
#
-# $NetBSD: files.adb,v 1.6 2012/08/29 02:44:07 macallan Exp $
+# $NetBSD: files.adb,v 1.7 2012/08/30 01:27:44 macallan Exp $
#
# Apple Desktop Bus protocol and drivers
@@ -19,6 +19,7 @@ device adbkbd : wskbddev, wsmousedev, sy
attach adbkbd at nadb
file dev/adb/adb_kbd.c adbkbd needs-flag
file dev/adb/adb_usb_map.c adbkbd
+defflag opt_adbkbd.h ADBKBD_EMUL_USB
device adbbt : wskbddev
attach adbbt at nadb
