From: Constantin Musca <constantin.musca@intel.com>
Date: Mon, 23 Nov 2015 15:30:55 +0000 (+0200)
Subject: sensors: iio: remove events dependency if __NO_EVENTS__ is set
X-Git-Tag: android-x86-7.1-r1~9
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fhardware-intel-libsensors.git;a=commitdiff_plain;h=1b0d964afc5a4ded60b568e0ed751c9b29441369;hp=8102947aec77bf3eadb85a73a0ddc4910f04a209

sensors: iio: remove events dependency if __NO_EVENTS__ is set

Add option/cflag for disabling the IIO events support.

Change-Id: I64502530275f4797ddb652f04237518a047bc0f6
Signed-off-by: Constantin Musca <constantin.musca@intel.com>
---

diff --git a/Android.mk b/Android.mk
index f512dd3..d3217f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,6 +44,9 @@ LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
+ifeq ($(NO_IIO_EVENTS),true)
+LOCAL_CFLAGS += -D__NO_EVENTS__
+endif
 LOCAL_LDFLAGS := -Wl,--gc-sections
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_PRELINK_MODULE := false
diff --git a/control.c b/control.c
index 9426d4d..551de9a 100644
--- a/control.c
+++ b/control.c
@@ -33,7 +33,9 @@
 #include "calibration.h"
 #include "description.h"
 #include "filtering.h"
+#ifndef __NO_EVENTS__
 #include <linux/iio/events.h>
+#endif
 #include <errno.h>
 
 /* Currently active sensors count, per device */
@@ -1107,6 +1109,9 @@ int sensor_activate (int s, int enabled, int from_virtual)
 			}
 
 			/* Note: poll-mode fds are not readable */
+#ifdef __NO_EVENTS__
+		}
+#else
 		} else if (sensor[s].mode == MODE_EVENT) {
 			event_fd = events_fd[dev_num];
 
@@ -1138,6 +1143,7 @@ int sensor_activate (int s, int enabled, int from_virtual)
 				device_fd[dev_num] = -1;
 			}
 		}
+#endif
 	}
 
 	/* Ensure that on-change sensors send at least one event after enable */
@@ -1315,6 +1321,7 @@ static int integrate_device_report_from_dev(int dev_num, int fd)
 	return 0;
 }
 
+#ifndef __NO_EVENTS__
 static int integrate_device_report_from_event(int dev_num, int fd)
 {
 	int len, s;
@@ -1353,6 +1360,7 @@ static int integrate_device_report_from_event(int dev_num, int fd)
 		}
 	return 0;
 }
+#endif
 
 static int integrate_device_report(int dev_num)
 {
@@ -1363,11 +1371,13 @@ static int integrate_device_report(int dev_num)
 		return -1;
 	}
 
+#ifndef __NO_EVENTS__
 	if (events_fd[dev_num] != -1) {
 		ret = integrate_device_report_from_event(dev_num, events_fd[dev_num]);
 		if (ret < 0)
 			return ret;
 	}
+#endif
 
 	if (device_fd[dev_num] != -1)
 		ret = integrate_device_report_from_dev(dev_num, device_fd[dev_num]);
@@ -1421,6 +1431,7 @@ static int propagate_sensor_report (int s, sensors_event_t *data)
 	data->type	= sensor_desc[s].type;	/* sensor_desc[s].type can differ from sensor[s].type ; internal types are remapped */
 	data->timestamp = sensor[s].report_ts;
 
+#ifndef __NO_EVENTS__
 	if (sensor[s].mode == MODE_EVENT) {
 		ALOGV("Reporting event\n");
 		/* Android requires events to return 1.0 */
@@ -1441,6 +1452,7 @@ static int propagate_sensor_report (int s, sensors_event_t *data)
 		data->data[2] = 0.0;
 		return 1;
 	}
+#endif
 
 	/* Convert the data into the expected Android-level format */