aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/lib/peripherals/include/hal_sensors.h
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-03-06 15:41:40 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-03-06 15:41:40 +0000
commit2eef164c17fbddd23fff2b83cd49d03b9577fdcd (patch)
tree1839c182baf42d4b8cdfc309ed73eddd6b14c43b /os/hal/lib/peripherals/include/hal_sensors.h
parentcd2beca38c5a44b7a2cfbae68fa7e157e6986c39 (diff)
downloadChibiOS-2eef164c17fbddd23fff2b83cd49d03b9577fdcd.tar.gz
ChibiOS-2eef164c17fbddd23fff2b83cd49d03b9577fdcd.tar.bz2
ChibiOS-2eef164c17fbddd23fff2b83cd49d03b9577fdcd.zip
Modified to allow multiple inheritance.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9042 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/lib/peripherals/include/hal_sensors.h')
-rw-r--r--os/hal/lib/peripherals/include/hal_sensors.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/os/hal/lib/peripherals/include/hal_sensors.h b/os/hal/lib/peripherals/include/hal_sensors.h
index 6254f036e..b722161b6 100644
--- a/os/hal/lib/peripherals/include/hal_sensors.h
+++ b/os/hal/lib/peripherals/include/hal_sensors.h
@@ -44,7 +44,7 @@
/**
* @brief BaseSensor specific methods.
*/
-#define _base_sensor_methods \
+#define _base_sensor_methods_alone \
/* Get number of axes.*/ \
size_t (*get_axes_number)(void *instance); \
/* Reads the sensor raw data.*/ \
@@ -53,6 +53,12 @@
msg_t (*read_cooked)(void *instance, float axes[]);
/**
+ * @brief BaseSensor specific methods with inherited ones.
+ */
+#define _base_sensor_methods \
+ _base_sensor_methods_alone
+
+/**
* @brief @p BaseSensor virtual methods table.
*/
struct BaseSensorVMT {