3336. Fx up new MMIO macros (#3337, Matt Grossman).xf-3_9_16fxf-3_9_16exf-3_9_16dxf-3_9_16Z

3335. Clean up compiler warnings in lib/font/bitmap (#3411, Matt Grossman).
3334. TGA fixes, add sync on green (#3410, Matt Grossman).
3333. Fix NULL pointer dereference in libXaw (#3406, Christopher Sekiya).
3332. Add Rage128 support (#3405, Rik Faith, funded by ATI).
3331. Add MTRR support for NetBSD and OpenBSD. Add new NetBSD aperture
    driver (#3404, Matthieu Herrb).
3330. Xterm patch #121 (#3402, Thomas Dickey).
3329. Rendition driver bugfixes and alpha related cleanups (#3400, Dejan
    Ilic, Marc Langenbach, Egbert Eich).
3328. Add void input device (#3392, Frederic Lepied).
3327. Changed the Xon serial option to be able to select xon/xoff for
    input, output or both. Add support for Graphire models. Change wacom
    init phase to use new Xoff option (#3391, Frederic Lepied).
3326. Change the SwapAxes option to SwapXY in elographics/microtouch driver
    to match an already existing option in the Dynapro driver. Add a Focus
    class capability to the elographics driver (#3395, Patrick Lecoanet).
3325. Update mouse rate handling (#3388, Harald Koenig).
3324. Fix NULL pointer dereference in misprite.c (#3380, Edward Wang).
3323. Add FBDev and ShadowFB support to glint driver. Add new option
    "NoWriteBitmap" (#3383, Michel Daenzer).
3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up
    Trio3D/Savage3D detection (#3382,3384 Harald Koenig).
3321. Add new framebuffer code and tiny X DDX architecture (#3379, Keith
    Packard).
3320. Add DGA2 documentation (#3378, Mark Vojkovich).
3319. Update XFree86 manpage wrt -bpp/-depth/-fbbpp (#3377, Andy Isaacson).
3318. Make SuperProbe check primary cards, only (#3374, Harald Koenig).
3317. Add SilkenMouse to *BSD (#3373, Matthieu Herrb).
3316. Allow SilkenMouse to work if not all drivers of an OS support SIGIO
    (#3372, Keith Packard).
3315. Fix a few problems in TGA driver and add support for backing store
    and SilkenMouse (#3371, Matt Grossman).
3314. Add smarter scheduler (#3370, Keith Packard).
3313. Xterm patch #120 (#3369, Thomas Dickey).
3312. Enable xf86SetKbdRate function on Solaris 8 (#3364, David Holland).
3311. Fix some bugs and add acceleration to Rendition server (#3360, Dejan
    Ilic).
3310. Make raw DDC information available as properties in the root window
    (#3357, Andrew Aitchison).
3309. Fix for xf86CreateRootWindow (#3355, Andrew Aitchison).
3308. Add manpage for the chips driver (#3353, David Bateman).
3307. Update contact info (#3352, Andrew van der Stock).
3306. Add kbd rate support for Linux (#3363, Harald Koenig).
3305. Update Portuguese XKB map (#3351, Joao Esteves, Francisco Colaco).
3304. Fix text clipping in 3dfx driver (#3349, Henrik Harmsen).
3303. Fix S3 ViRGE hw cursor (#3348, Harald Koenig).
3302. Fix clipping in 3dfx driver (#3342, Daryll Strauss).
3301. Enable SilkenMouse for 3dfx driver (#3341, Henrik Harmsen).
3300. Enable SIGIO support on LynxOS (#3339, Thomas Mueller).
3299. Get TRUE defined in sigio.c. Fix xterm compile problem on ISC (#3338,
    Michael Rohleder).
3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336, Henrik
    Harmsen)
3297. Xterm patch #119 (#3335, Thomas Dickey).

1 files changed, 234 insertions, 0 deletions

diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c
new file mode 100644
index 000000000..ef7897a15
--- /dev/null
+++ b/hw/kdrive/itsy/kbd.c
@@ -0,0 +1,234 @@
+/*
+ * $Id$
+ *
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+/* $XFree86: $ */
+
+#include "itsy.h"
+#include "kkeymap.h"
+#include <X11/keysym.h>
+#include <linux/itsy_buttons.h>
+
+#define ITSY_WIDTH  2
+
+KeySym ItsyKeymap[] = {
+/*      1     8 */	 XK_Escape, NoSymbol,
+/*      2     9 */	 XK_1,	XK_exclam,
+/*      3    10 */	 XK_2,	XK_at,
+/*      4    11 */	 XK_3,	XK_numbersign,
+/*      5    12 */	 XK_4,	XK_dollar,
+/*      6    13 */	 XK_5,	XK_percent,
+/*      7    14 */	 XK_6,	XK_asciicircum,
+/*      8    15 */	 XK_7,	XK_ampersand,
+/*      9    16 */	 XK_8,	XK_asterisk,
+/*     10    17 */	 XK_9,	XK_parenleft,
+/*     11    18 */	 XK_0,	XK_parenright,
+/*     12    19 */	 XK_minus,	XK_underscore,
+/*     13    20 */	 XK_equal,	XK_plus,
+/*     14    21 */	 XK_BackSpace,	NoSymbol,
+/*     15    22 */	 XK_Tab,	NoSymbol,
+/*     16    23 */	 XK_Q,	NoSymbol,
+/*     17    24 */	 XK_W,	NoSymbol,
+/*     18    25 */	 XK_E,	NoSymbol,
+/*     19    26 */	 XK_R,	NoSymbol,
+/*     20    27 */	 XK_T,	NoSymbol,
+/*     21    28 */	 XK_Y,	NoSymbol,
+/*     22    29 */	 XK_U,	NoSymbol,
+/*     23    30 */	 XK_I,	NoSymbol,
+/*     24    31 */	 XK_O,	NoSymbol,
+/*     25    32 */	 XK_P,	NoSymbol,
+/*     26    33 */	 XK_bracketleft,	XK_braceleft,
+/*     27    34 */	 XK_bracketright,	XK_braceright,
+/*     28    35 */	 XK_Return,	NoSymbol,
+/*     29    36 */	 XK_Control_L,	NoSymbol,
+/*     30    37 */	 XK_A,	NoSymbol,
+/*     31    38 */	 XK_S,	NoSymbol,
+/*     32    39 */	 XK_D,	NoSymbol,
+/*     33    40 */	 XK_F,	NoSymbol,
+/*     34    41 */	 XK_G,	NoSymbol,
+/*     35    42 */	 XK_H,	NoSymbol,
+/*     36    43 */	 XK_J,	NoSymbol,
+/*     37    44 */	 XK_K,	NoSymbol,
+/*     38    45 */	 XK_L,	NoSymbol,
+/*     39    46 */	 XK_semicolon,	XK_colon,
+/*     40    47 */	 XK_apostrophe,	XK_quotedbl,
+/*     41    48 */	 XK_grave,	XK_asciitilde,
+/*     42    49 */	 XK_Shift_L,	NoSymbol,
+/*     43    50 */	 XK_backslash,	XK_bar,
+/*     44    51 */	 XK_Z,	NoSymbol,
+/*     45    52 */	 XK_X,	NoSymbol,
+/*     46    53 */	 XK_C,	NoSymbol,
+/*     47    54 */	 XK_V,	NoSymbol,
+/*     48    55 */	 XK_B,	NoSymbol,
+/*     49    56 */	 XK_N,	NoSymbol,
+/*     50    57 */	 XK_M,	NoSymbol,
+/*     51    58 */	 XK_comma,	XK_less,
+/*     52    59 */	 XK_period,	XK_greater,
+/*     53    60 */	 XK_slash,	XK_question,
+/*     54    61 */	 XK_Shift_R,	NoSymbol,
+/*     55    62 */	 XK_KP_Multiply,	NoSymbol,
+/*     56    63 */	 XK_Alt_L,	XK_Meta_L,
+/*     57    64 */	 XK_space,	NoSymbol,
+/*     58    65 */	 XK_Caps_Lock,	NoSymbol,
+/*     59    66 */	 XK_F1,	NoSymbol,
+/*     60    67 */	 XK_F2,	NoSymbol,
+/*     61    68 */	 XK_F3,	NoSymbol,
+/*     62    69 */	 XK_F4,	NoSymbol,
+/*     63    70 */	 XK_F5,	NoSymbol,
+/*     64    71 */	 XK_F6,	NoSymbol,
+/*     65    72 */	 XK_F7,	NoSymbol,
+/*     66    73 */	 XK_F8,	NoSymbol,
+/*     67    74 */	 XK_F9,	NoSymbol,
+/*     68    75 */	 XK_F10,	NoSymbol,
+/*     69    76 */	 XK_Break,	XK_Pause,
+/*     70    77 */	 XK_Scroll_Lock,	NoSymbol,
+/*     71    78 */	 XK_KP_Home,	XK_KP_7,
+/*     72    79 */	 XK_KP_Up,	XK_KP_8,
+/*     73    80 */	 XK_KP_Page_Up,	XK_KP_9,
+/*     74    81 */	 XK_KP_Subtract,	NoSymbol,
+/*     75    82 */	 XK_KP_Left,	XK_KP_4,
+/*     76    83 */	 XK_KP_5,	NoSymbol,
+/*     77    84 */	 XK_KP_Right,	XK_KP_6,
+/*     78    85 */	 XK_KP_Add,	NoSymbol,
+/*     79    86 */	 XK_KP_End,	XK_KP_1,
+/*     80    87 */	 XK_KP_Down,	XK_KP_2,
+/*     81    88 */	 XK_KP_Page_Down,	XK_KP_3,
+/*     82    89 */	 XK_KP_Insert,	XK_KP_0,
+/*     83    90 */	 XK_KP_Delete,	XK_KP_Decimal,
+/*     84    91 */     NoSymbol,	NoSymbol,
+/*     85    92 */     NoSymbol,	NoSymbol,
+/*     86    93 */     NoSymbol,	NoSymbol,
+/*     87    94 */	 XK_F11,	NoSymbol,
+/*     88    95 */	 XK_F12,	NoSymbol,
+    
+/* These are remapped from the extended set (using ExtendMap) */
+    
+/*     89    96 */	 XK_Control_R,	NoSymbol,
+/*     90    97 */	 XK_KP_Enter,	NoSymbol,
+/*     91    98 */	 XK_KP_Divide,	NoSymbol,
+/*     92    99 */	 XK_Sys_Req,	XK_Print,
+/*     93   100 */	 XK_Alt_R,	XK_Meta_R,
+/*     94   101 */	 XK_Num_Lock,	NoSymbol,
+/*     95   102 */	 XK_Home,	NoSymbol,
+/*     96   103 */	 XK_Up,		NoSymbol,
+/*     97   104 */	 XK_Page_Up,	NoSymbol,
+/*     98   105 */	 XK_Left,	NoSymbol,
+/*     99   106 */	 XK_Right,	NoSymbol,
+/*    100   107 */	 XK_End,	NoSymbol,
+/*    101   108 */	 XK_Down,	NoSymbol,
+/*    102   109 */	 XK_Page_Down,	NoSymbol,
+/*    103   110 */	 XK_Insert,	NoSymbol,
+/*    104   111 */	 XK_Delete,	NoSymbol,
+/*    105   112 */	 XK_Super_L,	NoSymbol,
+/*    106   113 */	 XK_Super_R,	NoSymbol,
+/*    107   114 */	 XK_Menu,	NoSymbol,
+
+/* Itsy hardware buttons */
+#define ITSY_BUTTON_FIRST   108
+#define ITSY_BUTTON_LAST    116
+    
+/*    108   115 */	 XK_Next,	NoSymbol,   /* right button on side */
+/*    109   116 */	 XK_Prior,	NoSymbol,   /* left button on side */
+/*    110   117 */	 XK_Up,		NoSymbol,   /* joypad */
+/*    111   118 */	 XK_Down,	NoSymbol,
+/*    112   119 */	 XK_Left,	NoSymbol,
+/*    113   120 */	 XK_Right,	NoSymbol,
+/*    114   121 */	 NoSymbol,	NoSymbol,   /* left near speaker */
+/*    115   122 */	 NoSymbol,	NoSymbol,   /* right near speaker */
+/*    116   123 */	 NoSymbol,	NoSymbol,   /* tiny button */
+};
+
+static unsigned long	itsyButtonState;
+
+void
+ItsyKeyboardLoad (void)
+{
+    KeySym  *k;
+
+    itsyButtonState = 0;
+    kdMinScanCode = 1;
+    kdKeymapWidth = ITSY_WIDTH;
+    kdMaxScanCode = (sizeof (ItsyKeymap) / sizeof (ItsyKeymap[0])) / ITSY_WIDTH;
+    memcpy (kdKeymap, ItsyKeymap, sizeof (ItsyKeymap));
+}
+
+int
+ItsyKeyboardInit (void)
+{
+    int	butPort;
+
+    butPort = open ("/dev/buttons", 0);
+    fprintf (stderr, "butPort %d\n", butPort);
+    return butPort;
+}
+
+void
+ItsyKeyboardFini (int fd)
+{
+    if (fd >= 0)
+	close (fd);
+}
+
+void
+ItsyKeyboardRead (int fd)
+{
+    itsy_buttons_event	event;
+    int			b;
+    unsigned long	bit;
+    unsigned long	change;
+    unsigned long	buttons;
+
+    if (read (fd, &event, sizeof (event)) == sizeof (event))
+    {
+	buttons = event.state;
+	change = buttons ^ itsyButtonState;
+	if (!change)
+	    return;
+	for (b = ITSY_BUTTON_FIRST; b <= ITSY_BUTTON_LAST; b++)
+	{
+	    bit = (1 << (b - ITSY_BUTTON_FIRST));
+	    if (change & bit)
+		KdEnqueueKeyboardEvent (b, (buttons & bit) == 0);
+	}
+	itsyButtonState = buttons;
+    }
+}
+
+void
+ItsyKeyboardLeds (int leds)
+{
+}
+
+void
+ItsyKeyboardBell (int volume, int frequency, int duration)
+{
+}
+
+KdKeyboardFuncs	itsyKeyboardFuncs = {
+    ItsyKeyboardLoad,
+    ItsyKeyboardInit,
+    ItsyKeyboardRead,
+    ItsyKeyboardLeds,
+    ItsyKeyboardBell,
+    ItsyKeyboardFini,
+    0,
+};