X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fgpio.c;h=d86d24113b9b3c7fe647a4f1733f64f4d0f3feee;hp=c2e6da9d7fce8a715228b639bda3ac3714026f4e;hb=HEAD;hpb=7237e91262251a138cf150f9fcfe7b05d0e5904b diff --git a/src/hardware/baylibre-acme/gpio.c b/src/hardware/baylibre-acme/gpio.c index c2e6da9d..d86d2411 100644 --- a/src/hardware/baylibre-acme/gpio.c +++ b/src/hardware/baylibre-acme/gpio.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -63,6 +64,10 @@ SR_PRIV int sr_gpio_export(unsigned gpio) if (exported) return 0; /* Already exported. */ + status = sr_gpio_set_direction(gpio, GPIO_DIR_OUT); + if (status < 0) + return status; + buf = g_string_sized_new(16); g_string_printf(buf, "%u\n", gpio); status = open_and_write("/sys/class/gpio/export", buf->str); @@ -125,7 +130,7 @@ SR_PRIV int sr_gpio_get_value(int gpio) status = fscanf(fd, "%d", &ret); fclose(fd); if (status != 1) { - sr_err("Error reading from %s: %s", path, g_strerror(errno)); + sr_err("Error reading from %s: %s", path->str, g_strerror(errno)); g_string_free(path, TRUE); return -1; } @@ -142,10 +147,6 @@ SR_PRIV int sr_gpio_setval_export(int gpio, int value) if (status < 0) return status; - status = sr_gpio_set_direction(gpio, GPIO_DIR_OUT); - if (status < 0) - return status; - status = sr_gpio_set_value(gpio, value); if (status < 0) return status; @@ -161,9 +162,5 @@ SR_PRIV int sr_gpio_getval_export(int gpio) if (status < 0) return status; - status = sr_gpio_set_direction(gpio, GPIO_DIR_IN); - if (status < 0) - return status; - return sr_gpio_get_value(gpio); }