#include "dirent.h"
#include <string.h>
#include <poll.h>
-#include <stropts.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
#define MAX_SIZE 128
#define IIO_DEVICE "iio:device"
mraa_iio_context
mraa_iio_init(int device)
{
- if (plat_iio->iio_device_count == 0 || device > plat_iio->iio_device_count) {
+ if (plat_iio->iio_device_count == 0 || device >= plat_iio->iio_device_count) {
return NULL;
}
}
dev->chan_num = chan_num;
// no need proceed if no channel found
- if (chan_num == 0)
+ if (chan_num == 0) {
+ closedir(dir);
return MRAA_SUCCESS;
+ }
mraa_iio_channel* chan;
dev->channels = calloc(chan_num, sizeof(mraa_iio_channel));
seekdir(dir, 0);
if (strcmp(ent->d_name + strlen(ent->d_name) - strlen("_index"), "_index") == 0) {
snprintf(buf, MAX_SIZE, IIO_SYSFS_DEVICE "%d/" IIO_SCAN_ELEM "/%s", dev->num, ent->d_name);
fd = open(buf, O_RDONLY);
- if (fd > 0) {
+ if (fd != -1) {
if (read(fd, readbuf, 2 * sizeof(char)) != 2) {
+ close(fd);
break;
}
chan_num = ((int) strtol(readbuf, NULL, 10));
// grab the type of the buffer
snprintf(buf, MAX_SIZE, "%stype", str);
fd = open(buf, O_RDONLY);
- if (fd > 0) {
+ if (fd != -1) {
read(fd, readbuf, 31 * sizeof(char));
ret = sscanf(readbuf, "%ce:%c%u/%u>>%u", &shortbuf, &signchar, &chan->bits_used,
&padint, &chan->shift);
// grab the enable flag of channel
snprintf(buf, MAX_SIZE, "%sen", str);
fd = open(buf, O_RDONLY);
- if (fd > 0) {
+ if (fd != -1) {
if (read(fd, readbuf, 2 * sizeof(char)) != 2) {
syslog(LOG_ERR, "iio: Failed to read a sensible value from sysfs");
+ free(str);
+ close(fd);
return -1;
}
chan->enabled = (int) strtol(readbuf, NULL, 10);
}
}
}
+ closedir(dir);
return MRAA_SUCCESS;
}
mraa_iio_read_float(mraa_iio_context dev, const char* attr_name, float* data)
{
char buf[MAX_SIZE];
- mraa_result_t result = mraa_iio_read_string(dev, attr_name, buf);
+ mraa_result_t result = mraa_iio_read_string(dev, attr_name, buf, MAX_SIZE-1);
if (result != MRAA_SUCCESS)
return result;
int status = sscanf(buf, "%f", data);
mraa_result_t
-mraa_iio_read_integer(mraa_iio_context dev, const char* attr_name, int* data)
+mraa_iio_read_int(mraa_iio_context dev, const char* attr_name, int* data)
{
char buf[MAX_SIZE];
- mraa_result_t result = mraa_iio_read_string(dev, attr_name, buf);
+ mraa_result_t result = mraa_iio_read_string(dev, attr_name, buf, MAX_SIZE-1);
if (result != MRAA_SUCCESS)
return result;
int status = sscanf(buf, "%d", data);
}
mraa_result_t
-mraa_iio_read_string(mraa_iio_context dev, const char* attr_name, char* data)
+mraa_iio_read_string(mraa_iio_context dev, const char* attr_name, char* data, int max_len)
{
char buf[MAX_SIZE];
mraa_result_t result = MRAA_ERROR_UNSPECIFIED;
snprintf(buf, MAX_SIZE, IIO_SYSFS_DEVICE "%d/%s", dev->num, attr_name);
int fd = open(buf, O_RDONLY);
if (fd != -1) {
- ssize_t len = read(fd, data, MAX_SIZE);
+ ssize_t len = read(fd, data, max_len);
if (len > 0)
result = MRAA_SUCCESS;
close(fd);
}
mraa_result_t
-mraa_iio_write_integer(mraa_iio_context dev, const char* attr_name, const int data)
+mraa_iio_write_int(mraa_iio_context dev, const char* attr_name, const int data)
{
char buf[MAX_SIZE];
snprintf(buf, MAX_SIZE, "%d", data);
int curr_bytes = 0;
char shortbuf, signchar;
memset(buf, 0, MAX_SIZE);
+ memset(readbuf, 0, 32);
snprintf(buf, MAX_SIZE, IIO_SYSFS_DEVICE "%d/" IIO_EVENTS, dev->num);
dir = opendir(buf);
if (dir != NULL) {
}
dev->event_num = event_num;
// no need proceed if no event found
- if (event_num == 0)
+ if (event_num == 0) {
+ closedir(dir);
return MRAA_SUCCESS;
+ }
mraa_iio_event* event;
dev->events = calloc(event_num, sizeof(mraa_iio_event));
if (dev->events == NULL) {
event->name = strdup(ent->d_name);
snprintf(buf, MAX_SIZE, IIO_SYSFS_DEVICE "%d/" IIO_EVENTS "/%s", dev->num, ent->d_name);
fd = open(buf, O_RDONLY);
- if (fd > 0) {
+ if (fd != -1) {
if (read(fd, readbuf, 2 * sizeof(char)) != 2) {
+ close(fd);
break;
}
close(fd);
for (;;) {
if (mraa_iio_event_poll_nonblock(dev->fp_event, &data) == MRAA_SUCCESS) {
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
- dev->isr_event(&data);
+ dev->isr_event(&data, dev->isr_args);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
} else {
// we must have got an error code so die nicely
}
mraa_result_t
-mraa_iio_event_setup_callback(mraa_iio_context dev, void (*fptr)(struct iio_event_data* data), void* args)
+mraa_iio_event_setup_callback(mraa_iio_context dev, void (*fptr)(struct iio_event_data* data, void* args), void* args)
{
int ret;
char bu[MAX_SIZE];
}
dev->isr_event = fptr;
+ dev->isr_args = args;
pthread_create(&dev->thread_id, NULL, mraa_iio_event_handler, (void*) dev);
return MRAA_SUCCESS;
struct stat configfs_status;
struct stat trigger_status;
char buf[MAX_SIZE];
+ int ret;
if (stat(IIO_CONFIGFS_TRIGGER, &configfs_status) == 0) {
memset(buf, 0, MAX_SIZE);
snprintf(buf, MAX_SIZE, IIO_CONFIGFS_TRIGGER "%s", trigger);
- if (stat(buf, &trigger_status) != 0) {
- if (mkdir(buf, configfs_status.st_mode) == 0)
- return MRAA_SUCCESS;
- } else {
- // trigger folder already created
- return MRAA_SUCCESS;
- }
+ // we actually don't care if this doesn't succeed, as it just means
+ // it's already been initialised
+ mkdir(buf, configfs_status.st_mode);
}
return MRAA_ERROR_UNSPECIFIED;
if (strcmp(ent->d_name + strlen(ent->d_name) - strlen("_index"), "_index") == 0) {
snprintf(buf, MAX_SIZE, IIO_SYSFS_DEVICE "%d/" IIO_SCAN_ELEM "/%s", dev->num, ent->d_name);
fd = open(buf, O_RDONLY);
- if (fd > 0) {
+ if (fd != -1) {
if (read(fd, readbuf, 2 * sizeof(char)) != 2) {
+ close(fd);
break;
}
chan_num = ((int) strtol(readbuf, NULL, 10));
- chan = &dev->channels[chan_num];
- chan->index = chan_num;
- close(fd);
+ if (chan_num >= 0 && chan_num < dev->chan_num) {
+ chan = &dev->channels[chan_num];
+ chan->index = chan_num;
+ close(fd);
- buf[(strlen(buf) - 5)] = '\0';
- char* str = strdup(buf);
- // grab the enable flag of channel
- snprintf(buf, MAX_SIZE, "%sen", str);
- fd = open(buf, O_RDONLY);
- if (fd > 0) {
- if (read(fd, readbuf, 2 * sizeof(char)) != 2) {
- syslog(LOG_ERR, "iio: Failed to read a sensible value from sysfs");
- return -1;
- }
- chan->enabled = (int) strtol(readbuf, NULL, 10);
- // only calculate enable buffer size for trigger buffer extract data
- if (chan->enabled) {
- dev->datasize += chan->bytes;
+ buf[(strlen(buf) - 5)] = '\0';
+ char* str = strdup(buf);
+ // grab the enable flag of channel
+ snprintf(buf, MAX_SIZE, "%sen", str);
+ fd = open(buf, O_RDONLY);
+ if (fd != -1) {
+ if (read(fd, readbuf, 2 * sizeof(char)) != 2) {
+ syslog(LOG_ERR, "iio: Failed to read a sensible value from sysfs");
+ free(str);
+ return -1;
+ }
+ chan->enabled = (int) strtol(readbuf, NULL, 10);
+ // only calculate enable buffer size for trigger buffer extract data
+ if (chan->enabled) {
+ dev->datasize += chan->bytes;
+ }
+ close(fd);
}
+ // clean up str var
+ free(str);
+ }
+ else {
close(fd);
}
- // clean up str var
- free(str);
}
}
}
}
mraa_result_t
-mraa_iio_stop(mraa_iio_context dev)
+mraa_iio_close(mraa_iio_context dev)
{
free(dev->channels);
return MRAA_SUCCESS;
projects / contrib / mraa.git / blobdiff