Use a single abi version variable

Simplify versioning by using a single coded variable.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

3 files changed, 6 insertions, 15 deletions

diff --git a/include/evemu.h b/include/evemu.h
index 2811ff9..4f1078f 100644
--- a/include/evemu.h
+++ b/include/evemu.h
@@ -33,14 +33,12 @@
 #include <errno.h>
 #include <linux/input.h>
 
-#define EVEMU_VERSION_MAJOR	1
-#define EVEMU_VERSION_MINOR	1
+#define EVEMU_VERSION		0x00010000
 
 struct evemu_device *evemu_new(const char *name);
 void evemu_delete(struct evemu_device *dev);
 
-int evemu_get_version_major(const struct evemu_device *dev);
-int evemu_get_version_minor(const struct evemu_device *dev);
+unsigned int evemu_get_version(const struct evemu_device *dev);
 
 const char *evemu_get_name(const struct evemu_device *dev);
 
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 @@
 #define EVPLAY_NBYTES	((EVPLAY_NBITS + 7) / 8)
 
 struct evemu_device {
-	int version_major, version_minor;
+	unsigned int version;
 	char name[UINPUT_MAX_NAME_SIZE];
 	struct input_id id;
 	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)
 {
 	struct evemu_device *dev = calloc(1, sizeof(struct evemu_device));
 
-	dev->version_major = EVEMU_VERSION_MAJOR;
-	dev->version_minor = EVEMU_VERSION_MINOR;
-
+	dev->version = EVEMU_VERSION;
 	if (name && strlen(name) < sizeof(dev->name))
 		strcpy(dev->name, name);
 
@@ -90,14 +88,9 @@ void evemu_delete(struct evemu_device *dev)
 	free(dev);
 }
 
-int evemu_get_version_major(const struct evemu_device *dev)
-{
-	return dev->version_major;
-}
-
-int evemu_get_version_minor(const struct evemu_device *dev)
+unsigned int evemu_get_version(const struct evemu_device *dev)
 {
-	return dev->version_minor;
+	return dev->version;
 }
 
 const char *evemu_get_name(const struct evemu_device *dev)