Attachment 4394 Details for Bug 5658 – Fix bit fiddling code

[patch] Fix bit fiddling code

evdev.patch (text/plain), 1.07 KB, created by Juergen Kreileder on 2006-01-20 00:07:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juergen Kreileder

Created: 2006-01-20 00:07:37 UTC

Size: 1.07 KB

patch

obsolete

>--- orig/xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c	2005-12-29 03:35:09.000000000 +0100
>+++ xorg-x11-6.9.0.dfsg.1/xc/programs/Xserver/hw/xfree86/input/evdev/evdev.c	2006-01-18 19:31:46.000000000 +0100
>@@ -199,7 +199,11 @@ EvdevReadInput(InputInfoPtr pInfo)
>         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
> }
> 
>-#define TestBit(bit, array) (array[(bit) / 8] & (1 << ((bit) % 8)))
>+#define BITS_PER_LONG (sizeof(long) * 8)
>+#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
>+#define OFF(x)  ((x)%BITS_PER_LONG)
>+#define LONG(x) ((x)/BITS_PER_LONG)
>+#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
> 
> static void
> EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
>@@ -565,8 +569,8 @@ EvdevConvert(InputInfoPtr pInfo, int fir
> static int
> EvdevProbe(InputInfoPtr pInfo)
> {
>-    char key_bitmask[(KEY_MAX + 7) / 8];
>-    char rel_bitmask[(REL_MAX + 7) / 8];
>+    unsigned long key_bitmask[NBITS(KEY_MAX)];
>+    unsigned long rel_bitmask[NBITS(REL_MAX)];
>     int i, has_axes, has_buttons, has_keys;
>     EvdevPtr pEvdev = pInfo->private;
>

Actions: View | Splinter Review

Attachments on bug 5658: 4394

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.