summaryrefslogtreecommitdiff
path: root/peripheral/libmraa/src/i2c/i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'peripheral/libmraa/src/i2c/i2c.c')
-rw-r--r--peripheral/libmraa/src/i2c/i2c.c84
1 files changed, 36 insertions, 48 deletions
diff --git a/peripheral/libmraa/src/i2c/i2c.c b/peripheral/libmraa/src/i2c/i2c.c
index 85b0172..e196ab7 100644
--- a/peripheral/libmraa/src/i2c/i2c.c
+++ b/peripheral/libmraa/src/i2c/i2c.c
@@ -36,8 +36,7 @@
#include <sys/errno.h>
#include <sys/ioctl.h>
#include "linux/i2c-dev.h"
-#include <errno.h>
-#include <string.h>
+
typedef union i2c_smbus_data_union {
uint8_t byte; ///< data byte
@@ -79,7 +78,7 @@ mraa_i2c_init_internal(mraa_adv_func_t* advance_func, unsigned int bus)
mraa_i2c_context dev = (mraa_i2c_context) calloc(1, sizeof(struct _i2c));
if (dev == NULL) {
- syslog(LOG_CRIT, "i2c%i_init: Failed to allocate memory for context", bus);
+ syslog(LOG_CRIT, "i2c: Failed to allocate memory for context");
return NULL;
}
@@ -100,13 +99,13 @@ mraa_i2c_init_internal(mraa_adv_func_t* advance_func, unsigned int bus)
char filepath[32];
snprintf(filepath, 32, "/dev/i2c-%u", bus);
if ((dev->fh = open(filepath, O_RDWR)) < 1) {
- syslog(LOG_ERR, "i2c%i_init: Failed to open requested i2c port %s: %s", bus, filepath, strerror(errno));
- status = MRAA_ERROR_INVALID_RESOURCE;
+ syslog(LOG_ERR, "i2c: Failed to open requested i2c port %s", filepath);
+ status = MRAA_ERROR_NO_RESOURCES;
goto init_internal_cleanup;
}
if (ioctl(dev->fh, I2C_FUNCS, &dev->funcs) < 0) {
- syslog(LOG_CRIT, "i2c%i_init: Failed to get I2C_FUNC map from device: %s", bus, strerror(errno));
+ syslog(LOG_CRIT, "i2c: Failed to get I2C_FUNC map from device");
dev->funcs = 0;
}
}
@@ -134,39 +133,39 @@ mraa_i2c_init(int bus)
{
mraa_board_t* board = plat;
if (board == NULL) {
- syslog(LOG_ERR, "i2c%i_init: Platform Not Initialised", bus);
+ syslog(LOG_ERR, "i2c: Platform Not Initialised");
return NULL;
}
if (mraa_is_sub_platform_id(bus)) {
- syslog(LOG_NOTICE, "i2c%i_init: Using sub platform", bus);
+ syslog(LOG_NOTICE, "i2c: Using sub platform");
board = board->sub_platform;
if (board == NULL) {
- syslog(LOG_ERR, "i2c%i_init: Sub platform Not Initialised", bus);
+ syslog(LOG_ERR, "i2c: Sub platform Not Initialised");
return NULL;
}
bus = mraa_get_sub_platform_index(bus);
}
- syslog(LOG_NOTICE, "i2c_init: Selected bus %d", bus);
+ syslog(LOG_NOTICE, "i2c: Selected bus %d", bus);
if (board->i2c_bus_count == 0) {
- syslog(LOG_ERR, "i2c_init: No i2c buses defined in platform");
+ syslog(LOG_ERR, "No i2c buses defined in platform");
return NULL;
}
if (bus >= board->i2c_bus_count) {
- syslog(LOG_ERR, "i2c_init: i2c%i over i2c bus count", bus);
+ syslog(LOG_ERR, "Above i2c bus count");
return NULL;
}
if (board->i2c_bus[bus].bus_id == -1) {
- syslog(LOG_ERR, "Invalid i2c bus %i, moving to default i2c bus %i", bus, board->def_i2c_bus);
+ syslog(LOG_ERR, "Invalid i2c bus, moving to default i2c bus");
bus = board->def_i2c_bus;
}
if (!board->no_bus_mux) {
int pos = board->i2c_bus[bus].sda;
if (board->pins[pos].i2c.mux_total > 0) {
if (mraa_setup_mux_mapped(board->pins[pos].i2c) != MRAA_SUCCESS) {
- syslog(LOG_ERR, "i2c%i_init: Failed to set-up i2c sda multiplexer", bus);
+ syslog(LOG_ERR, "i2c: Failed to set-up i2c sda multiplexer");
return NULL;
}
}
@@ -174,7 +173,7 @@ mraa_i2c_init(int bus)
pos = board->i2c_bus[bus].scl;
if (board->pins[pos].i2c.mux_total > 0) {
if (mraa_setup_mux_mapped(board->pins[pos].i2c) != MRAA_SUCCESS) {
- syslog(LOG_ERR, "i2c%i_init: Failed to set-up i2c scl multiplexer", bus);
+ syslog(LOG_ERR, "i2c: Failed to set-up i2c scl multiplexer");
return NULL;
}
}
@@ -214,44 +213,44 @@ mraa_i2c_read(mraa_i2c_context dev, uint8_t* data, int length)
return length;
}
- return -1;
+ return 0;
}
-int
+uint8_t
mraa_i2c_read_byte(mraa_i2c_context dev)
{
if (IS_FUNC_DEFINED(dev, i2c_read_byte_replace))
return dev->advance_func->i2c_read_byte_replace(dev);
i2c_smbus_data_t d;
if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_READ, I2C_NOCMD, I2C_SMBUS_BYTE, &d) < 0) {
- syslog(LOG_ERR, "i2c%i: read_byte: Access error: %s", dev->busnum, strerror(errno));
- return -1;
+ syslog(LOG_ERR, "i2c: Failed to write");
+ return 0;
}
return 0x0FF & d.byte;
}
-int
+uint8_t
mraa_i2c_read_byte_data(mraa_i2c_context dev, uint8_t command)
{
if (IS_FUNC_DEFINED(dev, i2c_read_byte_data_replace))
return dev->advance_func->i2c_read_byte_data_replace(dev, command);
i2c_smbus_data_t d;
if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_READ, command, I2C_SMBUS_BYTE_DATA, &d) < 0) {
- syslog(LOG_ERR, "i2c%i: read_byte_data: Access error: %s", dev->busnum, strerror(errno));
- return -1;
+ syslog(LOG_ERR, "i2c: Failed to write");
+ return 0;
}
return 0x0FF & d.byte;
}
-int
+uint16_t
mraa_i2c_read_word_data(mraa_i2c_context dev, uint8_t command)
{
if (IS_FUNC_DEFINED(dev, i2c_read_word_data_replace))
return dev->advance_func->i2c_read_word_data_replace(dev, command);
i2c_smbus_data_t d;
if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_READ, command, I2C_SMBUS_WORD_DATA, &d) < 0) {
- syslog(LOG_ERR, "i2c%i: read_word_data: Access error: %s", dev->busnum, strerror(errno));
- return -1;
+ syslog(LOG_ERR, "i2c: Failed to write");
+ return 0;
}
return 0xFFFF & d.word;
}
@@ -267,23 +266,16 @@ mraa_i2c_read_bytes_data(mraa_i2c_context dev, uint8_t command, uint8_t* data, i
m[0].addr = dev->addr;
m[0].flags = 0x00;
m[0].len = 1;
- m[0].buf = (char*) &command;
+ m[0].buf = &command;
m[1].addr = dev->addr;
m[1].flags = I2C_M_RD;
m[1].len = length;
- m[1].buf = (char*) data;
+ m[1].buf = data;
d.msgs = m;
d.nmsgs = 2;
- int ret = ioctl(dev->fh, I2C_RDWR, &d);
-
- if (ret < 0)
- {
- syslog(LOG_ERR, "i2c%i: read_bytes_data: Access error: %s", dev->busnum, strerror(errno));
- return -1;
- }
- return length;
+ return ioctl(dev->fh, I2C_RDWR, &d) < 0 ? -1 : length;
}
mraa_result_t
@@ -306,11 +298,7 @@ mraa_i2c_write(mraa_i2c_context dev, const uint8_t* data, int length)
}
d.block[0] = length;
- if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_WRITE, command, I2C_SMBUS_I2C_BLOCK_DATA, &d) < 0) {
- syslog(LOG_ERR, "i2c%i: write: Access error: %s", dev->busnum, strerror(errno));
- return MRAA_ERROR_UNSPECIFIED;
- }
- return MRAA_SUCCESS;
+ return mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_WRITE, command, I2C_SMBUS_I2C_BLOCK_DATA, &d);
}
mraa_result_t
@@ -320,8 +308,8 @@ mraa_i2c_write_byte(mraa_i2c_context dev, const uint8_t data)
return dev->advance_func->i2c_write_byte_replace(dev, data);
} else {
if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_WRITE, data, I2C_SMBUS_BYTE, NULL) < 0) {
- syslog(LOG_ERR, "i2c%i: write_byte: Access error: %s", dev->busnum, strerror(errno));
- return MRAA_ERROR_UNSPECIFIED;
+ syslog(LOG_ERR, "i2c: Failed to write");
+ return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
@@ -335,8 +323,8 @@ mraa_i2c_write_byte_data(mraa_i2c_context dev, const uint8_t data, const uint8_t
i2c_smbus_data_t d;
d.byte = data;
if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_WRITE, command, I2C_SMBUS_BYTE_DATA, &d) < 0) {
- syslog(LOG_ERR, "i2c%i: write_byte_data: Access error: %s", dev->busnum, strerror(errno));
- return MRAA_ERROR_UNSPECIFIED;
+ syslog(LOG_ERR, "i2c: Failed to write");
+ return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
@@ -349,8 +337,8 @@ mraa_i2c_write_word_data(mraa_i2c_context dev, const uint16_t data, const uint8_
i2c_smbus_data_t d;
d.word = data;
if (mraa_i2c_smbus_access(dev->fh, I2C_SMBUS_WRITE, command, I2C_SMBUS_WORD_DATA, &d) < 0) {
- syslog(LOG_ERR, "i2c%i: write_word_data: Access error: %s", dev->busnum, strerror(errno));
- return MRAA_ERROR_UNSPECIFIED;
+ syslog(LOG_ERR, "i2c: Failed to write");
+ return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
@@ -367,8 +355,8 @@ mraa_i2c_address(mraa_i2c_context dev, uint8_t addr)
return dev->advance_func->i2c_address_replace(dev, addr);
} else {
if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) {
- syslog(LOG_ERR, "i2c%i: address: Failed to set slave address %d: %s", dev->busnum, addr, strerror(errno));
- return MRAA_ERROR_UNSPECIFIED;
+ syslog(LOG_ERR, "i2c: Failed to set slave address %d", addr);
+ return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 01:50:40 +0000