RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/adxk345: include copy of params in dev struct

Browse Source 
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.
This commit is contained in:
Kees Bakker 2019-01-06 17:24:24 +01:00
parent b77c802f9b
commit 5265edcd26
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/adxl345/adxl345.c
View File

@ -31,8 +31,8 @@
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
#include "debug.h" #include "debug.h"
#define ADXL345_BUS (dev->params->i2c) #define ADXL345_BUS (dev->params.i2c)
#define ADXL345_ADDR (dev->params->addr) #define ADXL345_ADDR (dev->params.addr)
#define ADXL345_PARAM_SCALE_FACTOR (4) #define ADXL345_PARAM_SCALE_FACTOR (4)
@ -43,10 +43,10 @@ int adxl345_init(adxl345_t *dev, const adxl345_params_t* params)
assert(dev && params); assert(dev && params);
/* get device descriptor */ /* get device descriptor */
dev->params = (adxl345_params_t*)params; dev->params = *params;
/* get scale_factor from full_res and range parameters */ /* 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 */ /* Acquire exclusive access */
i2c_acquire(ADXL345_BUS); i2c_acquire(ADXL345_BUS);
@ -59,12 +59,12 @@ int adxl345_init(adxl345_t *dev, const adxl345_params_t* params)
return ADXL345_NODEV; return ADXL345_NODEV;
} }
/* configure the user offset */ /* 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 */ /* Basic device setup */
reg = (dev->params->full_res ? ADXL345_FULL_RES : 0); reg = (dev->params.full_res ? ADXL345_FULL_RES : 0);
reg |= dev->params->range; reg |= dev->params.range;
i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_DATA_FORMAT, reg, 0); 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 */ /* Put device in measure mode */
i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_POWER_CTL, ADXL345_MEASURE_BIT, 0); i2c_write_reg(ADXL345_BUS, ADXL345_ADDR, ADXL345_POWER_CTL, ADXL345_MEASURE_BIT, 0);

2
drivers/include/adxl345.h
View File

@ -157,7 +157,7 @@ typedef struct {
* @brief Device descriptor for the ADXL345 sensor * @brief Device descriptor for the ADXL345 sensor
*/ */
typedef struct { typedef struct {
adxl345_params_t *params; /**< Device configuration */ adxl345_params_t params; /**< Device configuration */
adxl345_interrupt_t interrupt; /**< Interrupts configuration */ adxl345_interrupt_t interrupt; /**< Interrupts configuration */
int16_t scale_factor; /**< Scale factor for converting value to mg */ int16_t scale_factor; /**< Scale factor for converting value to mg */
} adxl345_t; } adxl345_t;