j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

semaphore handling added to SPI interface

Browse source
This commit is contained in:
Gunar Schorcht 2018-01-05 18:34:01 +01:00
parent 5a73a34574
commit 62ca216188
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
extras/l3gd20h/l3gd20h.c
View file

@ -218,6 +218,8 @@ l3gd20h_sensor_t* l3gd20h_init_sensor (uint8_t bus, uint8_t addr, uint8_t cs)
free (dev); free (dev);
return NULL; return NULL;
} }
if (!addr)
spi_semaphore_init(dev);
// check availability of the sensor // check availability of the sensor
if (!l3gd20h_is_available (dev)) if (!l3gd20h_is_available (dev))
@ -953,6 +955,8 @@ static bool l3gd20h_spi_read(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data,
uint8_t addr = (reg & 0x3f) | L3GD20H_SPI_READ_FLAG | L3GD20H_SPI_AUTO_INC_FLAG; uint8_t addr = (reg & 0x3f) | L3GD20H_SPI_READ_FLAG | L3GD20H_SPI_AUTO_INC_FLAG;
spi_semaphore_take (dev);
static uint8_t mosi[L3GD20H_SPI_BUF_SIZE]; static uint8_t mosi[L3GD20H_SPI_BUF_SIZE];
static uint8_t miso[L3GD20H_SPI_BUF_SIZE]; static uint8_t miso[L3GD20H_SPI_BUF_SIZE];
@ -965,6 +969,7 @@ static bool l3gd20h_spi_read(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data,
{ {
error_dev ("Could not read data from SPI", __FUNCTION__, dev); error_dev ("Could not read data from SPI", __FUNCTION__, dev);
dev->error_code |= L3GD20H_SPI_READ_FAILED; dev->error_code |= L3GD20H_SPI_READ_FAILED;
spi_semaphore_give (dev);
return false; return false;
} }
@ -972,6 +977,8 @@ static bool l3gd20h_spi_read(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data,
for (int i=0; i < len; i++) for (int i=0; i < len; i++)
data[i] = miso[i+1]; data[i] = miso[i+1];
spi_semaphore_give (dev);
#ifdef L3GD20H_DEBUG_LEVEL_2 #ifdef L3GD20H_DEBUG_LEVEL_2
printf("L3GD20H %s: read the following bytes from reg %02x: ", __FUNCTION__, reg); printf("L3GD20H %s: read the following bytes from reg %02x: ", __FUNCTION__, reg);
for (int i=0; i < len; i++) for (int i=0; i < len; i++)
@ -1000,6 +1007,8 @@ static bool l3gd20h_spi_write(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data,
return false; return false;
} }
spi_semaphore_take (dev);
reg &= 0x7f; reg &= 0x7f;
// first byte in output is the register address // first byte in output is the register address
@ -1018,11 +1027,14 @@ static bool l3gd20h_spi_write(l3gd20h_sensor_t* dev, uint8_t reg, uint8_t *data,
if (!spi_transfer_pf (dev->bus, dev->cs, mosi, NULL, len+1)) if (!spi_transfer_pf (dev->bus, dev->cs, mosi, NULL, len+1))
{ {
spi_semaphore_give (dev);
error_dev ("Could not write data to SPI.", __FUNCTION__, dev); error_dev ("Could not write data to SPI.", __FUNCTION__, dev);
dev->error_code |= L3GD20H_SPI_WRITE_FAILED; dev->error_code |= L3GD20H_SPI_WRITE_FAILED;
return false; return false;
} }
spi_semaphore_give (dev);
return true; return true;
} }

6
extras/l3gd20h/l3gd20h_platform.h
View file

@ -69,9 +69,9 @@
// platform specific definitions // platform specific definitions
#define spi_semaphore_init() #define spi_semaphore_init(d)
#define spi_semaphore_take() #define spi_semaphore_take(d)
#define spi_semaphore_give() #define spi_semaphore_give(d)
// platform specific SPI functions // platform specific SPI functions