aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorRocco Marco Guglielmi <roccomarco.guglielmi@live.com>2016-06-02 13:10:18 +0000
committerRocco Marco Guglielmi <roccomarco.guglielmi@live.com>2016-06-02 13:10:18 +0000
commitcd7b086b12fa9af6bdeacfaa91e9ad94f411a6be (patch)
tree8ff2486f708a6844d885c64d7da3891003a63a85 /os
parentffd47e9af73a9e4a27e1747589085bd2b9f9557a (diff)
downloadChibiOS-cd7b086b12fa9af6bdeacfaa91e9ad94f411a6be.tar.gz
ChibiOS-cd7b086b12fa9af6bdeacfaa91e9ad94f411a6be.tar.bz2
ChibiOS-cd7b086b12fa9af6bdeacfaa91e9ad94f411a6be.zip
Small indent fixes
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9554 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/ex/ST/l3gd20.c2
-rw-r--r--os/ex/ST/lis302dl.c4
-rw-r--r--os/ex/ST/lis3dsh.c1
-rw-r--r--os/ex/ST/lis3mdl.c2
-rw-r--r--os/ex/ST/lsm303dlhc.c3
-rw-r--r--os/ex/ST/lsm303dlhc.h2
-rw-r--r--os/ex/ST/lsm6ds0.c1
-rw-r--r--os/hal/lib/peripherals/sensors/hal_sensors.h10
8 files changed, 8 insertions, 17 deletions
diff --git a/os/ex/ST/l3gd20.c b/os/ex/ST/l3gd20.c
index c618a8c8d..d36399d91 100644
--- a/os/ex/ST/l3gd20.c
+++ b/os/ex/ST/l3gd20.c
@@ -27,7 +27,6 @@
*/
#include "hal.h"
-
#include "l3gd20.h"
/*===========================================================================*/
@@ -55,7 +54,6 @@
#define L3GD20_AD_3 ((uint8_t)0x08)
#define L3GD20_AD_4 ((uint8_t)0x10)
#define L3GD20_AD_5 ((uint8_t)0x20)
-
#define L3GD20_MS ((uint8_t)0x40)
#define L3GD20_RW ((uint8_t)0x80)
diff --git a/os/ex/ST/lis302dl.c b/os/ex/ST/lis302dl.c
index cd39e15c4..0a76a39db 100644
--- a/os/ex/ST/lis302dl.c
+++ b/os/ex/ST/lis302dl.c
@@ -27,7 +27,6 @@
*/
#include "hal.h"
-
#include "lis302dl.h"
/*===========================================================================*/
@@ -83,7 +82,6 @@
#define LIS302DL_AD_CLICK_LATENCY ((uint8_t)0x3E)
#define LIS302DL_AD_CLICK_WINDOW ((uint8_t)0x3F)
-
#define LIS302DL_CTRL_REG1_FS_MASK ((uint8_t)0x20)
#define TO_G ((float)0.001f)
#define TO_SI ((float)0.00981f)
@@ -189,7 +187,7 @@ static size_t get_axes_number(void *ip) {
static msg_t read_raw(void *ip, int32_t axes[LIS302DL_NUMBER_OF_AXES]) {
int8_t tmp;
osalDbgCheck((ip != NULL) && (axes != NULL));
-
+
osalDbgAssert((((LIS302DLDriver *)ip)->state == LIS302DL_READY),
"read_raw(), invalid state");
diff --git a/os/ex/ST/lis3dsh.c b/os/ex/ST/lis3dsh.c
index 517b325e5..c28f60304 100644
--- a/os/ex/ST/lis3dsh.c
+++ b/os/ex/ST/lis3dsh.c
@@ -27,7 +27,6 @@
*/
#include "hal.h"
-
#include "lis3dsh.h"
/*===========================================================================*/
diff --git a/os/ex/ST/lis3mdl.c b/os/ex/ST/lis3mdl.c
index 3ed042aa7..7abcd41e2 100644
--- a/os/ex/ST/lis3mdl.c
+++ b/os/ex/ST/lis3mdl.c
@@ -27,7 +27,6 @@
*/
#include "hal.h"
-
#include "lis3mdl.h"
/*===========================================================================*/
@@ -59,7 +58,6 @@
#define LIS3MDL_AD_4 ((uint8_t)0x10)
#define LIS3MDL_AD_5 ((uint8_t)0x20)
#define LIS3MDL_AD_6 ((uint8_t)0x40)
-
#define LIS3MDL_RW ((uint8_t)0x80)
#define LIS3MDL_AD_WHO_AM_I ((uint8_t)0x0F)
diff --git a/os/ex/ST/lsm303dlhc.c b/os/ex/ST/lsm303dlhc.c
index 2722ff9e8..74cde4caf 100644
--- a/os/ex/ST/lsm303dlhc.c
+++ b/os/ex/ST/lsm303dlhc.c
@@ -27,7 +27,6 @@
*/
#include "hal.h"
-
#include "lsm303dlhc.h"
/*===========================================================================*/
@@ -72,7 +71,6 @@
#define LSM303DLHC_AD_4 ((uint8_t)0x10)
#define LSM303DLHC_AD_5 ((uint8_t)0x20)
#define LSM303DLHC_AD_6 ((uint8_t)0x40)
-
#define LSM303DLHC_RW ((uint8_t)0x80)
#define LSM303DLHC_AD_ACC_CTRL_REG1 ((uint8_t)0x20)
@@ -126,6 +124,7 @@
#define TO_G ((float)0.001f)
#define TO_SI ((float)0.00981f)
+
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
diff --git a/os/ex/ST/lsm303dlhc.h b/os/ex/ST/lsm303dlhc.h
index 86317a691..2fe8d70b3 100644
--- a/os/ex/ST/lsm303dlhc.h
+++ b/os/ex/ST/lsm303dlhc.h
@@ -98,7 +98,7 @@
#endif
#if LSM303DLHC_SHARED_I2C && !I2C_USE_MUTUAL_EXCLUSION
-#error "LSM303DLHC_SHARED_SPI requires I2C_USE_MUTUAL_EXCLUSION"
+#error "LSM303DLHC_SHARED_I2C requires I2C_USE_MUTUAL_EXCLUSION"
#endif
/*===========================================================================*/
diff --git a/os/ex/ST/lsm6ds0.c b/os/ex/ST/lsm6ds0.c
index f657ad879..caa0d875d 100644
--- a/os/ex/ST/lsm6ds0.c
+++ b/os/ex/ST/lsm6ds0.c
@@ -27,7 +27,6 @@
*/
#include "hal.h"
-
#include "lsm6ds0.h"
/*===========================================================================*/
diff --git a/os/hal/lib/peripherals/sensors/hal_sensors.h b/os/hal/lib/peripherals/sensors/hal_sensors.h
index db8d10269..fc9268224 100644
--- a/os/hal/lib/peripherals/sensors/hal_sensors.h
+++ b/os/hal/lib/peripherals/sensors/hal_sensors.h
@@ -45,8 +45,8 @@
* @brief BaseSensor specific methods.
*/
#define _base_sensor_methods_alone \
- /* Get number of axes.*/ \
- size_t (*get_axes_number)(void *instance); \
+ /* Get number of channels.*/ \
+ size_t (*get_channels_number)(void *instance); \
/* Reads the sensor raw data.*/ \
msg_t (*read_raw)(void *instance, int32_t axes[]); \
/* Reads the sensor returning normalized data.*/ \
@@ -92,14 +92,14 @@ typedef struct {
* @{
*/
/**
- * @brief Sensors get axes number.
+ * @brief Sensors get channels number.
*
* @param[in] ip pointer to a @p BaseSensor or derived class.
- * @return The number of axes of the BaseSensor
+ * @return The number of channels of the BaseSensor
*
* @api
*/
-#define sensorGetAxesNumber(ip) (ip)->vmt_basesensor->get_axes_number(ip)
+#define sensorGetChannelNumber(ip) (ip)->vmt_basesensor->get_channels_number(ip)
/**
* @brief Sensors read raw data.