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

i2c: use default i2c bus in board config if invalid

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2014-10-23 18:05:07 +01:00
parent a6b3d384b2
commit 535d92ab79
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mraa_internal.h
View File

@@ -56,7 +56,7 @@ unsigned int mraa_setup_aio(int pin);
* *
* @return unsigned int if using /dev/i2c-2 returned would be 2 * @return unsigned int if using /dev/i2c-2 returned would be 2
*/ */
unsigned int mraa_setup_i2c(int bus); unsigned int mraa_setup_i2c(int* bus);
/** Setup spi interface, sets up multiplexer on device. /** Setup spi interface, sets up multiplexer on device.
* *

2
src/i2c/i2c.c
View File

@@ -29,7 +29,7 @@
mraa_i2c_context mraa_i2c_context
mraa_i2c_init(int bus) mraa_i2c_init(int bus)
{ {
int checked_pin = mraa_setup_i2c(bus); int checked_pin = mraa_setup_i2c(&bus);
if (checked_pin < 0) { if (checked_pin < 0) {
switch(checked_pin) { switch(checked_pin) {
case MRAA_NO_SUCH_IO: case MRAA_NO_SUCH_IO:

16
src/mraa.c
View File

@@ -198,7 +198,7 @@ mraa_setup_aio(int aio)
} }
unsigned int unsigned int
mraa_setup_i2c(int bus) mraa_setup_i2c(int* bus)
{ {
if (plat == NULL) if (plat == NULL)
return MRAA_PLATFORM_NO_INIT; return MRAA_PLATFORM_NO_INIT;
@@ -207,27 +207,27 @@ mraa_setup_i2c(int bus)
syslog(LOG_ERR, "No i2c buses defined in platform"); syslog(LOG_ERR, "No i2c buses defined in platform");
return MRAA_NO_SUCH_IO; return MRAA_NO_SUCH_IO;
} }
if (bus >= plat->i2c_bus_count) { if (*bus >= plat->i2c_bus_count) {
syslog(LOG_ERR, "Above i2c bus count"); syslog(LOG_ERR, "Above i2c bus count");
return MRAA_NO_SUCH_IO; return MRAA_NO_SUCH_IO;
} }
if (plat->i2c_bus[bus].bus_id == -1) { if (plat->i2c_bus[*bus].bus_id == -1) {
syslog(LOG_ERR, "Platform not currently allowed for mraa use"); syslog(LOG_ERR, "Invalid i2c bus, moving to default i2c bus");
return MRAA_NO_SUCH_IO; *bus = plat->def_i2c_bus;
} }
int pos = plat->i2c_bus[bus].sda; int pos = plat->i2c_bus[*bus].sda;
if (plat->pins[pos].i2c.mux_total > 0) if (plat->pins[pos].i2c.mux_total > 0)
if (mraa_setup_mux_mapped(plat->pins[pos].i2c) != MRAA_SUCCESS) if (mraa_setup_mux_mapped(plat->pins[pos].i2c) != MRAA_SUCCESS)
return MRAA_IO_SETUP_FAILURE; return MRAA_IO_SETUP_FAILURE;
pos = plat->i2c_bus[bus].scl; pos = plat->i2c_bus[*bus].scl;
if (plat->pins[pos].i2c.mux_total > 0) if (plat->pins[pos].i2c.mux_total > 0)
if (mraa_setup_mux_mapped(plat->pins[pos].i2c) != MRAA_SUCCESS) if (mraa_setup_mux_mapped(plat->pins[pos].i2c) != MRAA_SUCCESS)
return MRAA_IO_SETUP_FAILURE; return MRAA_IO_SETUP_FAILURE;
return plat->i2c_bus[bus].bus_id; return plat->i2c_bus[*bus].bus_id;
} }
mraa_spi_bus_t* mraa_spi_bus_t*