Update to xserver 1.20.5. Tested by jsg@

1 files changed, 0 insertions, 177 deletions

diff --git a/xserver/hw/kdrive/linux/ps2.c b/xserver/hw/kdrive/linux/ps2.c
deleted file mode 100644
index 4fec02408..000000000
--- a/xserver/hw/kdrive/linux/ps2.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <xserver_poll.h>
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "kdrive.h"
-
-static int
-Ps2ReadBytes(int fd, char *buf, int len, int min)
-{
-    int n, tot;
-    struct pollfd poll_fd;
-
-    tot = 0;
-    poll_fd.fd = fd;
-    poll_fd.events = POLLIN;
-    while (len) {
-        n = read(fd, buf, len);
-        if (n > 0) {
-            tot += n;
-            buf += n;
-            len -= n;
-        }
-        if (tot % min == 0)
-            break;
-        n = xserver_poll(&poll_fd, 1, 100);
-        if (n <= 0)
-            break;
-    }
-    return tot;
-}
-
-const char *Ps2Names[] = {
-    "/dev/psaux",
-/*    "/dev/mouse", */
-    "/dev/input/mice",
-};
-
-#define NUM_PS2_NAMES	(sizeof (Ps2Names) / sizeof (Ps2Names[0]))
-
-static void
-Ps2Read(int ps2Port, void *closure)
-{
-    unsigned char buf[3 * 200];
-    unsigned char *b;
-    int n;
-    int dx, dy;
-    unsigned long flags;
-    unsigned long left_button = KD_BUTTON_1;
-    unsigned long right_button = KD_BUTTON_3;
-
-#undef SWAP_USB
-#ifdef SWAP_USB
-    if (id == 2) {
-        left_button = KD_BUTTON_3;
-        right_button = KD_BUTTON_1;
-    }
-#endif
-    while ((n = Ps2ReadBytes(ps2Port, (char *) buf, sizeof(buf), 3)) > 0) {
-        b = buf;
-        while (n >= 3) {
-            flags = KD_MOUSE_DELTA;
-            if (b[0] & 4)
-                flags |= KD_BUTTON_2;
-            if (b[0] & 2)
-                flags |= right_button;
-            if (b[0] & 1)
-                flags |= left_button;
-
-            dx = b[1];
-            if (b[0] & 0x10)
-                dx -= 256;
-            dy = b[2];
-            if (b[0] & 0x20)
-                dy -= 256;
-            dy = -dy;
-            n -= 3;
-            b += 3;
-            KdEnqueuePointerEvent(closure, flags, dx, dy, 0);
-        }
-    }
-}
-
-static Status
-Ps2Init(KdPointerInfo * pi)
-{
-    int ps2Port, i;
-
-    if (!pi->path) {
-        for (i = 0; i < NUM_PS2_NAMES; i++) {
-            ps2Port = open(Ps2Names[i], 0);
-            if (ps2Port >= 0) {
-                pi->path = strdup(Ps2Names[i]);
-                break;
-            }
-        }
-    }
-    else {
-        ps2Port = open(pi->path, 0);
-    }
-
-    if (ps2Port < 0)
-        return BadMatch;
-
-    close(ps2Port);
-    if (!pi->name)
-        pi->name = strdup("PS/2 Mouse");
-
-    return Success;
-}
-
-static Status
-Ps2Enable(KdPointerInfo * pi)
-{
-    int fd;
-
-    if (!pi)
-        return BadImplementation;
-
-    fd = open(pi->path, 0);
-    if (fd < 0)
-        return BadMatch;
-
-    if (!KdRegisterFd(fd, Ps2Read, pi)) {
-        close(fd);
-        return BadAlloc;
-    }
-
-    pi->driverPrivate = (void *) (intptr_t) fd;
-
-    return Success;
-}
-
-static void
-Ps2Disable(KdPointerInfo * pi)
-{
-    KdUnregisterFd(pi, (int) (intptr_t) pi->driverPrivate, TRUE);
-}
-
-static void
-Ps2Fini(KdPointerInfo * pi)
-{
-}
-
-KdPointerDriver Ps2MouseDriver = {
-    "ps2",
-    Ps2Init,
-    Ps2Enable,
-    Ps2Disable,
-    Ps2Fini,
-    NULL,
-};