change a bunch of functions from SR_PRIV to static

[libsigrok.git] / hardware / common / scpi_serial.c

diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c
index dc0996349937a181aef67b71012ed23abe61fddc..052d6c1efe618f059e162cc750635e55e94bbfe1 100644 (file)
--- a/hardware/common/scpi_serial.c
+++ b/hardware/common/scpi_serial.c
@@ -29,9 +29,28 @@
 #define SCPI_READ_RETRIES 100
 #define SCPI_READ_RETRY_TIMEOUT 10000
 
-SR_PRIV int scpi_serial_open(void *priv)
+struct scpi_serial {
+       struct sr_serial_dev_inst *serial;
+       char last_character;
+};
+
+static int scpi_serial_dev_inst_new(void *priv, const char *resource,
+               char **params, const char *serialcomm)
+{
+       struct scpi_serial *sscpi = priv;
+
+       (void)params;
+
+       if (!(sscpi->serial = sr_serial_dev_inst_new(resource, serialcomm)))
+               return SR_ERR;
+
+       return SR_OK;
+}
+
+static int scpi_serial_open(void *priv)
 {
-       struct sr_serial_dev_inst *serial = priv;
+       struct scpi_serial *sscpi = priv;
+       struct sr_serial_dev_inst *serial = sscpi->serial;
 
        if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
                return SR_ERR;
@@ -42,26 +61,29 @@ SR_PRIV int scpi_serial_open(void *priv)
        return SR_OK;
 }
 
-SR_PRIV int scpi_serial_source_add(void *priv, int events, int timeout,
+static int scpi_serial_source_add(void *priv, int events, int timeout,
                        sr_receive_data_callback_t cb, void *cb_data)
 {
-       struct sr_serial_dev_inst *serial = priv;
+       struct scpi_serial *sscpi = priv;
+       struct sr_serial_dev_inst *serial = sscpi->serial;
 
        return serial_source_add(serial, events, timeout, cb, cb_data);
 }
 
-SR_PRIV int scpi_serial_source_remove(void *priv)
+static int scpi_serial_source_remove(void *priv)
 {
-       struct sr_serial_dev_inst *serial = priv;
+       struct scpi_serial *sscpi = priv;
+       struct sr_serial_dev_inst *serial = sscpi->serial;
 
        return serial_source_remove(serial);
 }
 
-SR_PRIV int scpi_serial_send(void *priv, const char *command)
+static int scpi_serial_send(void *priv, const char *command)
 {
        int len, result, written;
        gchar *terminated_command;
-       struct sr_serial_dev_inst *serial = priv;
+       struct scpi_serial *sscpi = priv;
+       struct sr_serial_dev_inst *serial = sscpi->serial;
 
        terminated_command = g_strconcat(command, "\n", NULL);
        len = strlen(terminated_command);
@@ -83,13 +105,14 @@ SR_PRIV int scpi_serial_send(void *priv, const char *command)
        return SR_OK;
 }
 
-SR_PRIV int scpi_serial_receive(void *priv, char **scpi_response)
+static int scpi_serial_receive(void *priv, char **scpi_response)
 {
        int len, ret;
        char buf[256];
        unsigned int i;
        GString *response;
-       struct sr_serial_dev_inst *serial = priv;
+       struct scpi_serial *sscpi = priv;
+       struct sr_serial_dev_inst *serial = sscpi->serial;
 
        response = g_string_sized_new(1024);
 
@@ -136,43 +159,67 @@ SR_PRIV int scpi_serial_receive(void *priv, char **scpi_response)
        return ret;
 }
 
-/* Some stubs to keep the compiler from whining. */
-static int scpi_serial_read(void *priv, char *buf, int maxlen)
+static int scpi_serial_read_begin(void *priv)
 {
-       return serial_read(priv, buf, maxlen);
+       struct scpi_serial *sscpi = priv;
+
+       sscpi->last_character = '\0';
+
+       return SR_OK;
 }
-static int scpi_serial_close(void *priv)
+
+static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
 {
-       return serial_close(priv);
+       struct scpi_serial *sscpi = priv;
+       int ret;
+
+       ret = serial_read(sscpi->serial, buf, maxlen);
+
+       if (ret < 0)
+               return ret;
+
+       if (ret > 0) {
+               sscpi->last_character = buf[ret - 1];
+               if (sscpi->last_character == '\n')
+                       ret--;
+       }
+
+       return ret;
 }
-static void scpi_serial_free(void *priv)
+
+static int scpi_serial_read_complete(void *priv)
 {
-       return sr_serial_dev_inst_free(priv);
+       struct scpi_serial *sscpi = priv;
+
+       return (sscpi->last_character == '\n');
 }
 
-SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
-               const char *serialcomm)
+static int scpi_serial_close(void *priv)
 {
-       struct sr_scpi_dev_inst *scpi;
-       struct sr_serial_dev_inst *serial;
+       struct scpi_serial *sscpi = priv;
 
-       scpi = g_try_malloc(sizeof(struct sr_scpi_dev_inst));
+       return serial_close(sscpi->serial);
+}
 
-       if (!(serial = sr_serial_dev_inst_new(port, serialcomm)))
-       {
-               g_free(scpi);
-               return NULL;
-       }
+static void scpi_serial_free(void *priv)
+{
+       struct scpi_serial *sscpi = priv;
 
-       scpi->open = scpi_serial_open;
-       scpi->source_add = scpi_serial_source_add;
-       scpi->source_remove = scpi_serial_source_remove;
-       scpi->send = scpi_serial_send;
-       scpi->receive = scpi_serial_receive;
-       scpi->read = scpi_serial_read;
-       scpi->close = scpi_serial_close;
-       scpi->free = scpi_serial_free;
-       scpi->priv = serial;
-
-       return scpi;
+       sr_serial_dev_inst_free(sscpi->serial);
 }
+
+SR_PRIV const struct sr_scpi_dev_inst scpi_serial_dev = {
+       .name          = "serial",
+       .prefix        = "",
+       .priv_size     = sizeof(struct scpi_serial),
+       .dev_inst_new  = scpi_serial_dev_inst_new,
+       .open          = scpi_serial_open,
+       .source_add    = scpi_serial_source_add,
+       .source_remove = scpi_serial_source_remove,
+       .send          = scpi_serial_send,
+       .read_begin    = scpi_serial_read_begin,
+       .read_data     = scpi_serial_read_data,
+       .read_complete = scpi_serial_read_complete,
+       .close         = scpi_serial_close,
+       .free          = scpi_serial_free,
+};