Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

i2c: add clean {write, read}data functions

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-11-17 16:23:49 +00:00
parent 1133b32b5a
commit ac1c60d4fe
3 changed files with 101 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/i2c/i2c.c
View File

@@ -121,8 +121,13 @@ mraa_i2c_read_byte(mraa_i2c_context dev)
uint8_t
mraa_i2c_read_byte_data(mraa_i2c_context dev, uint8_t command)
{
uint8_t byte = i2c_smbus_read_byte_data(dev->fh, command);
return byte;
return (uint8_t) i2c_smbus_read_byte_data(dev->fh, command);
}
uint16_t
mraa_i2c_read_word_data(mraa_i2c_context dev, uint8_t command)
{
return (uint16_t) i2c_smbus_read_word_data(dev->fh, command);
}
mraa_result_t
@@ -130,7 +135,7 @@ mraa_i2c_write(mraa_i2c_context dev, const uint8_t* data, int length)
{
if (i2c_smbus_write_i2c_block_data(dev->fh, data[0], length-1, (uint8_t*) data+1) < 0) {
syslog(LOG_ERR, "i2c: Failed to write");
return MRAA_ERROR_INVALID_HANDLE;
return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
@@ -140,7 +145,27 @@ mraa_i2c_write_byte(mraa_i2c_context dev, const uint8_t data)
{
if (i2c_smbus_write_byte(dev->fh, data) < 0) {
syslog(LOG_ERR, "i2c: Failed to write");
return MRAA_ERROR_INVALID_HANDLE;
return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
mraa_result_t
mraa_i2c_write_byte_data(mraa_i2c_context dev, const uint8_t data, const uint8_t command)
{
if (i2c_smbus_write_byte_data(dev->fh, command, data) < 0) {
syslog(LOG_ERR, "i2c: Failed to write");
return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
mraa_result_t
mraa_i2c_write_word_data(mraa_i2c_context dev, const uint16_t data, const uint8_t command)
{
if (i2c_smbus_write_word_data(dev->fh, command, data) < 0) {
syslog(LOG_ERR, "i2c: Failed to write");
return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}
@@ -151,7 +176,7 @@ mraa_i2c_address(mraa_i2c_context dev, uint8_t addr)
dev->addr = (int) addr;
if (ioctl(dev->fh, I2C_SLAVE_FORCE, addr) < 0) {
syslog(LOG_ERR, "i2c: Failed to set slave address %d", addr);
return MRAA_ERROR_INVALID_HANDLE;
return MRAA_ERROR_INVALID_HANDLE;
}
return MRAA_SUCCESS;
}