From owner-cvs-src@FreeBSD.ORG Sun Sep 30 19:33:20 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1321216A417; Sun, 30 Sep 2007 19:33:20 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBCB313C45B; Sun, 30 Sep 2007 19:33:19 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UJXJet034903; Sun, 30 Sep 2007 19:33:19 GMT (envelope-from marius@repoman.freebsd.org) Received: (from marius@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UJXJeG034902; Sun, 30 Sep 2007 19:33:19 GMT (envelope-from marius) Message-Id: <200709301933.l8UJXJeG034902@repoman.freebsd.org> From: Marius Strobl Date: Sun, 30 Sep 2007 19:33:19 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/conf files.sparc64 options.sparc64 src/sys/dev/uart uart_kbd_sun.c uart_kbd_sun.h src/sys/sparc64/conf NOTES X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Sep 2007 19:33:20 -0000 marius 2007-09-30 19:33:19 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/conf files.sparc64 options.sparc64 sys/dev/uart uart_kbd_sun.c uart_kbd_sun.h sys/sparc64/conf NOTES Log: MFC: sys/conf/files.sparc64 1.83; sys/conf/options.sparc64 1.24; sys/dev/uart/uart_kbd_sun.c 1.10, 1.11 (partial), 1.13; sys/dev/uart/uart_kbd_sun.h 1.3; sys/sparc64/conf/NOTES 1.30 - In sunkbd_probe_keyboard() don't bother to determine the keyboard layout as we have no use for that info. Instead let this function return the keyboard ID and verify at its invocation in sunkbd_configure() that we're talking to a Sun type 4/5/6 keyboard, i.e. a keyboard supported by this driver. - Add an option SUNKBD_EMULATE_ATKBD whose code is based on the respective code in ukbd(4) and like UKBD_EMULATE_ATSCANCODE causes this driver to emit AT keyboard/KB_101 compatible scan codes in K_RAW mode as assumed by kbdmux(4). Unlike UKBD_EMULATE_ATSCANCODE, SUNKBD_EMULATE_ATKBD also triggers the use of AT keyboard maps and thus allows to use the map files in share/syscons/keymaps with this driver at the cost of an additional translation (in ukbd(4) this just is the way of operation). - Implement an option SUNKBD_DFLT_KEYMAP, which like the equivalent options of the other keyboard drivers allows to specify the default in-kernel keyboard map. For obvious reasons this made to only work when also using SUNKBD_EMULATE_ATKBD. - Implement sunkbd_check(), sunkbd_check_char() and sunkbd_clear_state(), which are also required for interoperability with kbdmux(4). - Implement K_CODE mode and FreeBSD keypad compose. - As a minor hack define KBD_DFLT_KEYMAP also in the !SUNKBD_EMULATE_ATKBD case so we can obtain fkey_tab from rather than having to duplicate it and #ifdef some more code. - Don't use the TX-buffer for writing the two command bytes for setting the keyboard LEDs as this consequently requires a hardware FIFO that is at least two bytes in depth, which the NMOS-variant of the Zilog SCCs doesn't have. Thus use an inlined version of uart_putc() to consecutively write the command bytes (a cleaner approach would be to do this via the soft interrupt handler but that variant wouldn't work while in ddb(4)). [1] - Fix some minor style(9) bugs. PR: 90316 [1] Revision Changes Path 1.73.2.4 +5 -0 src/sys/conf/files.sparc64 1.13.2.1 +2 -0 src/sys/conf/options.sparc64 1.5.2.4 +382 -86 src/sys/dev/uart/uart_kbd_sun.c 1.2.2.1 +3 -0 src/sys/dev/uart/uart_kbd_sun.h 1.19.2.3 +10 -0 src/sys/sparc64/conf/NOTES