XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-03-26 02:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename NBITS to NLONGS to reflect its actual meaning

Browse Source 
NBITS really convers the number of bits passed as its argument
into a number of longs. This is somewhat atypical of many
function-like-macro names. Rename it to NLONGS.

Signed-off-by: Matt Helsley <matt.helsley@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Matt Helsley
2009-01-11 18:04:40 -08:00
committed by Peter Hutterer
parent dd1752ce3f
commit d3fd42d864
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/evdev.c
View File

@@ -1223,11 +1223,11 @@ EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare)
int i;
char name[1024] = {0};
long bitmask[NBITS(EV_MAX)] = {0};
long key_bitmask[NBITS(KEY_MAX)] = {0};
long rel_bitmask[NBITS(REL_MAX)] = {0};
long abs_bitmask[NBITS(ABS_MAX)] = {0};
long led_bitmask[NBITS(LED_MAX)] = {0};
long bitmask[NLONGS(EV_MAX)] = {0};
long key_bitmask[NLONGS(KEY_MAX)] = {0};
long rel_bitmask[NLONGS(REL_MAX)] = {0};
long abs_bitmask[NLONGS(ABS_MAX)] = {0};
long led_bitmask[NLONGS(LED_MAX)] = {0};
struct input_absinfo absinfo[ABS_MAX];
if (ioctl(pInfo->fd,
@@ -1323,9 +1323,9 @@ error:
static int
EvdevProbe(InputInfoPtr pInfo)
{
long key_bitmask[NBITS(KEY_MAX)] = {0};
long rel_bitmask[NBITS(REL_MAX)] = {0};
long abs_bitmask[NBITS(ABS_MAX)] = {0};
long key_bitmask[NLONGS(KEY_MAX)] = {0};
long rel_bitmask[NLONGS(REL_MAX)] = {0};
long abs_bitmask[NLONGS(ABS_MAX)] = {0};
int i, has_axes, has_keys, num_buttons, has_scroll;
int kernel24 = 0;
EvdevPtr pEvdev = pInfo->private;

14
src/evdev.h
View File

@@ -47,7 +47,9 @@
#endif
#define LONG_BITS (sizeof(long) * 8)
#define NBITS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
/* Number of longs needed to hold the given number of bits */
#define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
/* axis specific data for wheel emulation */
typedef struct {
@@ -121,11 +123,11 @@ typedef struct {
/* Cached info from device. */
char name[1024];
long bitmask[NBITS(EV_MAX)];
long key_bitmask[NBITS(KEY_MAX)];
long rel_bitmask[NBITS(REL_MAX)];
long abs_bitmask[NBITS(ABS_MAX)];
long led_bitmask[NBITS(LED_MAX)];
long bitmask[NLONGS(EV_MAX)];
long key_bitmask[NLONGS(KEY_MAX)];
long rel_bitmask[NLONGS(REL_MAX)];
long abs_bitmask[NLONGS(ABS_MAX)];
long led_bitmask[NLONGS(LED_MAX)];
struct input_absinfo absinfo[ABS_MAX];
/* minor/major number */