aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/lib/peripherals/include/hal_accelerometer.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_accelerometer.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_accelerometer.h')
-rw-r--r--os/hal/lib/peripherals/include/hal_accelerometer.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/os/hal/lib/peripherals/include/hal_accelerometer.h b/os/hal/lib/peripherals/include/hal_accelerometer.h
index f6b4229af..c557dc96f 100644
--- a/os/hal/lib/peripherals/include/hal_accelerometer.h
+++ b/os/hal/lib/peripherals/include/hal_accelerometer.h
@@ -46,8 +46,14 @@
/**
* @brief BaseAccelerometer specific methods.
*/
+#define _base_accelerometer_methods_alone
+
+/**
+ * @brief BaseAccelerometer specific methods with inherited ones.
+ */
#define _base_accelerometer_methods \
- _base_sensor_methods
+ _base_sensor_methods \
+ _base_accelerometer_methods_alone
/**
* @brief @p BaseAccelerometer virtual methods table.