X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=enumeration.h;h=1915249c872cc89d2545c423b513975ff916c772;hb=6efc469de2492112acc89359da86a66cb0263ec0;hp=28c891eddded8313fe66c5e4f40a0f8445551e86;hpb=4d7577afcef556cde9ed836ed7cbde396b12ab32;p=android-x86%2Fhardware-intel-libsensors.git

diff --git a/enumeration.h b/enumeration.h
index 28c891e..1915249 100644
--- 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,73 +7,6 @@
 
 #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)		\
-		{					\
-			"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);