diff options
| author | Timofey Titovets <nefelim4ag@gmail.com> | 2024-10-21 14:19:56 +0200 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2024-10-26 22:06:30 -0400 |
| commit | a4aa2a900267c83d20247f93e6ddb06f63324135 (patch) | |
| tree | 7c0d71f171ebc997e9205f8ed0489017a70878bc /src/rp2040 | |
| parent | 08a85ba869c3232ca7063c737c238ca41e20885e (diff) | |
| download | kutter-a4aa2a900267c83d20247f93e6ddb06f63324135.tar.gz kutter-a4aa2a900267c83d20247f93e6ddb06f63324135.tar.xz kutter-a4aa2a900267c83d20247f93e6ddb06f63324135.zip | |
i2c: handle errors at i2ccmds
Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
Diffstat (limited to 'src/rp2040')
| -rw-r--r-- | src/rp2040/gpio.h | 6 | ||||
| -rw-r--r-- | src/rp2040/i2c.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/rp2040/gpio.h b/src/rp2040/gpio.h index ae608378..0dd393bf 100644 --- a/src/rp2040/gpio.h +++ b/src/rp2040/gpio.h @@ -50,8 +50,8 @@ struct i2c_config { }; struct i2c_config i2c_setup(uint32_t bus, uint32_t rate, uint8_t addr); -void i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write); -void i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg - , uint8_t read_len, uint8_t *read); +int i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write); +int i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg + , uint8_t read_len, uint8_t *read); #endif // gpio.h diff --git a/src/rp2040/i2c.c b/src/rp2040/i2c.c index 84b627ce..81e2dab6 100644 --- a/src/rp2040/i2c.c +++ b/src/rp2040/i2c.c @@ -11,6 +11,7 @@ #include "internal.h" // pclock, gpio_peripheral #include "hardware/regs/resets.h" // RESETS_RESET_I2C*_BITS #include "hardware/structs/i2c.h" +#include "i2ccmds.h" // I2C_BUS_SUCCESS struct i2c_info { i2c_hw_t *i2c; @@ -211,7 +212,7 @@ i2c_do_read(i2c_hw_t *i2c, uint8_t addr, uint8_t read_len, uint8_t *read } } -void +int i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write) { i2c_hw_t *i2c = (i2c_hw_t*)config.i2c; @@ -220,9 +221,11 @@ i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write) i2c_start(i2c, config.addr); i2c_do_write(i2c, config.addr, write_len, write, 1, timeout); i2c_stop(i2c); + + return I2C_BUS_SUCCESS; } -void +int i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg , uint8_t read_len, uint8_t *read) { @@ -234,4 +237,6 @@ i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg i2c_do_write(i2c, config.addr, reg_len, reg, 0, timeout); i2c_do_read(i2c, config.addr, read_len, read, timeout); i2c_stop(i2c); + + return I2C_BUS_SUCCESS; } |