Move module path to vendor

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

diff --git a/enumeration.h b/enumeration.h
index e4445be..c8ef2eb 100644 (file)
--- a/enumeration.h
+++ b/enumeration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  */
 
 #ifndef __ENUMERATION_H__
@@ -7,78 +7,17 @@
 
 #include "common.h"
 
-/*
- * Macros associating iio sysfs entries to to sensor types ; see
- * linux/kernel/drivers/iio/industrialio-core.c and
- * hardware/libhardware/include/hardware/sensor.h
- */
-
-#define DECLARE_CHANNEL(tag, spacer, name)             \
-               {                                       \
-                       name,                           \
-                       "in_"tag spacer name"_en",      \
-                       "in_"tag spacer name"_type",    \
-                       "in_"tag spacer name"_index",   \
-                       "in_"tag spacer name"_raw",     \
-                       "in_"tag spacer name"_input",   \
-                       "in_"tag spacer name"_scale",   \
-                },
-
-#define DECLARE_NAMED_CHANNEL(tag, name)       DECLARE_CHANNEL(tag, "_", name)
-
-#define DECLARE_GENERIC_CHANNEL(tag)           DECLARE_CHANNEL(tag, "", "")
-
-
-#define DECLARE_SENSOR0(tag, type)                     \
-{                                                      \
-       tag, type, 1,                                   \
-       {                                               \
-               DECLARE_GENERIC_CHANNEL(tag)            \
-       }                                               \
-},
-
-#define DECLARE_SENSOR1(tag, type, ch1)                        \
-{                                                      \
-       tag, type, 1,                                   \
-       {                                               \
-               DECLARE_NAMED_CHANNEL(tag, ch1)         \
-       }                                               \
-},
-
-#define DECLARE_SENSOR2(tag, type, ch1, ch2)           \
-{                                                      \
-       tag, type, 2,                                   \
-       {                                               \
-               DECLARE_NAMED_CHANNEL(tag, ch1)         \
-               DECLARE_NAMED_CHANNEL(tag, ch2)         \
-       }                                               \
-},
-
-#define DECLARE_SENSOR3(tag, type, ch1, ch2, ch3)      \
-{                                                      \
-       tag, type, 3,                                   \
-       {                                               \
-               DECLARE_NAMED_CHANNEL(tag, ch1)         \
-               DECLARE_NAMED_CHANNEL(tag, ch2)         \
-               DECLARE_NAMED_CHANNEL(tag, ch3)         \
-       }                                               \
-},
-
-#define DECLARE_SENSOR4(tag, type, ch1, ch2, ch3, ch4) \
-{                                                      \
-       tag, type, 4,                                   \
-       {                                               \
-               DECLARE_NAMED_CHANNEL(tag, ch1)         \
-               DECLARE_NAMED_CHANNEL(tag, ch2)         \
-               DECLARE_NAMED_CHANNEL(tag, ch3)         \
-               DECLARE_NAMED_CHANNEL(tag, ch4)         \
-       }                                               \
-},
-
 int    get_sensors_list        (struct sensors_module_t* module,
                                 struct sensor_t const** list);
 
 void   enumerate_sensors       (void);
 void   delete_enumeration_data (void);
 
+/*
+ * These are fine-grained type definitions that are used internally, in the sensor array, but mapped to an Android sensor type in the processing pipeline.
+ * The sensor array uses these, not the desc array.
+ */
+#define SENSOR_TYPE_INTERNAL_ILLUMINANCE       -1      /* Global illuminance, in lux                            */
+#define SENSOR_TYPE_INTERNAL_INTENSITY         -2      /* Global intensity, in sensor specific units            */
+
 #endif