diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-09 11:02:18 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-13 10:30:17 +1000 |
commit | 88187ad889ab707fcae3f64890cdb291b567ec23 (patch) | |
tree | dd6b48ddeb257dda21989f657892a10416672ffb /hw/dmx | |
parent | f3aaa46f27f802233e54b3c70ba827e0fcca2605 (diff) |
dmx: purge DMX EQ leftovers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/dmx')
-rw-r--r-- | hw/dmx/input/Makefile.am | 2 | ||||
-rw-r--r-- | hw/dmx/input/dmxeq.c | 90 | ||||
-rw-r--r-- | hw/dmx/input/dmxeq.h | 43 | ||||
-rw-r--r-- | hw/dmx/input/dmxevents.c | 1 | ||||
-rw-r--r-- | hw/dmx/input/dmxinputinit.c | 1 |
5 files changed, 0 insertions, 137 deletions
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index 47dbd967b..185aaf84e 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -41,8 +41,6 @@ DMXSRCS = dmxinputinit.c \ dmxxinput.c \ dmxmotion.c \ dmxmotion.h \ - dmxeq.c \ - dmxeq.h \ dmxmap.c \ dmxmap.h diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c deleted file mode 100644 index 812a8f537..000000000 --- a/hw/dmx/input/dmxeq.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * - * Copyright 1990, 1998 The Open Group - * - * 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. - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of The Open Group shall not be - * used in advertising or otherwise to promote the sale, use or other dealings - * in this Software without prior written authorization from The Open Group. - * - * Author: Keith Packard, MIT X Consortium - */ - -/* - * dmxeq.c is derived from mi/mieq.c so that XInput events can be handled - * - * Modified by: Rickard E. (Rik) Faith <faith@redhat.com> - * - * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/** \file - * This file provides an event queue that knows about XInput events. - * All of the code is based on mi/mieq.c and was modified as little as - * possible to provide XInput event support (the copyright and some of - * the comments are from The Open Group, Keith Packard, MIT X - * Consortium). (Another example of similar code is provided in - * hw/xfree86/common/xf86Xinput.c.) */ - -#ifdef HAVE_DMX_CONFIG_H -#include <dmx-config.h> -#endif - -#define DMX_EQ_DEBUG 0 - -#include "dmx.h" -#include "dmxeq.h" -#include "dmxinput.h" -#include "dmxlog.h" -#include "dmxdpms.h" - -#include "inputstr.h" -#include "scrnintstr.h" /* For screenInfo */ - -#include <X11/extensions/XIproto.h> - -#if DMX_EQ_DEBUG -#define DMXDBG2(f,a,b) dmxLog(dmxDebug,f,a,b) -#define DMXDBG5(f,a,b,c,d,e) dmxLog(dmxDebug,f,a,b,c,d,e) -#else -#define DMXDBG2(f,a,b) -#define DMXDBG5(f,a,b,c,d,e) -#endif diff --git a/hw/dmx/input/dmxeq.h b/hw/dmx/input/dmxeq.h deleted file mode 100644 index b38c519df..000000000 --- a/hw/dmx/input/dmxeq.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002 Red Hat Inc., Durham, North Carolina. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/* - * Authors: - * Rickard E. (Rik) Faith <faith@redhat.com> - * - */ - -/** \file - * Interface to the event queue support. Some of these functions are - * included in dmxinput.h, since they are used by top-level .c - * files. \see dmxeq.c \see dmxinput.h */ - -#ifndef _DMXEQ_H_ -#define _DMXEQ_H_ -extern Bool dmxeqInit(DevicePtr pKbd, DevicePtr pPtr); -extern void dmxeqProcessInputEvents(void); -#endif diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 0b0813ad3..992c32e8e 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -47,7 +47,6 @@ #include "dmxcommon.h" #include "dmxcursor.h" #include "dmxmotion.h" -#include "dmxeq.h" #include "dmxsigio.h" #include "dmxmap.h" diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 58cafe2b1..d8402e87f 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -51,7 +51,6 @@ #include "dmxcommon.h" #include "dmxevents.h" #include "dmxmotion.h" -#include "dmxeq.h" #include "dmxprop.h" #include "config/dmxconfig.h" #include "dmxcursor.h" |