commit 67bb01cf91f3a22d90687cf2ec1d2644ceafe3e3
author Greg Kaiser <gkaiser@google.com> Tue Mar 29 19:30:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 19:30:41 2016 +0000
tree 2eee3e4526f20137046a33b80875f0471a885b13
parent 7d2576fca017f0073feb3e1659ac87342f7075e8
parent 5600a6a14cec5aa7a09ad10d5a1299a60e3de3c7

Merge "context_hub: Fix version defines" into nyc-dev

include/hardware/context_hub.h

diff --git a/include/hardware/context_hub.h b/include/hardware/context_hub.h
index aa7e253..79054d2 100644
--- a/include/hardware/context_hub.h
+++ b/include/hardware/context_hub.h
@@ -46,8 +46,13 @@
 
 /*****************************************************************************/
 
-#define CONTEXT_HUB_HEADER_VERSION          1
-#define CONTEXT_HUB_DEVICE_API_VERSION_1_0  HARDWARE_DEVICE_API_VERSION_2(1, 0, CONTEXT_HUB_HEADER_VERSION)
+#define CONTEXT_HUB_HEADER_MAJOR_VERSION          1
+#define CONTEXT_HUB_HEADER_MINOR_VERSION          0
+#define CONTEXT_HUB_DEVICE_API_VERSION \
+     HARDWARE_DEVICE_API_VERSION(CONTEXT_HUB_HEADER_MAJOR_VERSION, \
+                                 CONTEXT_HUB_HEADER_MINOR_VERSION)
+
+#define CONTEXT_HUB_DEVICE_API_VERSION_1_0  HARDWARE_DEVICE_API_VERSION(1, 0)
 
 /**
  * The id of this module