aboutsummaryrefslogtreecommitdiffstats
path: root/src/avr
diff options
context:
space:
mode:
Diffstat (limited to 'src/avr')
-rw-r--r--src/avr/gpio.h4
-rw-r--r--src/avr/i2c.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/src/avr/gpio.h b/src/avr/gpio.h
index 9d98ee70..9f28a30a 100644
--- a/src/avr/gpio.h
+++ b/src/avr/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
+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/avr/i2c.c b/src/avr/i2c.c
index 658a30a1..e8febfba 100644
--- a/src/avr/i2c.c
+++ b/src/avr/i2c.c
@@ -11,6 +11,7 @@
#include "gpio.h" // i2c_setup
#include "internal.h" // GPIO
#include "sched.h" // sched_shutdown
+#include "i2ccmds.h" // I2C_BUS_SUCCESS
DECL_ENUMERATION("i2c_bus", "twi", 0);
@@ -94,7 +95,7 @@ i2c_stop(uint32_t timeout)
TWCR = (1<<TWEN) | (1<<TWINT) | (1<<TWSTO);
}
-void
+int
i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
{
uint32_t timeout = timer_read_time() + timer_from_us(5000);
@@ -104,9 +105,11 @@ i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
while (write_len--)
i2c_send_byte(*write++, timeout);
i2c_stop(timeout);
+
+ 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)
{
@@ -120,4 +123,6 @@ i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
while (read_len--)
i2c_receive_byte(read++, timeout, read_len);
i2c_stop(timeout);
+
+ return I2C_BUS_SUCCESS;
}