fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-24 01:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify getter/setter macros

Browse source 
Now that we've dropped the deprecated API, we can simplify the macros a bit.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2013-08-23 10:49:56 +10:00
parent b7501655c0
commit 13ba7712a6
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libevdev/libevdev.c
View file

@ -785,16 +785,16 @@ STRING_SETTER(phys);
STRING_SETTER(uniq); STRING_SETTER(uniq);
#define PRODUCT_GETTER(name, field) \ #define PRODUCT_GETTER(name) \
int libevdev_get_##name(const struct libevdev *dev) \ int libevdev_get_id_##name(const struct libevdev *dev) \
{ \ { \
return dev->ids.field; \ return dev->ids.name; \
} }
PRODUCT_GETTER(id_product, product); PRODUCT_GETTER(product);
PRODUCT_GETTER(id_vendor, vendor); PRODUCT_GETTER(vendor);
PRODUCT_GETTER(id_bustype, bustype); PRODUCT_GETTER(bustype);
PRODUCT_GETTER(id_version, version); PRODUCT_GETTER(version);
#define PRODUCT_SETTER(field) \ #define PRODUCT_SETTER(field) \
void libevdev_set_id_##field(struct libevdev *dev, int field) \ void libevdev_set_id_##field(struct libevdev *dev, int field) \
@ -985,18 +985,18 @@ libevdev_get_abs_info(const struct libevdev *dev, unsigned int code)
return &dev->abs_info[code]; return &dev->abs_info[code];
} }
#define ABS_GETTER(name, field) \ #define ABS_GETTER(name) \
int libevdev_get_abs_##name(const struct libevdev *dev, unsigned int code) \ int libevdev_get_abs_##name(const struct libevdev *dev, unsigned int code) \
{ \ { \
const struct input_absinfo *absinfo = libevdev_get_abs_info(dev, code); \ const struct input_absinfo *absinfo = libevdev_get_abs_info(dev, code); \
return absinfo ? absinfo->field : 0; \ return absinfo ? absinfo->name : 0; \
} }
ABS_GETTER(maximum, maximum); ABS_GETTER(maximum);
ABS_GETTER(minimum, minimum); ABS_GETTER(minimum);
ABS_GETTER(fuzz, fuzz) ABS_GETTER(fuzz);
ABS_GETTER(flat, flat) ABS_GETTER(flat);
ABS_GETTER(resolution, resolution) ABS_GETTER(resolution);
#define ABS_SETTER(field) \ #define ABS_SETTER(field) \
void libevdev_set_abs_##field(struct libevdev *dev, unsigned int code, int val) \ void libevdev_set_abs_##field(struct libevdev *dev, unsigned int code, int val) \