[src/trunk]: src/sys/dev/adb add options ADBKBD_EMUL_USB to turn USB emulatio...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9fbefa68dc7
branches:  trunk
changeset: 781273:b9fbefa68dc7
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Aug 30 01:27:44 2012 +0000

description:
add options ADBKBD_EMUL_USB to turn USB emulation on by default

diffstat:

 sys/dev/adb/adb_kbd.c |  9 +++++++--
 sys/dev/adb/files.adb |  3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r 1c451cf0e052 -r b9fbefa68dc7 sys/dev/adb/adb_kbd.c
--- a/sys/dev/adb/adb_kbd.c     Wed Aug 29 23:16:35 2012 +0000
+++ b/sys/dev/adb/adb_kbd.c     Thu Aug 30 01:27:44 2012 +0000
@@ -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 @@
 #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 @@
        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 */
diff -r 1c451cf0e052 -r b9fbefa68dc7 sys/dev/adb/files.adb
--- a/sys/dev/adb/files.adb     Wed Aug 29 23:16:35 2012 +0000
+++ b/sys/dev/adb/files.adb     Thu Aug 30 01:27:44 2012 +0000
@@ -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 @@
 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