Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

comedi: first version which compile and links

Browse source
This commit is contained in:
Steffen Vogel 2018-03-28 21:44:42 +02:00 • committed by Daniel Krebs
parent be623d7a65
commit c457c0fe30
2 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/villas/nodes/comedi.h
View file

@ -29,11 +29,15 @@
#pragma once
#include <comedilib.h>
#include <villas/node.h>
#include <villas/list.h>
struct comedi {
char *device;
comedi_t *it;
};
/** @see node_type::print */

41
lib/nodes/comedi.c
View file

@ -32,14 +32,18 @@ int comedi_parse(struct node *n, json_t *cfg)
int ret;
struct comedi *c = (struct comedi *) n->_vd;
ret = json_unpack_ex(cfg, &err, 0, "{ s?: o, s?: o, s?: s }",
"publish", &json_pub,
"subscribe", &json_sub,
"format", &format
const char *device;
json_error_t err;
ret = json_unpack_ex(cfg, &err, 0, "{ s: s }",
"device", &device
);
if (ret)
jerror(&err, "Failed to parse configuration of node %s", node_name(n));
c->device = strdup(device);
return 0;
}
@ -49,14 +53,21 @@ char * comedi_print(struct node *n)
char *buf = NULL;
strcatf(&buf, "device=%s", c->device);
return buf;
}
int comedi_start(struct node *n)
{
int ret;
struct comedi *c = (struct comedi *) n->_vd;
c->it = comedi_open(c->device);
if (!c->it) {
const char *err = comedi_strerror(comedi_errno());
error("Failed to open device: %s", err);
}
return 0;
}
@ -65,35 +76,32 @@ int comedi_stop(struct node *n)
int ret;
struct comedi *c = (struct comedi *) n->_vd;
return 0;
}
ret = comedi_close(c->it);
if (ret)
return ret;
int comedi_deinit()
{
return 0;
}
int comedi_read(struct node *n, struct sample *smps[], unsigned cnt)
{
struct comedi *c = (struct comedi *) n->_vd;
//struct comedi *c = (struct comedi *) n->_vd;
return -1;
}
int comedi_write(struct node *n, struct sample *smps[], unsigned cnt)
{
int ret;
struct comedi *c = (struct comedi *) n->_vd;
//struct comedi *c = (struct comedi *) n->_vd;
return cnt;
return -1;
}
int comedi_fd(struct node *n)
{
int ret;
struct comedi *c = (struct comedi *) n->_vd;
//struct comedi *c = (struct comedi *) n->_vd;
return fd;
return -1;
}
static struct plugin p = {
@ -107,7 +115,6 @@ static struct plugin p = {
.print = comedi_print,
.start = comedi_start,
.stop = comedi_stop,
.deinit = comedi_deinit,
.read = comedi_read,
.write = comedi_write,
.fd = comedi_fd