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

cpu/stm32l1: make i2c thread-safe

Browse Source
This commit is contained in:
Thomas Eichinger 2015-01-19 12:16:07 +01:00
parent 8821e0edcf
commit 830b2b2312
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cpu/stm32l1/periph/i2c.c
View File

@ -26,6 +26,7 @@
#include "cpu.h" #include "cpu.h"
#include "mutex.h"
#include "periph/i2c.h" #include "periph/i2c.h"
#include "periph_conf.h" #include "periph_conf.h"
@ -45,6 +46,24 @@ static inline void _clear_addr(I2C_TypeDef *dev);
static inline void _write(I2C_TypeDef *dev, char *data, int length); static inline void _write(I2C_TypeDef *dev, char *data, int length);
static inline void _stop(I2C_TypeDef *dev); static inline void _stop(I2C_TypeDef *dev);
/**
* @brief Array holding one pre-initialized mutex for each I2C device
*/
static mutex_t locks[] = {
#if I2C_0_EN
[I2C_0] = MUTEX_INIT,
#endif
#if I2C_1_EN
[I2C_1] = MUTEX_INIT,
#endif
#if I2C_2_EN
[I2C_2] = MUTEX_INIT
#endif
#if I2C_3_EN
[I2C_3] = MUTEX_INIT
#endif
};
int i2c_init_master(i2c_t dev, i2c_speed_t speed) int i2c_init_master(i2c_t dev, i2c_speed_t speed)
{ {
I2C_TypeDef *i2c; I2C_TypeDef *i2c;
@ -200,6 +219,24 @@ int i2c_init_slave(i2c_t dev, uint8_t address)
return -1; return -1;
} }
int i2c_acquire(i2c_t dev)
{
if (dev >= I2C_NUMOF) {
return -1;
}
mutex_lock(&locks[dev]);
return 0;
}
int i2c_release(i2c_t dev)
{
if (dev >= I2C_NUMOF) {
return -1;
}
mutex_unlock(&locks[dev]);
return 0;
}
int i2c_read_byte(i2c_t dev, uint8_t address, char *data) int i2c_read_byte(i2c_t dev, uint8_t address, char *data)
{ {
return i2c_read_bytes(dev, address, data, 1); return i2c_read_bytes(dev, address, data, 1);