diff options
author | Zephaniah E. Hull <warp@aehallh.com> | 2006-05-14 11:55:50 +0000 |
---|---|---|
committer | Zephaniah E. Hull <warp@aehallh.com> | 2006-05-14 11:55:50 +0000 |
commit | e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591 (patch) | |
tree | 906e82e20eb2cc084f92a060e9dec27d854e6adc /src/evdev.c | |
parent | xf86-input-evdev v1.1.2 (diff) | |
download | xf86-input-evdev-e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591.tar.gz xf86-input-evdev-e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591.tar.bz2 xf86-input-evdev-e9c60da89a9c55b81b2dedcf6ee3d1aefb4ff591.zip |
Tweak credits and references.
Change the longs to unsigned longs in the bitfields.
Cleanup our includes.
Stop pulling in asm/types.h and asm/bitops.h.
Conditionally define the stuff that used to come from the above, including
our own test_bit, set_bit and clear_bit.
Change the longs to unsigned longs in the bitfields.
Change the longs to unsigned longs in the bitfields.
Use the bitop defines in evdev.h properly.
Change the longs to unsigned longs in the bitfields.
Change the longs to unsigned longs in the bitfields.
Use the bitop defines in evdev.h properly.
Change the longs to unsigned longs in the bitfields.
Use the bitop defines in evdev.h properly.
Add HPPA/HPPA64 entries. (Thanks to Fabio M. Di Nitto
<fabbione@ubuntu.com>)
Diffstat (limited to 'src/evdev.c')
-rw-r--r-- | src/evdev.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/evdev.c b/src/evdev.c index ab9325e..69deef6 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -61,8 +61,6 @@ #include <X11/XF86keysym.h> #include <X11/extensions/XIproto.h> -#include <string.h> - #include "evdev.h" #include <xf86.h> @@ -328,7 +326,7 @@ EvdevNew(evdevDriverPtr driver, evdevDevicePtr device) } static void -EvdevParseBits (char *in, long *out, int len) +EvdevParseBits (char *in, unsigned long *out, int len) { unsigned long v[2]; int n, i, max_bits = len * BITS_PER_LONG; @@ -351,7 +349,7 @@ EvdevParseBits (char *in, long *out, int len) } static void -EvdevParseBitOption (char *opt, long *all, long *not, long *any, int len) +EvdevParseBitOption (char *opt, unsigned long *all, unsigned long *not, unsigned long *any, int len) { char *cur, *next; @@ -395,7 +393,7 @@ EvdevCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) EvdevParseBitOption (tmp, pEvdev->all_bits.field, \ pEvdev->not_bits.field, \ pEvdev->any_bits.field, \ - sizeof(pEvdev->not_bits.field) / sizeof (long)); \ + sizeof(pEvdev->not_bits.field) / sizeof (unsigned long)); \ free (tmp); \ } bitoption(ev); |