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

maa: Update functions within maa to use new api.

Browse Source 
* Use new board definitions.

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-05-05 20:13:58 +01:00
parent dd89adc47b
commit ef4bdeebaa
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel_galileo_rev_d.c
View File

@@ -110,7 +110,6 @@ maa_intel_galileo_rev_d()
b->pins[9].gpio.pinmap = 19; b->pins[9].gpio.pinmap = 19;
b->pins[9].gpio.mux_total = 0; b->pins[9].gpio.mux_total = 0;
strncpy(b->pins[10].name, "IO10", 8); strncpy(b->pins[10].name, "IO10", 8);
b->pins[10].capabilites = (maa_pincapabilities_t) {1,1,1,0,1,0,0}; b->pins[10].capabilites = (maa_pincapabilities_t) {1,1,1,0,1,0,0};
b->pins[10].gpio.pinmap = 16; b->pins[10].gpio.pinmap = 16;

41
src/maa.c
View File

@@ -50,7 +50,7 @@ maa_init()
} }
static maa_result_t static maa_result_t
maa_setup_mux_mapped(maa_pininfo_t meta) maa_setup_mux_mapped(maa_pin_t meta)
{ {
int mi; int mi;
for (mi = 0; mi < meta.mux_total; mi++) { for (mi = 0; mi < meta.mux_total; mi++) {
@@ -72,12 +72,16 @@ maa_check_gpio(int pin)
if (plat == NULL) if (plat == NULL)
return -1; return -1;
if (pin < 0 || pin > plat->gpio_count) if (pin < 0 || pin > plat->phy_pin_count)
return -1; return -1;
if (plat->pins[pin].mux_total > 0)
if (maa_setup_mux_mapped(plat->pins[pin]) != MAA_SUCCESS) if(plat->pins[pin].capabilites.gpio != 1)
return -1; return -1;
return plat->pins[pin].pin;
if (plat->pins[pin].gpio.mux_total > 0)
if (maa_setup_mux_mapped(plat->pins[pin].gpio) != MAA_SUCCESS)
return -1;
return plat->pins[pin].gpio.pinmap;
} }
unsigned int unsigned int
@@ -91,15 +95,18 @@ maa_check_aio(int aio)
int pin = aio + plat->gpio_count; int pin = aio + plat->gpio_count;
if (plat->pins[pin].mux_total > 0) if(plat->pins[pin].capabilites.aio != 1)
if (maa_setup_mux_mapped(plat->pins[pin]) != MAA_SUCCESS) return -1;
return -2;
if (plat->pins[pin].aio.mux_total > 0)
if (maa_setup_mux_mapped(plat->pins[pin].aio) != MAA_SUCCESS)
return -1;
return plat->pins[pin].aio.pinmap;
return plat->pins[pin].pin;
} }
unsigned int unsigned int
maa_check_i2c(int bus) maa_check_i2c(int bus_s)
{ {
if (plat == NULL) if (plat == NULL)
return -3; return -3;
@@ -108,11 +115,17 @@ maa_check_i2c(int bus)
fprintf(stderr, "No i2c buses defined in platform"); fprintf(stderr, "No i2c buses defined in platform");
return -1; return -1;
} }
int pin = (plat->gpio_count + plat->aio_count) + bus; int bus = 0;
if (plat->pins[pin].mux_total > 0) int pos = plat->i2c_bus[bus].sda;
if (maa_setup_mux_mapped(plat->pins[pin]) != MAA_SUCCESS) if (plat->pins[pos].i2c.mux_total > 0)
if (maa_setup_mux_mapped(plat->pins[pos].i2c) != MAA_SUCCESS)
return -2; return -2;
return plat->pins[pin].pin; pos = plat->i2c_bus[bus].scl;
if (plat->pins[pos].i2c.mux_total > 0)
if (maa_setup_mux_mapped(plat->pins[pos].i2c) != MAA_SUCCESS)
return -2;
return plat->i2c_bus[bus].bus_id;
} }