diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2010-12-22 08:02:35 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-12-22 08:02:35 +0100 |
| commit | 3c0cb716fa597f1613987262a2733817534d2140 (patch) | |
| tree | ed485376657e139a74439745d0846e981fafbc81 /src | |
| parent | 12660c8e1fea4550b6f9b0e3d29d8c6a72d47c3f (diff) | |
Use a single abi version variable
Simplify versioning by using a single coded variable.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src')
| -rw-r--r-- | src/evemu-impl.h | 2 | ||||
| -rw-r--r-- | src/evemu.c | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/evemu-impl.h b/src/evemu-impl.h index 1112e92..0d3489e 100644 --- a/src/evemu-impl.h +++ b/src/evemu-impl.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) | 8 | #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8) |
| 9 | 9 | ||
| 10 | struct evemu_device { | 10 | struct evemu_device { |
| 11 | int version_major, version_minor; | 11 | unsigned int version; |
| 12 | char name[UINPUT_MAX_NAME_SIZE]; | 12 | char name[UINPUT_MAX_NAME_SIZE]; |
| 13 | struct input_id id; | 13 | struct input_id id; |
| 14 | unsigned char prop[EVPLAY_NBYTES]; | 14 | unsigned char prop[EVPLAY_NBYTES]; |
diff --git a/src/evemu.c b/src/evemu.c index 80257c6..553e765 100644 --- a/src/evemu.c +++ b/src/evemu.c | |||
| @@ -70,9 +70,7 @@ struct evemu_device *evemu_new(const char *name) | |||
| 70 | { | 70 | { |
| 71 | struct evemu_device *dev = calloc(1, sizeof(struct evemu_device)); | 71 | struct evemu_device *dev = calloc(1, sizeof(struct evemu_device)); |
| 72 | 72 | ||
| 73 | dev->version_major = EVEMU_VERSION_MAJOR; | 73 | dev->version = EVEMU_VERSION; |
| 74 | dev->version_minor = EVEMU_VERSION_MINOR; | ||
| 75 | |||
| 76 | if (name && strlen(name) < sizeof(dev->name)) | 74 | if (name && strlen(name) < sizeof(dev->name)) |
| 77 | strcpy(dev->name, name); | 75 | strcpy(dev->name, name); |
| 78 | 76 | ||
| @@ -90,14 +88,9 @@ void evemu_delete(struct evemu_device *dev) | |||
| 90 | free(dev); | 88 | free(dev); |
| 91 | } | 89 | } |
| 92 | 90 | ||
| 93 | int evemu_get_version_major(const struct evemu_device *dev) | 91 | unsigned int evemu_get_version(const struct evemu_device *dev) |
| 94 | { | ||
| 95 | return dev->version_major; | ||
| 96 | } | ||
| 97 | |||
| 98 | int evemu_get_version_minor(const struct evemu_device *dev) | ||
| 99 | { | 92 | { |
| 100 | return dev->version_minor; | 93 | return dev->version; |
| 101 | } | 94 | } |
| 102 | 95 | ||
| 103 | const char *evemu_get_name(const struct evemu_device *dev) | 96 | const char *evemu_get_name(const struct evemu_device *dev) |
