From 2eef164c17fbddd23fff2b83cd49d03b9577fdcd Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 6 Mar 2016 15:41:40 +0000 Subject: Modified to allow multiple inheritance. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9042 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/lib/peripherals/include/hal_accelerometer.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'os/hal/lib/peripherals/include/hal_accelerometer.h') 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. -- cgit v1.2.3