Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into mr1

[android-x86/hardware-intel-libsensors.git] / control.h

diff --git a/control.h b/control.h
index b69dd49..19abb22 100644 (file)
--- a/control.h
+++ b/control.h
@@ -1,15 +1,18 @@
 /*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  */
 
 #ifndef __CONTROL_H__
 #define __CONTROL_H__
 
-int    sensor_activate         (int handle, int enabled);
+int    sensor_activate         (int handle, int enabled, int from_virtual);
 int    sensor_set_delay        (int handle, int64_t ns);
-int    sensor_poll             (sensors_event_t* data, int count);
+int    sensor_poll             (sensors_event_t* data, int count);
+int    sensor_flush            (int handle);
 
 int    allocate_control_data   (void);
 void   delete_control_data     (void);
 
+void   build_sensor_report_maps(int dev_num);
+
 #endif