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

i2c.c: Fix identation/style and simplify logic in mraa_i2c_read

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Mihai Tudor Panu
2015-12-01 11:48:36 +00:00
committed by Brendan Le Foll
parent e8cb060f4e
commit efc79d13c0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/i2c/i2c.c
View File

@@ -120,7 +120,7 @@ mraa_i2c_init_internal(mraa_adv_func_t* advance_func, unsigned int bus)
init_internal_cleanup: init_internal_cleanup:
if (status == MRAA_SUCCESS) { if (status == MRAA_SUCCESS) {
return dev; return dev;
} else { } else {
if (dev != NULL) if (dev != NULL)
free(dev); free(dev);
return NULL; return NULL;
@@ -202,14 +202,17 @@ int
mraa_i2c_read(mraa_i2c_context dev, uint8_t* data, int length) mraa_i2c_read(mraa_i2c_context dev, uint8_t* data, int length)
{ {
int bytes_read = 0; int bytes_read = 0;
if (IS_FUNC_DEFINED(dev, i2c_read_replace)) if (IS_FUNC_DEFINED(dev, i2c_read_replace)) {
bytes_read = dev->advance_func->i2c_read_replace(dev, data, length); bytes_read = dev->advance_func->i2c_read_replace(dev, data, length);
else }
else {
bytes_read = read(dev->fh, data, length); bytes_read = read(dev->fh, data, length);
if (bytes_read == length) }
return length; if (bytes_read == length) {
else return length;
return 0; }
return 0;
} }
uint8_t uint8_t