diff options
Diffstat (limited to 'libarmep/libarmep.h')
| -rw-r--r-- | libarmep/libarmep.h | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/libarmep/libarmep.h b/libarmep/libarmep.h index 8811fce..2247b46 100644 --- a/libarmep/libarmep.h +++ b/libarmep/libarmep.h @@ -36,6 +36,8 @@ #include <time.h> #include <semaphore.h> +#include "aepd-interface.h" + #define MAX_PROBES 8 #define CHANNELS_PER_PROBE 3 @@ -227,31 +229,6 @@ struct aep { struct aep_channel ch[CHANNELS_PER_PROBE]; }; -struct aep_result { - int triggered; - int chans; - double samtime; - double buf[MAX_PROBES * CHANNELS_PER_PROBE * 2]; - -}; - -struct aep_shared { - int head; - int tail; - struct aep_result aep_result[1000]; - char channel_name[MAX_VIRTUAL_CHANNELS + MAX_PROBES * CHANNELS_PER_PROBE][64]; - char channel_name_pretty[MAX_VIRTUAL_CHANNELS + MAX_PROBES * CHANNELS_PER_PROBE][64]; - char supply[MAX_VIRTUAL_CHANNELS + MAX_PROBES * CHANNELS_PER_PROBE][64]; - char colour[MAX_VIRTUAL_CHANNELS + MAX_PROBES * CHANNELS_PER_PROBE][16]; - char class[MAX_VIRTUAL_CHANNELS + MAX_PROBES * CHANNELS_PER_PROBE][16]; - int chans; - int vchans; /* appear after probed physical channels in the arrays*/ - int finished; - double averages[MAX_PROBES * CHANNELS_PER_PROBE][3]; - double min[MAX_PROBES * CHANNELS_PER_PROBE][3]; - double max[MAX_PROBES * CHANNELS_PER_PROBE][3]; - -}; struct aep_context { struct aep aeps[MAX_PROBES]; @@ -289,10 +266,9 @@ struct aep_context { int poll_timeout_ms; double do_average; - /* shared memory output buffer */ + /* shared memory output buffer + metadata */ - struct aep_shared *aep_shared; - sem_t * semaphore; + struct aepd_interface *aepd_interface; }; @@ -338,6 +314,4 @@ extern void init_interpolation(void); extern int service_aeps(struct aep_context *aep_context, int fd); extern int aep_init_and_fork(struct aep_context *aep_context, char *argv[]); -extern struct aep_result * aep_wait_for_next_result(struct aep_context *aep_context); -extern void aep_free_result(struct aep_context *aep_context); |