Minimum version of XInput API?
Hi, what's considered the minimum version of the XInput ABI an input driver needs to support these days? I see lots of #if GET_ABI_MAJOR in the xf86-input-synaptics driver that seem to support ancient ABI versions. Is this still appropriate? Regards, Magnus Kessler signature.asc Description: This is a digitally signed message part. ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: XTerm exits immediatly with self-compiled xorg
On Wed, Oct 08, 2008 at 06:59:33PM +0200, Clemens Eisserer wrote: The XKEYBOARD keymap compiler (xkbcomp) reports:^M Warning: Type ONE_LEVEL has 1 levels, but RALT has 2 symbols^M Ignoring extra symbols^M Errors from xkbcomp are not fatal to the X server^M You can ignore this warning, it is xkbcomp telling you that a key has more symbols than it should have. Nothing to see here, please move along. Cheers, Peter ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
[PATCH] xf86-input-synaptics janitorial patches
Hi,
here are a few janitorial patches for the synaptics driver. The patches to
the tools directory eliminate warnings flagged up by sparse. The patch to
the driver code reduces the dependency on the mi code, which only needed to
support an ancient XInput ABI version.
Regards,
Magnus Kessler
[sparse] Fix warnings about using plain integer as NULL pointer
Signed-off-by: Magnus Kessler [EMAIL PROTECTED]
diff --git a/tools/synclient.c b/tools/synclient.c
index f9e4330..2677d63 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -123,7 +123,7 @@ static struct Parameter params[] = {
DEFINE_PAR(PressureMotionMinFactor, press_motion_min_factor, PT_DOUBLE, 0, 10.0),
DEFINE_PAR(PressureMotionMaxFactor, press_motion_max_factor, PT_DOUBLE, 0, 10.0),
DEFINE_PAR(GrabEventDevice, grab_event_device, PT_BOOL, 0, 1),
-{ 0, 0, 0, 0, 0 }
+{ NULL, 0, 0, 0, 0 }
};
static void
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 8fd958b..7aa8238 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -113,7 +113,7 @@ install_signal_handler(void)
#endif
for (i = 0; i sizeof(signals) / sizeof(int); i++) {
- if (sigaction(signals[i], act, 0) == -1) {
+ if (sigaction(signals[i], act, NULL) == -1) {
perror(sigaction);
exit(2);
}
[sparse] Fix warnings about non-ANSI function declarations
Signed-off-by: Magnus Kessler [EMAIL PROTECTED]
diff --git a/tools/synclient.c b/tools/synclient.c
index 7977d89..f9e4330 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -240,7 +240,7 @@ is_equal(SynapticsSHM *s1, SynapticsSHM *s2)
}
static double
-get_time()
+get_time(void)
{
struct timeval tv;
gettimeofday(tv, NULL);
@@ -285,7 +285,7 @@ monitor(SynapticsSHM *synshm, int delay)
}
static void
-usage()
+usage(void)
{
fprintf(stderr, Usage: synclient [-m interval] [-h] [-l] [-V] [-?] [var1=value1 [var2=value2] ...]\n);
fprintf(stderr, -m monitor changes to the touchpad state.\n
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 9e3ad98..8fd958b 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -52,7 +52,7 @@ static const char *pid_file;
static unsigned char keyboard_mask[KEYMAP_SIZE];
static void
-usage()
+usage(void)
{
fprintf(stderr, Usage: syndaemon [-i idle-time] [-m poll-delay] [-d] [-t] [-k]\n);
fprintf(stderr, -i How many seconds to wait after the last key press before\n);
@@ -68,7 +68,7 @@ usage()
}
static int
-enable_touchpad()
+enable_touchpad(void)
{
int ret = 0;
if (pad_disabled) {
@@ -89,7 +89,7 @@ signal_handler(int signum)
}
static void
-install_signal_handler()
+install_signal_handler(void)
{
static int signals[] = {
SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT,
@@ -156,7 +156,7 @@ keyboard_activity(Display *display)
* Return non-zero if any physical touchpad button is currently pressed.
*/
static int
-touchpad_buttons_active()
+touchpad_buttons_active(void)
{
int i;
@@ -171,7 +171,7 @@ touchpad_buttons_active()
}
static double
-get_time()
+get_time(void)
{
struct timeval tv;
gettimeofday(tv, NULL);
Only include mipointer.h if supporting ancient XInput ABI version
Signed-off-by: Magnus Kessler [EMAIL PROTECTED]
diff --git a/src/synaptics.c b/src/synaptics.c
index 4b3a022..50bb6de 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -66,9 +66,12 @@
#include stdio.h
#include xf86_OSproc.h
#include xf86Xinput.h
-#include mipointer.h
#include exevents.h
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+#include mipointer.h
+#endif
+
#include synaptics.h
#include synapticsstr.h
#include synaptics-properties.h
signature.asc
Description: This is a digitally signed message part.
___
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
Re: Minimum version of XInput API?
On Thu, Oct 09, 2008 at 08:49:57AM +0100, Magnus Kessler wrote: what's considered the minimum version of the XInput ABI an input driver needs to support these days? I see lots of #if GET_ABI_MAJOR in the xf86-input-synaptics driver that seem to support ancient ABI versions. Is this still appropriate? It depends. 2 is 7.3/1.4 IIRC, and 3 is current. I personally wouldn't be wildly concerned about supporting anything older than 1.4. Cheers, Daniel signature.asc Description: Digital signature ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: 1.4 - 1.5.1 performance regressions
On Thu, 2008-10-09 at 11:02 +0200, Fabio wrote: I noticed some performance regression moving to a newer system with Xserver 1.5.1 from an 1.4 system with both XAA and EXA. Can you try current Git server-1.5-branch? Adam Jackson just backported the reduction of dixLookupPrivate() overhead, which is used extensively by the EXA core at least. If there are still regressions with EXA, I'd be interested in sysprof/oprofile data separately for each regressed case. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: 1.4 - 1.5.1 performance regressions
On Thu, 2008-10-09 at 11:02 +0200, Fabio wrote: I noticed some performance regression moving to a newer system with Xserver 1.5.1 from an 1.4 system with both XAA and EXA. Can you try current Git server-1.5-branch? Adam Jackson just backported the reduction of dixLookupPrivate() overhead, which is used extensively by the EXA core at least. If there are still regressions with EXA, I'd be interested in sysprof/oprofile data separately for each regressed case. I can't update at the moment (I am using prebuilt packages from Ubuntu). Can you point the fix? I don't see it at: http://cgit.freedesktop.org/xorg/xserver/log/?h=server-1.5-branch ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
1.4 - 1.5.1 performance regressions
Hi, I noticed some performance regression moving to a newer system with Xserver 1.5.1 from an 1.4 system with both XAA and EXA. As a benchmark I am using GtkPerf [0] with gtkperf -a -c500 without compiz on a MacBook Pro with a Radeon RV530. While I noticed some improvement going from 1.5 to 1.5.1, 1.5.1 is still slower than 1.4. This may be related to recent report of slowness (thread http://lists.freedesktop.org/archives/xorg/2008-October/039164.html). My reference systems are: 1) 1.4 system: installed system with Ubuntu 8.04 with xserver 1.4, kernel 2.6.24 + backported -ati driver, radeon drm module, libdrm, mesa (used many recent git version); 2) 1.5.1 system: LiveCD Ubuntu 8.10 with xserver 1.5.1, kernel 2.6.27-rc9 recent -ati git snapshot, radeon drm module from kernel, libdrm 2.3.1, mesa 7.1. Does someone is able to reproduce this regressions, maybe changing only the xserver? Is there some known bug? [0] http://gtkperf.sourceforge.net/index.php?page=download GtkPerf benchmark results: 1.4 system, XAA: GtkEntry - time: 0,09 GtkComboBox - time: 4,10 GtkComboBoxEntry - time: 3,47 GtkSpinButton - time: 0,50 GtkProgressBar - time: 0,27 GtkToggleButton - time: 1,48 GtkCheckButton - time: 1,55 GtkRadioButton - time: 1,88 GtkTextView - Add text - time: 11,63 GtkTextView - Scroll - time: 7,23 GtkDrawingArea - Lines - time: 1,13 GtkDrawingArea - Circles - time: 1,84 GtkDrawingArea - Text - time: 29,33 GtkDrawingArea - Pixbufs - time: 3,57 --- Total time: 68,07 1.5.1 system, XAA: GtkEntry - time: 0,15 GtkComboBox - time: 6,81 GtkComboBoxEntry - time: 3,57 GtkSpinButton - time: 0,99 GtkProgressBar - time: 0,49 GtkToggleButton - time: 0,83 GtkCheckButton - time: 0,44 GtkRadioButton - time: 1,47 GtkTextView - Add text - time: 13,45 GtkTextView - Scroll - time: 2,52 GtkDrawingArea - Lines - time: 2,49 GtkDrawingArea - Circles - time: 3,39 GtkDrawingArea - Text - time: 45,16 GtkDrawingArea - Pixbufs - time: 4,36 --- Total time: 86,12 1.4 system, EXA: GtkEntry - time: 0,09 GtkComboBox - time: 3,83 GtkComboBoxEntry - time: 2,96 GtkSpinButton - time: 0,51 GtkProgressBar - time: 0,27 GtkToggleButton - time: 1,34 GtkCheckButton - time: 1,44 GtkRadioButton - time: 1,79 GtkTextView - Add text - time: 11,68 GtkTextView - Scroll - time: 2,84 GtkDrawingArea - Lines - time: 2,43 GtkDrawingArea - Circles - time: 1,86 GtkDrawingArea - Text - time: 3,89 GtkDrawingArea - Pixbufs - time: 0,30 --- Total time: 35,22 1.5.1 system, EXA: GtkEntry - time: 0,16 GtkComboBox - time: 6,52 GtkComboBoxEntry - time: 3,93 GtkSpinButton - time: 0,83 GtkProgressBar - time: 0,40 GtkToggleButton - time: 1,19 GtkCheckButton - time: 0,55 GtkRadioButton - time: 1,45 GtkTextView - Add text - time: 13,90 GtkTextView - Scroll - time: 2,23 GtkDrawingArea - Lines - time: 5,48 GtkDrawingArea - Circles - time: 4,04 GtkDrawingArea - Text - time: 6,94 GtkDrawingArea - Pixbufs - time: 0,36 --- Total time: 47,97 ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: 1.4 - 1.5.1 performance regressions
On Thu, Oct 09, 2008 at 11:41:21AM +0200, Michel Dänzer wrote: http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.5-branchid=8ef37c194fa08d3911095299413a42a01162b078 Well, doesn't it need also the patch that converts all DevPrivateKey key=key; to static int keyIndex; DevPrivateKey key=keyIndex ? -- Lukáš Hejtmánek ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: 1.4 - 1.5.1 performance regressions
On Thu, 2008-10-09 at 15:47 +0200, Lukas Hejtmanek wrote: On Thu, Oct 09, 2008 at 11:41:21AM +0200, Michel Dänzer wrote: http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.5-branchid=8ef37c194fa08d3911095299413a42a01162b078 Well, doesn't it need also the patch that converts all DevPrivateKey key=key; to static int keyIndex; DevPrivateKey key=keyIndex ? You mean commit 4017d3190234e189a0bbd33193a148d4d3c7556b? That's already in 1.4.99.901. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: XTerm exits immediatly with self-compiled xorg
On Thu, Oct 9, 2008 at 12:38 AM, Michel Dänzer [EMAIL PROTECTED] wrote: On Wed, 2008-10-08 at 18:59 +0200, Clemens Eisserer wrote: I am currently trying to build xorg from git, and it mostly works except some font stuff. When I try to start xterm it quits immediatly with the following messages: The XKEYBOARD keymap compiler (xkbcomp) reports:^M Warning: Type ONE_LEVEL has 1 levels, but RALT has 2 symbols^M Ignoring extra symbols^M Errors from xkbcomp are not fatal to the X server^M Warning: Cannot convert string nil2 to type FontStruct^M - Xterm I think you need to build xserver with --disable-builtin-fonts. Or just tell xterm to use XFT. Try xterm -fa Monospace or echo '*VT100*faceName: Monospace' ~/.Xresources -- Dan ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: 1.4 - 1.5.1 performance regressions
On Thu, 2008-10-09 at 11:14 +0200, Michel Dänzer wrote: On Thu, 2008-10-09 at 11:02 +0200, Fabio wrote: I noticed some performance regression moving to a newer system with Xserver 1.5.1 from an 1.4 system with both XAA and EXA. Can you try current Git server-1.5-branch? Adam Jackson just backported the reduction of dixLookupPrivate() overhead, which is used extensively by the EXA core at least. If there are still regressions with EXA, I'd be interested in sysprof/oprofile data separately for each regressed case. Yeah, but I'm unlikely to actually include it in 1.5.2. It looks like it's enough of a change from the 1.5.0 devprivate semantics to be considered an ABI change. - ajax signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: Looking for registers reference for Oak OTI64111 (Spitfire)
On Tue, 2008-10-07 at 19:28 -0500, Alex Villacís Lasso wrote: Recently I dug up a very old graphics card, an Oak Spitfire OTI-64111 by Oak Technologies. After looking up information for it in Google, I found that there is no specific driver for xorg (although there are plenty of mirrors for windows drivers). I want to familiarize myself with graphics driver programming, and I thought that writing the xorg driver for Oak 64111 would be a good way to get some practice with xorg driver development. However, I have had a hard time digging up register references for this particular video card. Does anybody here know of any documentation about the Oak 64111 (register references and such) that could be useful to write a driver for this card? There was an oak driver in XFree86 3.x, with 2D acceleration even, although it appears to have been for the ISA and VLB variants only. You can grab it from here: ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/X336src-1.tgz And the driver is down in xc/programs/Xserver/hw/xfree86/vga256/drivers/oak Many of the early PCI chips had started life as ISA chips, and their programming model didn't really change much when the bus changed, so that's probably a good start. If the card works with the vesa driver at all, a good exercise is to build the X server with x86emu debugging turned on and inspect what the various VBE calls do. Cross-referencing that trace with the registers mentioned in the old xfree86 driver should at least tell you whether the PCI cards were like the ISA ones. See the code around the PRINT_PORT macro in hw/xfree86/int10/helper_exec.c in the X server. I think ATI ended up buying Oak but I would be utterly utterly stunned if they had any of the documentation still. I wouldn't even bother asking. - ajax signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: XTerm exits immediatly with self-compiled xorg
On Thu, 2008-10-09 at 09:38 +0200, Michel Dänzer wrote: On Wed, 2008-10-08 at 18:59 +0200, Clemens Eisserer wrote: I am currently trying to build xorg from git, and it mostly works except some font stuff. When I try to start xterm it quits immediatly with the following messages: The XKEYBOARD keymap compiler (xkbcomp) reports:^M Warning: Type ONE_LEVEL has 1 levels, but RALT has 2 symbols^M Ignoring extra symbols^M Errors from xkbcomp are not fatal to the X server^M Warning: Cannot convert string nil2 to type FontStruct^M - Xterm I think you need to build xserver with --disable-builtin-fonts. (FWIW, I don't think 'only builtin fonts or only non-builtin fonts' is a useful choice) It's not. I've got some libXfont changes on the back burner, but basically what it'll come down to is that you just ask libXfont to turn on all its renderers and it'll do it, and then you can customize _that_ at build time to have either only the builtin FPE, or more. In addition, freetype has renderers for all font formats we care about, so we can drop our old buggy crap and make it someone else's problem. Hooray! There's some minor detail to be worked out around compressed fonts but nothing serious. http://cgit.freedesktop.org/~ajax/libXfont/log/?h=libXfont-2.0-branch - ajax signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [PATCH] Xi: check all handlers before applying property changes.
Peter Hutterer wrote: right now, the properties are documented in the header files that define their names. They should eventually be added to the man pages, once they settle down a bit. Fine, I'll be including a header. So based on the current implementation (the one that is in master), what's your concrete proposal then? Just leave it an beat up anyone trying to double-handle a property? Not that I would be opposed to that, but it's likely going to be me who's going to be beaten up :) OK, I'm summing up: One non-ignoring handler is invoked at max. For this we have to differentiate the RC. 'beat me up' When a handler is invoked, it may decide to call a new function which allows it to pass through to handlers AFTER itself. A logical complement would be the ability to register handlers at head and tail. That way, the one who double-handles a prop isn't just in charge, he's also in control. Which increases chances he won't screw it, or at least he can do something about it (short of hackery). I admit you can do more awkward stuff like this, but a 'evil' driver isn't something to protect from anyway. How does that sound? ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
xf86-video-xgi and xf86-video-xgixp
Ian, These drivers don't build due to needing TLC for xf86Version.h problems. Are you still maintaining these? If not, the maintainer's file presumably should be updated... Best Regards, - Jim -- Jim Gettys [EMAIL PROTECTED] One Laptop Per Child ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: 1.4 - 1.5.1 performance regressions
On Thu, 2008-10-09 at 11:35 +0200, Fabio wrote: On Thu, 2008-10-09 at 11:02 +0200, Fabio wrote: I noticed some performance regression moving to a newer system with Xserver 1.5.1 from an 1.4 system with both XAA and EXA. Can you try current Git server-1.5-branch? Adam Jackson just backported the reduction of dixLookupPrivate() overhead, which is used extensively by the EXA core at least. If there are still regressions with EXA, I'd be interested in sysprof/oprofile data separately for each regressed case. I can't update at the moment (I am using prebuilt packages from Ubuntu). Can you point the fix? I don't see it at: http://cgit.freedesktop.org/xorg/xserver/log/?h=server-1.5-branch http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.5-branchid=8ef37c194fa08d3911095299413a42a01162b078 -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: XTerm exits immediatly with self-compiled xorg
I think you need to build xserver with --disable-builtin-fonts. Thanks a lot, that worked :) /etc/fonts/ is configuration for the fontconfig library, not the X server. Ah, ok. Thanks, Clemens ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
[PATCH] RFC: remove support for XInput ABI 0.x from xf86-input-synaptics driver
This series of patches removes support for the ancient XInput ABI 0.x from
the synaptics driver, which in turn makes some more cleanup patches
possible. There seems to be a consensus that supporting XInput ABI older
than 2.x is not really needed any more [1].
Caveat: do we need some changes to the configure script to detect building
against a very old X server?
Cheers,
Magnus
[1] http://lists.freedesktop.org/archives/xorg/2008-October/039276.html
Remove support for XInput ABI 0.x
Signed-off-by: Magnus Kessler [EMAIL PROTECTED]
diff --git a/src/synaptics.c b/src/synaptics.c
index 50bb6de..0286af8 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -68,10 +68,6 @@
#include xf86Xinput.h
#include exevents.h
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-#include mipointer.h
-#endif
-
#include synaptics.h
#include synapticsstr.h
#include synaptics-properties.h
@@ -531,10 +527,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
local-private_flags = 0;
local-flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
local-conf_idev = dev;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-local-motion_history_proc = xf86GetMotionEvents;
-local-history_size= 0;
-#endif
local-always_core_feedback= 0;
xf86Msg(X_INFO, Synaptics touchpad driver version %s\n, PACKAGE_VERSION);
@@ -585,10 +577,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
goto SetupProc_fail;
}
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-local-history_size = xf86SetIntOption(opts, HistorySize, 0);
-#endif
-
xf86ProcessCommonOptions(local, local-options);
local-flags |= XI86_CONFIGURED;
@@ -760,17 +748,11 @@ DeviceInit(DeviceIntPtr dev)
InitPointerDeviceStruct((DevicePtr)dev, map,
SYN_MAX_BUTTONS,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- miPointerGetMotionEvents,
-#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) 3
GetMotionHistory,
#endif
SynapticsCtrl,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- miPointerGetMotionBufferSize()
-#else
GetMotionHistorySize(), 2
-#endif
);
/* X valuator */
if (priv-minx priv-maxx)
@@ -785,10 +767,6 @@ DeviceInit(DeviceIntPtr dev)
xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
xf86InitValuatorDefaults(dev, 1);
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-xf86MotionHistoryAllocate(local);
-#endif
-
if (!alloc_param_data(local))
return !Success;
Remove all uses of DBG macro.
DBG macro was only supported with XInput ABI 0.x
Signed-off-by: Magnus Kessler [EMAIL PROTECTED]
diff --git a/src/synaptics.c b/src/synaptics.c
index 0286af8..36c510b 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -97,10 +97,6 @@ typedef enum {
#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 1
-#define DBG(a,b)
-#endif
-
/*
* Forward declaration
/
@@ -570,8 +566,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
goto SetupProc_fail;
priv-comm.buffer = XisbNew(local-fd, 200);
-DBG(9, XisbTrace(priv-comm.buffer, 1));
-
if (!QueryHardware(local)) {
xf86Msg(X_ERROR, %s Unable to query/initialize Synaptics hardware.\n, local-name);
goto SetupProc_fail;
@@ -626,15 +620,6 @@ static void SynapticsUnInit(InputDriverPtr drv,
static void
SynapticsCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
{
-DBG(3, ErrorF(SynapticsCtrl called.\n));
-/*
- pInfo = device-public.devicePrivate;
- pMse = pInfo-private;
-
- pMse-num = ctrl-num;
- pMse-den = ctrl-den;
- pMse-threshold = ctrl-threshold;
-*/
}
static Bool
@@ -668,8 +653,6 @@ DeviceOn(DeviceIntPtr dev)
LocalDevicePtr local = (LocalDevicePtr) dev-public.devicePrivate;
SynapticsPrivate *priv = (SynapticsPrivate *) (local-private);
-DBG(3, ErrorF(Synaptics DeviceOn called\n));
-
SetDeviceAndProtocol(local);
local-fd = xf86OpenSerial(local-options);
if (local-fd == -1) {
@@ -702,8 +685,6 @@ DeviceOff(DeviceIntPtr dev)
LocalDevicePtr local = (LocalDevicePtr) dev-public.devicePrivate;
SynapticsPrivate *priv = (SynapticsPrivate *) (local-private);
-DBG(3, ErrorF(Synaptics DeviceOff called\n));
-
if (local-fd != -1) {
TimerFree(priv-timer);
priv-timer = NULL;
@@ -739,8 +720,6 @@ DeviceInit(DeviceIntPtr dev)
unsigned char map[SYN_MAX_BUTTONS + 1];
int i;
-DBG(3, ErrorF(Synaptics DeviceInit called\n));
-
for (i = 0; i = SYN_MAX_BUTTONS; i++)
map[i] = i;
@@ -1101,33 +1080,26 @@ SelectTapButton(SynapticsPrivate *priv, edge_type edge)
default:
switch (edge) {
case RIGHT_TOP_EDGE:
- DBG(7, ErrorF(right top edge\n));
tap = RT_TAP;
Re: [PATCH] xf86-input-synaptics: update .gitignore
On Thu, Oct 09, 2008 at 11:41:27PM +0100, Magnus Kessler wrote: The attached patch lets git ignore pkgconfig files. Thanks, pushed. Cheers, Peter ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
