summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Gusarov <dottedmag@dottedmag.net>2010-01-04 01:50:04 +0600
committerMikhail Gusarov <dottedmag@dottedmag.net>2010-01-06 20:27:25 +0600
commitaf1f1a05e1aa9ec921f1288818a66766c301f8b0 (patch)
tree4eea57f492419b826566a106f14e2885ae74523d
parenta3cc3af186b55ac80abd6859ffe491f4ae936596 (diff)
kdrive: Remove bus mouse driver
Bus mice aren't used anymore, do not keep dead code around. Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
-rw-r--r--hw/kdrive/linux/Makefile.am2
-rw-r--r--hw/kdrive/linux/bus.c132
2 files changed, 1 insertions, 133 deletions
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index 2f89b8fa4..fe4a3d183 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -19,7 +19,7 @@ liblinux_la_SOURCES += evdev.c
endif
if KDRIVE_MOUSE
-liblinux_la_SOURCES += mouse.c bus.c ms.c ps2.c
+liblinux_la_SOURCES += mouse.c ms.c ps2.c
endif
if TSLIB
diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c
deleted file mode 100644
index de9b90f5a..000000000
--- a/hw/kdrive/linux/bus.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright © 2000 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 <X11/Xpoll.h>
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "kdrive.h"
-
-/* /dev/adbmouse is a busmouse */
-
-static void
-BusRead (int adbPort, void *closure)
-{
- unsigned char buf[3];
- int n;
- int dx, dy;
- unsigned long flags;
-
- n = read (adbPort, buf, 3);
- if (n == 3)
- {
- flags = KD_MOUSE_DELTA;
- dx = (char) buf[1];
- dy = -(char) buf[2];
- if ((buf[0] & 4) == 0)
- flags |= KD_BUTTON_1;
- if ((buf[0] & 2) == 0)
- flags |= KD_BUTTON_2;
- if ((buf[0] & 1) == 0)
- flags |= KD_BUTTON_3;
- KdEnqueuePointerEvent (closure, flags, dx, dy, 0);
- }
-}
-
-char *BusNames[] = {
- "/dev/adbmouse",
- "/dev/mouse",
-};
-
-#define NUM_BUS_NAMES (sizeof (BusNames) / sizeof (BusNames[0]))
-
-static int
-BusInit (KdPointerInfo *pi)
-{
- int i, fd = 0;
-
- if (!pi->path || (strcmp(pi->path, "auto") == 0))
- {
- for (i = 0; i < NUM_BUS_NAMES; i++)
- {
- if ((fd = open (BusNames[i], 0)) >= 0)
- {
- close(fd);
- xfree(pi->path);
- pi->path = strdup(BusNames[i]);
- return Success;
- }
- }
- }
- else
- {
- if ((fd = open(pi->path, 0)) >= 0)
- {
- close(fd);
- return Success;
- }
- }
-
- return !Success;
-}
-
-static int
-BusEnable (KdPointerInfo *pi)
-{
- int fd = open(pi->path, 0);
-
- if (fd >= 0)
- {
- KdRegisterFd(fd, BusRead, pi);
- pi->driverPrivate = (void *)fd;
- return Success;
- }
- else
- {
- return !Success;
- }
-}
-
-static void
-BusDisable (KdPointerInfo *pi)
-{
- KdUnregisterFd(pi, (int)pi->driverPrivate, TRUE);
-}
-
-static void
-BusFini (KdPointerInfo *pi)
-{
- return;
-}
-
-KdPointerDriver BusMouseDriver = {
- "bus",
- BusInit,
- BusEnable,
- BusDisable,
- BusFini,
- NULL
-};