Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 09:16:07 +03:00
Code Issues Wiki Activity

Adjust interface for i2c to add requirement for device to be specified.

Browse source
This commit is contained in:
blckmn 2016-06-03 21:20:11 +10:00
parent 7a5b7060aa
commit 37e7b5ee4a
17 changed files with 104 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main/drivers/bus_i2c_stm32f10x.c
View file

@ -68,9 +68,6 @@ static i2cDevice_t i2cHardwareMap[] = {
#endif
};
// Copy of device index for reinit, etc purposes
static I2CDevice I2Cx_device;
static volatile uint16_t i2cErrorCount = 0;
static i2cState_t i2cState[] = {
@ -113,7 +110,7 @@ static bool i2cHandleHardwareFailure(I2CDevice device)
return false;
}
bool i2cWriteBufferByDevice(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t len_, uint8_t *data)
bool i2cWriteBuffer(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t len_, uint8_t *data)
{
if (device == I2CINVALID)
@ -155,12 +152,12 @@ bool i2cWriteBufferByDevice(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8
return !(state->error);
}
bool i2cWriteByDevice(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t data)
bool i2cWrite(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t data)
{
return i2cWriteBufferByDevice(device, addr_, reg_, 1, &data);
return i2cWriteBuffer(device, addr_, reg_, 1, &data);
}
bool i2cReadByDevice(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t len, uint8_t* buf)
bool i2cRead(I2CDevice device, uint8_t addr_, uint8_t reg_, uint8_t len, uint8_t* buf)
{
if (device == I2CINVALID)
return false;
@ -355,8 +352,6 @@ void i2c_ev_handler(I2CDevice device) {
void i2cInit(I2CDevice device)
{
I2Cx_device = device;
if (device == I2CINVALID)
return;
@ -462,19 +457,4 @@ static void i2cUnstick(IO_t scl, IO_t sda)
IOHi(sda); // Set bus sda high
}
bool i2cWriteBuffer(uint8_t addr_, uint8_t reg_, uint8_t len_, uint8_t *data)
{
return i2cWriteBufferByDevice(I2Cx_device, addr_, reg_, len_, data);
}
bool i2cWrite(uint8_t addr_, uint8_t reg, uint8_t data)
{
return i2cWriteByDevice(I2Cx_device, addr_, reg, data);
}
bool i2cRead(uint8_t addr_, uint8_t reg, uint8_t len, uint8_t* buf)
{
return i2cReadByDevice(I2Cx_device, addr_, reg, len, buf);
}
#endif