beaglelogic: Re-organize to prepare for TCP support

[libsigrok.git] / src / hardware / beaglelogic / beaglelogic_native.c

diff --git a/src/hardware/beaglelogic/beaglelogic_native.c b/src/hardware/beaglelogic/beaglelogic_native.c
index 84314c23134906ae0df5a54e3ad0ae536aceb151..b907b1cdc4f09458904367526ac5e9458c9eafad 100644 (file)
--- a/src/hardware/beaglelogic/beaglelogic_native.c
+++ b/src/hardware/beaglelogic/beaglelogic_native.c
@@ -20,53 +20,53 @@
 #include "protocol.h"
 #include "beaglelogic.h"
 
-SR_PRIV inline int beaglelogic_open_nonblock(struct dev_context *devc) {
+static int beaglelogic_open_nonblock(struct dev_context *devc) {
        devc->fd = open(BEAGLELOGIC_DEV_NODE, O_RDONLY | O_NONBLOCK);
        return (devc->fd == -1 ? SR_ERR : SR_OK);
 }
 
-SR_PRIV inline int beaglelogic_close(struct dev_context *devc) {
+static int beaglelogic_close(struct dev_context *devc) {
        return close(devc->fd);
 }
 
-SR_PRIV inline int beaglelogic_get_buffersize(struct dev_context *devc) {
+static int beaglelogic_get_buffersize(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_GET_BUFFER_SIZE, &devc->buffersize);
 }
 
-SR_PRIV inline int beaglelogic_set_buffersize(struct dev_context *devc) {
+static int beaglelogic_set_buffersize(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_SET_BUFFER_SIZE, devc->buffersize);
 }
 
 /* This is treated differently as it gets a uint64_t while a uint32_t is read */
-SR_PRIV inline int beaglelogic_get_samplerate(struct dev_context *devc) {
+static int beaglelogic_get_samplerate(struct dev_context *devc) {
        uint32_t arg, err;
        err = ioctl(devc->fd, IOCTL_BL_GET_SAMPLE_RATE, &arg);
        devc->cur_samplerate = arg;
        return err;
 }
 
-SR_PRIV inline int beaglelogic_set_samplerate(struct dev_context *devc) {
+static int beaglelogic_set_samplerate(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_SET_SAMPLE_RATE,
                        (uint32_t)devc->cur_samplerate);
 }
 
-SR_PRIV inline int beaglelogic_get_sampleunit(struct dev_context *devc) {
+static int beaglelogic_get_sampleunit(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_GET_SAMPLE_UNIT, &devc->sampleunit);
 }
 
-SR_PRIV inline int beaglelogic_set_sampleunit(struct dev_context *devc) {
+static int beaglelogic_set_sampleunit(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_SET_SAMPLE_UNIT, devc->sampleunit);
 }
 
-SR_PRIV inline int beaglelogic_get_triggerflags(struct dev_context *devc) {
+static int beaglelogic_get_triggerflags(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_GET_TRIGGER_FLAGS, &devc->triggerflags);
 }
 
-SR_PRIV inline int beaglelogic_set_triggerflags(struct dev_context *devc) {
+static int beaglelogic_set_triggerflags(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_SET_TRIGGER_FLAGS, devc->triggerflags);
 }
 
-SR_PRIV int beaglelogic_getlasterror(struct dev_context *devc) {
+static int beaglelogic_get_lasterror(struct dev_context *devc) {
        int fd;
        char buf[16];
        int ret;
@@ -83,19 +83,23 @@ SR_PRIV int beaglelogic_getlasterror(struct dev_context *devc) {
        return SR_OK;
 }
 
-SR_PRIV inline int beaglelogic_start(struct dev_context *devc) {
+static int beaglelogic_start(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_START);
 }
 
-SR_PRIV inline int beaglelogic_stop(struct dev_context *devc) {
+static int beaglelogic_stop(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_STOP);
 }
 
-SR_PRIV int beaglelogic_get_bufunitsize(struct dev_context *devc) {
+static int beaglelogic_get_bufunitsize(struct dev_context *devc) {
        return ioctl(devc->fd, IOCTL_BL_GET_BUFUNIT_SIZE, &devc->bufunitsize);
 }
 
-SR_PRIV int beaglelogic_mmap(struct dev_context *devc) {
+static int beaglelogic_set_bufunitsize(struct dev_context *devc) {
+       return ioctl(devc->fd, IOCTL_BL_SET_BUFUNIT_SIZE, devc->bufunitsize);
+}
+
+static int beaglelogic_mmap(struct dev_context *devc) {
        if (!devc->buffersize)
                beaglelogic_get_buffersize(devc);
        devc->sample_buf = mmap(NULL, devc->buffersize,
@@ -103,6 +107,26 @@ SR_PRIV int beaglelogic_mmap(struct dev_context *devc) {
        return (devc->sample_buf == MAP_FAILED ? -1 : SR_OK);
 }
 
-SR_PRIV int beaglelogic_munmap(struct dev_context *devc) {
+static int beaglelogic_munmap(struct dev_context *devc) {
        return munmap(devc->sample_buf, devc->buffersize);
 }
+
+SR_PRIV const struct beaglelogic_ops beaglelogic_native_ops = {
+       .open = beaglelogic_open_nonblock,
+       .close = beaglelogic_close,
+       .get_buffersize = beaglelogic_get_buffersize,
+       .set_buffersize = beaglelogic_set_buffersize,
+       .get_samplerate = beaglelogic_get_samplerate,
+       .set_samplerate = beaglelogic_set_samplerate,
+       .get_sampleunit = beaglelogic_get_sampleunit,
+       .set_sampleunit = beaglelogic_set_sampleunit,
+       .get_triggerflags = beaglelogic_get_triggerflags,
+       .set_triggerflags = beaglelogic_set_triggerflags,
+       .start = beaglelogic_start,
+       .stop = beaglelogic_stop,
+       .get_lasterror = beaglelogic_get_lasterror,
+       .get_bufunitsize = beaglelogic_get_bufunitsize,
+       .set_bufunitsize = beaglelogic_set_bufunitsize,
+       .mmap = beaglelogic_mmap,
+       .munmap = beaglelogic_munmap,
+};