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

pinmap: More work around abstracting pin information

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-04-30 11:13:36 +01:00
parent da27e37a4c
commit d4427ec35e
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/maa.h
View File

@@ -79,6 +79,7 @@ typedef struct {
unsigned int maa_check_gpio(int pin); unsigned int maa_check_gpio(int pin);
unsigned int maa_check_aio(int pin); unsigned int maa_check_aio(int pin);
unsigned int maa_check_pwm(int pin);
/** Get the version string of maa autogenerated from git tag /** Get the version string of maa autogenerated from git tag
* *

30
src/maa.c
View File

@@ -42,6 +42,18 @@ maa_init()
return MAA_ERROR_FEATURE_NOT_IMPLEMENTED; return MAA_ERROR_FEATURE_NOT_IMPLEMENTED;
} }
static maa_result_t
maa_setup_mux_mapped(maa_pininfo meta)
{
int mi;
for(mi = 0; mi < meta.mux_total; mi++) {
maa_gpio_context* mux_i;
mux_i = maa_gpio_init_raw(meta.mux[mi].pin);
maa_gpio_dir(mux_i, MAA_GPIO_OUT);
maa_gpio_write(mux_i, meta.mux[mi].value);
}
}
unsigned int unsigned int
maa_check_gpio(int pin){ maa_check_gpio(int pin){
@@ -49,18 +61,10 @@ maa_check_gpio(int pin){
return -1; return -1;
} }
//Check in gpio bounds? //Check in gpio bounds?
if(pindata[pin].mux_total > 0) { if(pindata[pin].mux_total > 0)
int mi; if(maa_setup_mux_mapped(pindata[pin]) != MAA_SUCCESS)
for(mi = 0; mi < pindata[pin].mux_total; mi++) { return -1;
//Do we want to keep the gpio object around
//I dont think so return pindata[pin].pin;
maa_gpio_context* mux_i;
//TODO CHANGE TO RAW
mux_i = maa_gpio_init(pindata[pin].mux[mi].pin);
maa_gpio_dir(mux_i, "out");
maa_gpio_write(mux_i, pindata[pin].mux[mi].value);
}
}
return pindata[pin].pin
} }