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

Peripheralman: Remove IIO from ioinit for android

Browse Source 
Since peripheral manager does not build in the IIO source, ifdef's were
added around the initio functionality for IIO.

IMO this is an ugly fix, but I don't see a better way since the
PERIPHERALMAN architecture is qualified throughout the CMake and source
with ifdef's.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-07-20 11:18:38 -07:00
parent 4487c98b6f
commit 6fe510a27f
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/initio/initio.c
View File

@@ -291,6 +291,7 @@ parse_pwm(char** proto, size_t n)
return dev;
}
#if !defined(PERIPHERALMAN)
static mraa_iio_context
parse_iio(char** proto, size_t n)
{
@@ -313,6 +314,7 @@ parse_iio(char** proto, size_t n)
return dev;
}
#endif
static mraa_i2c_context
parse_i2c(char** proto, size_t n)
@@ -633,7 +635,9 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
new_desc->gpios[new_desc->n_gpio++] = dev;
}
}
} else if (strncmp(str_tokens[0], IIO_KEY, strlen(IIO_KEY)) == 0 &&
}
#if !defined(PERIPHERALMAN)
else if (strncmp(str_tokens[0], IIO_KEY, strlen(IIO_KEY)) == 0 &&
strlen(str_tokens[0]) == strlen(IIO_KEY)) {
mraa_iio_context dev = parse_iio(str_tokens, num_desc_tokens);
if (!dev) {
@@ -650,7 +654,9 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
new_desc->iios[new_desc->n_iio++] = dev;
}
}
} else if (strncmp(str_tokens[0], I2C_KEY, strlen(I2C_KEY)) == 0 &&
}
#endif
else if (strncmp(str_tokens[0], I2C_KEY, strlen(I2C_KEY)) == 0 &&
strlen(str_tokens[0]) == strlen(I2C_KEY)) {
mraa_i2c_context dev = parse_i2c(str_tokens, num_desc_tokens);
if (!dev) {
@@ -807,12 +813,14 @@ mraa_io_close(mraa_io_descriptor* desc)
free(desc->i2cs);
}
#if !defined(PERIPHERALMAN)
for (int i = 0; i < desc->n_iio; ++i) {
mraa_iio_close(desc->iios[i]);
}
if (desc->n_iio) {
free(desc->iios);
}
#endif
for (int i = 0; i < desc->n_pwm; ++i) {
mraa_pwm_close(desc->pwms[i]);