From 5265edcd26fd5f1510e3163500c93e3e652fdc88 Mon Sep 17 00:00:00 2001
From: Kees Bakker <kees@sodaq.com>
Date: Sun, 6 Jan 2019 17:24:24 +0100
Subject: [PATCH] drivers/adxk345: include copy of params in dev struct
This follows the usual convention of having the whole params in the device
struct instead of a pointer-to. This also eliminates the need to cast a
const to a non-const pointer in the init function.
---
drivers/adxl345/adxl345.c | 16 ++++++++--------
drivers/include/adxl345.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/adxl345/adxl345.c b/drivers/adxl345/adxl345.c
index 183fbb1ff4..0e914d7cea 100644
--- a/drivers/adxl345/adxl345.c
+++ b/drivers/adxl345/adxl345.c
@@ -31,8 +31,8 @@
#define ENABLE_DEBUG (0)
#include "debug.h"
-#define ADXL345_BUS (dev->params->i2c)
-#define ADXL345_ADDR (dev->params->addr)
+#define ADXL345_BUS (dev->params.i2c)
+#define ADXL345_ADDR (dev->params.addr)
#define ADXL345_PARAM_SCALE_FACTOR (4)
@@ -43,10 +43,10 @@ int adxl345_init(adxl345_t *dev, const adxl345_params_t* params)
assert(dev && params);
/* get device descriptor */
- dev->params = (adxl345_params_t*)params;
+ dev->params = *params;
/* get scale_factor from full_res and range parameters */
- dev->scale_factor = (dev->params->full_res ? ADXL345_PARAM_SCALE_FACTOR : (4 << dev->params->range));
+ dev->scale_factor = (dev->params.full_res ? ADXL345_PARAM_SCALE_FACTOR : (4 << dev->params.range));
/* Acquire exclusive access */
i2c_acquire(ADXL345_BUS);
@@ -59,12 +59,12 @@ int adxl345_init(adxl345_t *dev, const adxl345_params_t* params)
return ADXL345_NODEV;
}
/* configure the user offset */
- i2c_write_regs(ADXL345_BUS, ADXL345_ADDR, ADXL345_OFFSET_X, dev->params->offset, 3, 0);
+ i2c_write_regs(ADXL345_BUS, ADXL345_ADDR, ADXL345_OFFSET_X, dev->params.offset, 3, 0);
/* Basic device setup */
- reg = (dev->params->full_res ? ADXL345_FULL_RES : 0);
- reg |= dev->params->range;
+ reg = (dev->params.full_res ? ADXL345_FULL_RES : 0);
+ reg |= dev->params.range;
i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_DATA_FORMAT, reg, 0);
- i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_BW_RATE, dev->params->rate, 0);
+ i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_BW_RATE, dev->params.rate, 0);
/* Put device in measure mode */
i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_POWER_CTL, ADXL345_MEASURE_BIT, 0);
diff --git a/drivers/include/adxl345.h b/drivers/include/adxl345.h
index f574ae820b..c405956895 100644
--- a/drivers/include/adxl345.h
+++ b/drivers/include/adxl345.h
@@ -157,7 +157,7 @@ typedef struct {
* @brief Device descriptor for the ADXL345 sensor
*/
typedef struct {
- adxl345_params_t *params; /**< Device configuration */
+ adxl345_params_t params; /**< Device configuration */
adxl345_interrupt_t interrupt; /**< Interrupts configuration */
int16_t scale_factor; /**< Scale factor for converting value to mg */
} adxl345_t;
--
GitLab