summaryrefslogtreecommitdiffstats
path: root/include/hardware/hardware.h
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-08-28 15:23:58 -0700
committerJesse Hall <jessehall@google.com>2012-08-29 10:36:36 -0700
commit3f5b522ac9a472de756c08b16f357acd6dc26e34 (patch)
tree70a4a73953b9d5cf84d5ffbf3c922e11d56e5150 /include/hardware/hardware.h
parentb8b6439598ecc5faecfce8d43f3418b057714b4c (diff)
downloadhardware_libhardware-3f5b522ac9a472de756c08b16f357acd6dc26e34.zip
hardware_libhardware-3f5b522ac9a472de756c08b16f357acd6dc26e34.tar.gz
hardware_libhardware-3f5b522ac9a472de756c08b16f357acd6dc26e34.tar.bz2
Encode header version in api versions
Change-Id: I0216bef3ba0cfaed2fe908f735e546d0734c0b13
Diffstat (limited to 'include/hardware/hardware.h')
-rw-r--r--include/hardware/hardware.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h
index 78c4572..416ae39 100644
--- a/include/hardware/hardware.h
+++ b/include/hardware/hardware.h
@@ -37,6 +37,12 @@ __BEGIN_DECLS
#define HARDWARE_MAKE_API_VERSION(maj,min) \
((((maj) & 0xff) << 8) | ((min) & 0xff))
+#define HARDWARE_MAKE_API_VERSION_2(maj,min,hdr) \
+ ((((maj) & 0xff) << 24) | (((min) & 0xff) << 16) | ((hdr) & 0xffff))
+#define HARDWARE_API_VERSION_2_MAJ_MIN_MASK 0xffff0000
+#define HARDWARE_API_VERSION_2_HEADER_MASK 0x0000ffff
+
+
/*
* The current HAL API version.
*
@@ -60,11 +66,13 @@ __BEGIN_DECLS
* Use this macro to set the hw_module_t.module_api_version field.
*/
#define HARDWARE_MODULE_API_VERSION(maj,min) HARDWARE_MAKE_API_VERSION(maj,min)
+#define HARDWARE_MODULE_API_VERSION_2(maj,min,hdr) HARDWARE_MAKE_API_VERSION_2(maj,min,hdr)
/*
* Use this macro to set the hw_device_t.version field
*/
#define HARDWARE_DEVICE_API_VERSION(maj,min) HARDWARE_MAKE_API_VERSION(maj,min)
+#define HARDWARE_DEVICE_API_VERSION_2(maj,min,hdr) HARDWARE_MAKE_API_VERSION_2(maj,min,hdr)
struct hw_module_t;
struct hw_module_methods_t;