From 2679a916be40ff628b1bd27a11689971a9014883 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Fri, 24 Apr 2015 16:07:17 +0100 Subject: [PATCH] gpio.c: mraa_gpio_get_* now return -1 in error cases Signed-off-by: Brendan Le Foll --- api/mraa/gpio.h | 4 ++-- api/mraa/gpio.hpp | 2 +- src/gpio/gpio.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/mraa/gpio.h b/api/mraa/gpio.h index 3e92966..c0a5145 100644 --- a/api/mraa/gpio.h +++ b/api/mraa/gpio.h @@ -195,7 +195,7 @@ mraa_result_t mraa_gpio_owner(mraa_gpio_context dev, mraa_boolean_t owner); mraa_result_t mraa_gpio_use_mmaped(mraa_gpio_context dev, mraa_boolean_t mmap); /** - * Get a pin number of the gpio + * Get a pin number of the gpio, invalid will return -1 * * @param dev The Gpio context * @return Pin number @@ -203,7 +203,7 @@ mraa_result_t mraa_gpio_use_mmaped(mraa_gpio_context dev, mraa_boolean_t mmap); int mraa_gpio_get_pin(mraa_gpio_context dev); /** - * Get a gpio number as used within sysfs + * Get a gpio number as used within sysfs, invalid will return -1 * * @param dev The Gpio context * @return gpio number diff --git a/api/mraa/gpio.hpp b/api/mraa/gpio.hpp index a0c2f0d..01751ad 100644 --- a/api/mraa/gpio.hpp +++ b/api/mraa/gpio.hpp @@ -292,7 +292,7 @@ class Gpio } /** * Get pin number of Gpio. If raw param is True will return the - * number as used within sysfs + * number as used within sysfs. Invalid will return -1. * * @param raw (optional) get the raw gpio number. * @return Pin number diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c index a7f88bf..5fe42bb 100644 --- a/src/gpio/gpio.c +++ b/src/gpio/gpio.c @@ -595,6 +595,7 @@ mraa_gpio_get_pin(mraa_gpio_context dev) { if (dev == NULL) { syslog(LOG_ERR, "gpio: context is invalid"); + return -1; } return dev->phy_pin; } @@ -604,6 +605,7 @@ mraa_gpio_get_pin_raw(mraa_gpio_context dev) { if (dev == NULL) { syslog(LOG_ERR, "gpio: context is invalid"); + return -1; } return dev->pin; }