sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for multiple I2C buses

Browse Source
This commit is contained in:
Jeremy Soller
2020-01-15 16:25:30 -07:00
parent efa9fb7fb4
commit 93545fb83c
16 changed files with 152 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/i2c.c
View File

@@ -1,53 +1,53 @@
#include <common/i2c.h>
int i2c_recv(uint8_t addr, uint8_t* data, int length) {
int i2c_recv(struct I2C * i2c, uint8_t addr, uint8_t* data, int length) {
int res = 0;
res = i2c_start(addr, true);
res = i2c_start(i2c, addr, true);
if (res < 0) return res;
res = i2c_read(data, length);
res = i2c_read(i2c, data, length);
if (res < 0) return res;
i2c_stop();
i2c_stop(i2c);
return res;
}
int i2c_send(uint8_t addr, uint8_t* data, int length) {
int i2c_send(struct I2C * i2c, uint8_t addr, uint8_t* data, int length) {
int res = 0;
res = i2c_start(addr, false);
res = i2c_start(i2c, addr, false);
if (res < 0) return res;
res = i2c_write(data, length);
res = i2c_write(i2c, data, length);
if (res < 0) return res;
i2c_stop();
i2c_stop(i2c);
return res;
}
int i2c_get(uint8_t addr, uint8_t reg, uint8_t* data, int length) {
int i2c_get(struct I2C * i2c, uint8_t addr, uint8_t reg, uint8_t* data, int length) {
int res = 0;
res = i2c_start(addr, false);
res = i2c_start(i2c, addr, false);
if (res < 0) return res;
res = i2c_write(&reg, 1);
res = i2c_write(i2c, &reg, 1);
if (res < 0) return res;
return i2c_recv(addr, data, length);
return i2c_recv(i2c, addr, data, length);
}
int i2c_set(uint8_t addr, uint8_t reg, uint8_t* data, int length) {
int i2c_set(struct I2C * i2c, uint8_t addr, uint8_t reg, uint8_t* data, int length) {
int res = 0;
res = i2c_start(addr, false);
res = i2c_start(i2c, addr, false);
if (res < 0) return res;
res = i2c_write(&reg, 1);
res = i2c_write(i2c, &reg, 1);
if (res < 0) return res;
return i2c_send(addr, data, length);
return i2c_send(i2c, addr, data, length);
}

19
src/common/include/common/i2c.h
View File

@@ -4,32 +4,35 @@
#include <stdbool.h>
#include <stdint.h>
// I2C bus, should be defined elsewhere
struct I2C;
// Start i2c transaction
// Must be defined by arch, board, or ec
int i2c_start(uint8_t addr, bool read);
int i2c_start(struct I2C * i2c, uint8_t addr, bool read);
// Stop i2c transaction
// Must be defined by arch, board, or ec
void i2c_stop(void);
void i2c_stop(struct I2C * i2c);
// Send a byte on i2c bus
// Must be defined by arch, board, or ec
int i2c_write(uint8_t * data, int length);
int i2c_write(struct I2C * i2c, uint8_t * data, int length);
// Read bytes from bus
// Must be defined by arch, board, or ec
int i2c_read(uint8_t * data, int length);
int i2c_read(struct I2C * i2c, uint8_t * data, int length);
// Read multiple bytes from address in one transaction
int i2c_recv(uint8_t addr, uint8_t* data, int length);
int i2c_recv(struct I2C * i2c, uint8_t addr, uint8_t* data, int length);
// Write multiple bytes to address in one transaction
int i2c_send(uint8_t addr, uint8_t* data, int length);
int i2c_send(struct I2C * i2c, uint8_t addr, uint8_t* data, int length);
// Read multiple bytes from a register in one transaction
int i2c_get(uint8_t addr, uint8_t reg, uint8_t* data, int length);
int i2c_get(struct I2C * i2c, uint8_t addr, uint8_t reg, uint8_t* data, int length);
// Write multiple bytes to a register in one transaction
int i2c_set(uint8_t addr, uint8_t reg, uint8_t* data, int length);
int i2c_set(struct I2C * i2c, uint8_t addr, uint8_t reg, uint8_t* data, int length);
#endif // _COMMON_I2C_H