RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:12:57 +01:00
Code Releases Activity

drivers/lis2dh12: Rename CS ad MODE to avoid conflicts

Browse Source 
CS and MODE are a bit too generic macros and may conflict with headers
defined by the CPU, like in the QN908x case.

This patch renames them to BUS_CS and BUS_MODE to keep it consistent
with the other BUS names.
This commit is contained in:
iosabi 2021-01-30 17:19:27 +00:00
parent 4fb4f03252
commit 2aa7b92884
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/lis2dh12/lis2dh12.c
View File

@ -30,11 +30,11 @@
/* SPI bus speed and mode */
#define BUS_CLK SPI_CLK_5MHZ
#define MODE SPI_MODE_0
#define BUS_MODE SPI_MODE_0
#define BUS_OK SPI_OK
/* shortcuts for SPI bus parameters */
#define BUS (dev->p->spi)
#define CS (dev->p->cs)
#define BUS_CS (dev->p->cs)
/* flag to set when reading from the device */
#define FLAG_READ (0x80)
/* flag to enable address auto incrementation on read or write */
@ -43,7 +43,7 @@
static int _init_bus(const lis2dh12_t *dev)
{
/* for SPI, we only need to initialize the chip select pin */
if (spi_init_cs(BUS, CS) != SPI_OK) {
if (spi_init_cs(BUS, BUS_CS) != SPI_OK) {
return LIS2DH12_NOBUS;
}
return LIS2DH12_OK;
@ -51,7 +51,7 @@ static int _init_bus(const lis2dh12_t *dev)
static int _acquire(const lis2dh12_t *dev)
{
return spi_acquire(BUS, CS, MODE, BUS_CLK);
return spi_acquire(BUS, BUS_CS, BUS_MODE, BUS_CLK);
}
static void _release(const lis2dh12_t *dev)
@ -61,19 +61,19 @@ static void _release(const lis2dh12_t *dev)
static uint8_t _read(const lis2dh12_t *dev, uint8_t reg)
{
return spi_transfer_reg(BUS, CS, (FLAG_READ | reg), 0);
return spi_transfer_reg(BUS, BUS_CS, (FLAG_READ | reg), 0);
}
static void _read_burst(const lis2dh12_t *dev, uint8_t reg,
void *data, size_t len)
{
spi_transfer_regs(BUS, CS, (FLAG_READ | FLAG_AINC | reg), NULL, data, len);
static void _read_burst(const lis2dh12_t *dev, uint8_t reg, void *data,
size_t len) {
spi_transfer_regs(BUS, BUS_CS, (FLAG_READ | FLAG_AINC | reg), NULL, data,
len);
}
static void _write(const lis2dh12_t *dev, uint8_t reg, uint8_t data)
{
DEBUG("[lis2dh12] write: reg 0x%02x, val 0x%02x\n", (int)reg, (int)data);
spi_transfer_reg(BUS, CS, reg, data);
spi_transfer_reg(BUS, BUS_CS, reg, data);
}
/* and now the I2C specific part of the driver */