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

initio.c: Re-applied clang-format for source

Browse Source 
Ran clang-format to conform to mraa's coding guide.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-07-23 21:51:58 -07:00
parent e772aec69d
commit b3c1c5ac3c
2 changed files with 47 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/initio/initio.c
View File

@@ -38,7 +38,7 @@
static mraa_result_t
mraa_atoi_x(const char* intStr, char** str_end, int* value, int base)
{
char *lendptr;
char* lendptr;
long val = strtol(intStr, &lendptr, base);
/* Test for no-conversion */
@@ -114,12 +114,10 @@ parse_uart_ow(char** proto, size_t n, const char* proto_full)
if (proto[1] && (mraa_atoi_x(proto[1], NULL, &bus, 0) == MRAA_SUCCESS)) {
dev = mraa_uart_ow_init(bus);
if (dev == NULL) {
syslog(LOG_ERR, "parse_uart_ow: could not init uart_ow bus '%d' from '%s'",
bus, proto_full);
syslog(LOG_ERR, "parse_uart_ow: could not init uart_ow bus '%d' from '%s'", bus, proto_full);
}
} else {
syslog(LOG_ERR, "parse_uart_ow: invalid uart_ow bus number '%s' from '%s'",
proto[1], proto_full);
syslog(LOG_ERR, "parse_uart_ow: invalid uart_ow bus number '%s' from '%s'", proto[1], proto_full);
}
return dev;
@@ -140,8 +138,7 @@ parse_uart(char** proto, size_t n, const char* proto_full)
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &uart, 0) == MRAA_SUCCESS)) {
dev = mraa_uart_init(uart);
if (dev == NULL) {
syslog(LOG_ERR, "parse_uart: could not init uart index '%d' from '%s'",
uart, proto_full);
syslog(LOG_ERR, "parse_uart: could not init uart index '%d' from '%s'", uart, proto_full);
return NULL;
} else {
if (++idx == n) {
@@ -149,17 +146,15 @@ parse_uart(char** proto, size_t n, const char* proto_full)
}
}
} else {
syslog(LOG_ERR, "parse_uart: invalid uart index '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_uart: invalid uart index '%s' from '%s'", proto[idx], proto_full);
return NULL;
}
/* Check for baudrate. */
unsigned int baudrate = -1;
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, (int*)&baudrate, 0) == MRAA_SUCCESS)) {
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, (int*) &baudrate, 0) == MRAA_SUCCESS)) {
if (mraa_uart_set_baudrate(dev, baudrate) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_uart: could not set uart baudrate '%d' from '%s'",
baudrate, proto_full);
syslog(LOG_ERR, "parse_uart: could not set uart baudrate '%d' from '%s'", baudrate, proto_full);
mraa_uart_stop(dev);
return NULL;
} else {
@@ -168,8 +163,7 @@ parse_uart(char** proto, size_t n, const char* proto_full)
}
}
} else {
syslog(LOG_ERR, "parse_uart: invalid uart baudrate '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_uart: invalid uart baudrate '%s' from '%s'", proto[idx], proto_full);
}
/* Check for mode - [int] bytesize, [mraa_uart_parity_t] parity, [int] stopbits. */
@@ -178,8 +172,7 @@ parse_uart(char** proto, size_t n, const char* proto_full)
/* Check for bytesize. */
int bytesize = -1;
if (mraa_atoi_x(proto[idx], &end, &bytesize, 0) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_uart: error reading uart bytesize '%d' from '%s'",
bytesize, proto_full);
syslog(LOG_ERR, "parse_uart: error reading uart bytesize '%d' from '%s'", bytesize, proto_full);
mraa_uart_stop(dev);
return NULL;
}
@@ -203,23 +196,20 @@ parse_uart(char** proto, size_t n, const char* proto_full)
}
if (parity == -1) {
syslog(LOG_ERR, "parse_uart: error reading uart parity '%s' from '%s'",
end, proto_full);
syslog(LOG_ERR, "parse_uart: error reading uart parity '%s' from '%s'", end, proto_full);
mraa_uart_stop(dev);
return NULL;
}
int stopbits = -1;
if (mraa_atoi_x(end, NULL, &stopbits, 0) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_uart: error reading uart bytesize '%d' from '%s'",
bytesize, proto_full);
syslog(LOG_ERR, "parse_uart: error reading uart bytesize '%d' from '%s'", bytesize, proto_full);
mraa_uart_stop(dev);
return NULL;
}
if (mraa_uart_set_mode(dev, bytesize, (mraa_uart_parity_t) parity, stopbits) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_uart: error setting up uart mode '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_uart: error setting up uart mode '%s' from '%s'", proto[idx], proto_full);
mraa_uart_stop(dev);
return NULL;
}
@@ -242,8 +232,7 @@ parse_spi(char** proto, size_t n, const char* proto_full)
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &bus, 0) == MRAA_SUCCESS)) {
dev = mraa_spi_init(bus);
if (dev == NULL) {
syslog(LOG_ERR, "parse_spi: could not init spi bus '%d' from '%s'",
bus, proto_full);
syslog(LOG_ERR, "parse_spi: could not init spi bus '%d' from '%s'", bus, proto_full);
return NULL;
} else {
if (++idx == n) {
@@ -251,8 +240,7 @@ parse_spi(char** proto, size_t n, const char* proto_full)
}
}
} else {
syslog(LOG_ERR, "parse_spi: invalid spi bus number '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_spi: invalid spi bus number '%s' from '%s'", proto[idx], proto_full);
return NULL;
}
@@ -270,8 +258,7 @@ parse_spi(char** proto, size_t n, const char* proto_full)
if (mode != -1) {
if (mraa_spi_mode(dev, (mraa_spi_mode_t) mode) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_spi: error setting up spi mode '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_spi: error setting up spi mode '%s' from '%s'", proto[idx], proto_full);
mraa_spi_stop(dev);
return NULL;
} else {
@@ -284,14 +271,12 @@ parse_spi(char** proto, size_t n, const char* proto_full)
int frequency;
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &frequency, 0) == MRAA_SUCCESS)) {
if (mraa_spi_frequency(dev, frequency) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_spi: error setting up spi frequency '%d' from '%s'",
frequency, proto_full);
syslog(LOG_ERR, "parse_spi: error setting up spi frequency '%d' from '%s'", frequency, proto_full);
mraa_spi_stop(dev);
return NULL;
}
} else {
syslog(LOG_ERR, "parse_spi: invalid spi frequency '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_spi: invalid spi frequency '%s' from '%s'", proto[idx], proto_full);
}
return dev;
@@ -335,12 +320,10 @@ parse_iio(char** proto, size_t n, const char* proto_full)
if (proto[1] && (mraa_atoi_x(proto[1], NULL, &device, 0) == MRAA_SUCCESS)) {
dev = mraa_iio_init(device);
if (dev == NULL) {
syslog(LOG_ERR, "parse_iio: could not init iio device '%d' from '%s'",
device, proto_full);
syslog(LOG_ERR, "parse_iio: could not init iio device '%d' from '%s'", device, proto_full);
}
} else {
syslog(LOG_ERR, "parse_iio: invalid iio device number '%s' from '%s'",
proto[1], proto_full);
syslog(LOG_ERR, "parse_iio: invalid iio device number '%s' from '%s'", proto[1], proto_full);
}
return dev;
@@ -362,24 +345,21 @@ parse_i2c(char** proto, size_t n, const char* proto_full)
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &bus, 0) == MRAA_SUCCESS)) {
dev = mraa_i2c_init(bus);
if (dev == NULL) {
syslog(LOG_ERR, "parse_i2c: could not init i2c bus '%d' from '%s'",
bus, proto_full);
syslog(LOG_ERR, "parse_i2c: could not init i2c bus '%d' from '%s'", bus, proto_full);
return NULL;
} else {
if (++idx == n)
return dev;
}
} else {
syslog(LOG_ERR, "parse_i2c: invalid i2c bus number '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_i2c: invalid i2c bus number '%s' from '%s'", proto[idx], proto_full);
return NULL;
}
int address = -1;
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &address, 0) == MRAA_SUCCESS)) {
if (mraa_i2c_address(dev, (uint8_t) address) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_i2c: error setting up i2c address '0x%02x' from '%s'",
address, proto_full);
syslog(LOG_ERR, "parse_i2c: error setting up i2c address '0x%02x' from '%s'", address, proto_full);
mraa_i2c_stop(dev);
return NULL;
} else {
@@ -400,8 +380,7 @@ parse_i2c(char** proto, size_t n, const char* proto_full)
if (mode != -1) {
if (mraa_i2c_frequency(dev, (mraa_i2c_mode_t) mode) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_i2c: error setting up gpio driver mode '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_i2c: error setting up gpio driver mode '%s' from '%s'", proto[idx], proto_full);
mraa_i2c_stop(dev);
return NULL;
}
@@ -425,8 +404,7 @@ parse_aio(char** proto, size_t n, const char* proto_full)
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &aio_num, 0) == MRAA_SUCCESS)) {
dev = mraa_aio_init(aio_num);
if (dev == NULL) {
syslog(LOG_ERR, "parse_aio: could not init aio number '%d' from '%s'",
aio_num, proto_full);
syslog(LOG_ERR, "parse_aio: could not init aio number '%d' from '%s'", aio_num, proto_full);
return NULL;
} else {
if (++idx == n) {
@@ -434,22 +412,19 @@ parse_aio(char** proto, size_t n, const char* proto_full)
}
}
} else {
syslog(LOG_ERR, "parse_aio: failed to parse '%s' as integer from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_aio: failed to parse '%s' as integer from '%s'", proto[idx], proto_full);
return NULL;
}
int num_bits = -1;
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &num_bits, 0) == MRAA_SUCCESS)) {
if (mraa_aio_set_bit(dev, num_bits) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_aio: error setting up aio bits '%d' from '%s'",
num_bits, proto_full);
syslog(LOG_ERR, "parse_aio: error setting up aio bits '%d' from '%s'", num_bits, proto_full);
mraa_aio_close(dev);
return NULL;
}
} else {
syslog(LOG_ERR, "parse_aio: invalid aio bit number '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_aio: invalid aio bit number '%s' from '%s'", proto[idx], proto_full);
mraa_aio_close(dev);
return NULL;
}
@@ -472,13 +447,11 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (proto[idx] && (mraa_atoi_x(proto[idx], NULL, &gpio_num, 0) == MRAA_SUCCESS)) {
dev = mraa_gpio_init(gpio_num);
if (dev == NULL) {
syslog(LOG_ERR, "parse_gpio: could not init gpio number '%d' from '%s'",
gpio_num, proto_full);
syslog(LOG_ERR, "parse_gpio: could not init gpio number '%d' from '%s'", gpio_num, proto_full);
return NULL;
}
} else {
syslog(LOG_ERR, "parse_gpio: invalid gpio number '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_gpio: invalid gpio number '%s' from '%s'", proto[idx], proto_full);
return NULL;
}
if (++idx == n) {
@@ -499,8 +472,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (dir != -1) {
if (mraa_gpio_dir(dev, (mraa_gpio_dir_t) dir) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: error setting up gpio direction '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_gpio: error setting up gpio direction '%s' from '%s'", proto[idx], proto_full);
mraa_gpio_close(dev);
return NULL;
} else {
@@ -511,8 +483,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
} else {
/* Set direction to default - output. */
if (mraa_gpio_dir(dev, MRAA_GPIO_OUT) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: error setting up gpio direction '%s' from '%s'",
G_DIR_OUT, proto_full);
syslog(LOG_ERR, "parse_gpio: error setting up gpio direction '%s' from '%s'", G_DIR_OUT, proto_full);
mraa_gpio_close(dev);
return NULL;
}
@@ -523,7 +494,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (mraa_atoi_x(proto[idx], NULL, &value, 0) == MRAA_SUCCESS) {
if (mraa_gpio_write(dev, value) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: could not init gpio number '%d' with value '%d' from '%s'",
gpio_num, value, proto_full);
gpio_num, value, proto_full);
mraa_gpio_close(dev);
return NULL;
} else {
@@ -553,8 +524,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (mode != -1) {
if (mraa_gpio_mode(dev, (mraa_gpio_mode_t) mode) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: error setting up gpio mode '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_gpio: error setting up gpio mode '%s' from '%s'", proto[idx], proto_full);
mraa_gpio_close(dev);
return NULL;
} else {
@@ -578,8 +548,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (edge != -1) {
if (mraa_gpio_edge_mode(dev, (mraa_gpio_edge_t) edge) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: error setting up gpio edge '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_gpio: error setting up gpio edge '%s' from '%s'", proto[idx], proto_full);
mraa_gpio_close(dev);
return NULL;
} else {
@@ -599,8 +568,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (input_mode != -1) {
if (mraa_gpio_input_mode(dev, (mraa_gpio_input_mode_t) input_mode) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: error setting up gpio input mode '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_gpio: error setting up gpio input mode '%s' from '%s'", proto[idx], proto_full);
mraa_gpio_close(dev);
return NULL;
} else {
@@ -620,8 +588,7 @@ parse_gpio(char** proto, size_t n, const char* proto_full)
if (driver_mode != -1) {
if (mraa_gpio_out_driver_mode(dev, (mraa_gpio_out_driver_mode_t) driver_mode) != MRAA_SUCCESS) {
syslog(LOG_ERR, "parse_gpio: error setting up gpio driver mode '%s' from '%s'",
proto[idx], proto_full);
syslog(LOG_ERR, "parse_gpio: error setting up gpio driver mode '%s' from '%s'", proto[idx], proto_full);
mraa_gpio_close(dev);
return NULL;
}
@@ -648,12 +615,10 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
int num_desc_tokens = 0;
char** str_tokens = mraa_tokenize_string(str_descs[i], TOK_SEP, &num_desc_tokens);
if (strncmp(str_tokens[0], AIO_KEY, strlen(AIO_KEY)) == 0 &&
strlen(str_tokens[0]) == strlen(AIO_KEY)) {
if (strncmp(str_tokens[0], AIO_KEY, strlen(AIO_KEY)) == 0 && strlen(str_tokens[0]) == strlen(AIO_KEY)) {
mraa_aio_context dev = parse_aio(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing aio init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing aio init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -670,8 +635,7 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
strlen(str_tokens[0]) == strlen(GPIO_KEY)) {
mraa_gpio_context dev = parse_gpio(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing gpio init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing gpio init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -688,11 +652,10 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
}
#if !defined(PERIPHERALMAN)
else if (strncmp(str_tokens[0], IIO_KEY, strlen(IIO_KEY)) == 0 &&
strlen(str_tokens[0]) == strlen(IIO_KEY)) {
strlen(str_tokens[0]) == strlen(IIO_KEY)) {
mraa_iio_context dev = parse_iio(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing iio init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing iio init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -708,11 +671,10 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
}
#endif
else if (strncmp(str_tokens[0], I2C_KEY, strlen(I2C_KEY)) == 0 &&
strlen(str_tokens[0]) == strlen(I2C_KEY)) {
strlen(str_tokens[0]) == strlen(I2C_KEY)) {
mraa_i2c_context dev = parse_i2c(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing i2c init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing i2c init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -729,8 +691,7 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
strlen(str_tokens[0]) == strlen(PWM_KEY)) {
mraa_pwm_context dev = parse_pwm(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing pwm init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing pwm init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -747,8 +708,7 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
strlen(str_tokens[0]) == strlen(SPI_KEY)) {
mraa_spi_context dev = parse_spi(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing spi init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing spi init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -765,8 +725,7 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
strlen(str_tokens[0]) == strlen(UART_KEY)) {
mraa_uart_context dev = parse_uart(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing uart init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing uart init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}
@@ -784,8 +743,7 @@ mraa_io_init(const char* strdesc, mraa_io_descriptor** desc)
strlen(str_tokens[0]) == strlen(UART_OW_KEY)) {
mraa_uart_ow_context dev = parse_uart_ow(str_tokens, num_desc_tokens, str_descs[i]);
if (!dev) {
syslog(LOG_ERR, "mraa_io_init: error parsing uart_ow init string '%s'",
str_descs[i]);
syslog(LOG_ERR, "mraa_io_init: error parsing uart_ow init string '%s'", str_descs[i]);
status = MRAA_ERROR_INVALID_HANDLE;
}

12
tests/unit/api/mraa_initio_h_unit.cxx
View File

@@ -29,18 +29,6 @@
/* MRAA API common test fixture */
class mraa_initio_h_unit : public ::testing::Test
{
protected:
/* One-time setup logic if needed */
mraa_initio_h_unit() {}
/* One-time tear-down logic if needed */
virtual ~mraa_initio_h_unit() {}
/* Per-test setup logic if needed */
virtual void SetUp() {}
/* Per-test tear-down logic if needed */
virtual void TearDown() {}
};
/* Test for an invalid AIO init. */