output/csv: use intermediate time_t var, silence compiler warning

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

diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c
deleted file mode 100644 (file)
index 9711c01..0000000
--- a/hardware/common/scpi_serial.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * This file is part of the libsigrok project.
- *
- * Copyright (C) 2013 poljar (Damir Jelić) <poljarinho@gmail.com>
- * Copyright (C) 2013 Martin Ling <martin-sigrok@earth.li>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
-#include <glib.h>
-#include <string.h>
-
-#define LOG_PREFIX "scpi_serial"
-
-#define SCPI_READ_RETRIES 100
-#define SCPI_READ_RETRY_TIMEOUT 10000
-
-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 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;
-
-       if (serial_flush(serial) != SR_OK)
-               return SR_ERR;
-
-       return SR_OK;
-}
-
-static int scpi_serial_source_add(void *priv, int events, int timeout,
-                       sr_receive_data_callback_t cb, void *cb_data)
-{
-       struct scpi_serial *sscpi = priv;
-       struct sr_serial_dev_inst *serial = sscpi->serial;
-
-       return serial_source_add(serial, events, timeout, cb, cb_data);
-}
-
-static int scpi_serial_source_remove(void *priv)
-{
-       struct scpi_serial *sscpi = priv;
-       struct sr_serial_dev_inst *serial = sscpi->serial;
-
-       return serial_source_remove(serial);
-}
-
-static int scpi_serial_send(void *priv, const char *command)
-{
-       int len, result, written;
-       gchar *terminated_command;
-       struct scpi_serial *sscpi = priv;
-       struct sr_serial_dev_inst *serial = sscpi->serial;
-
-       terminated_command = g_strconcat(command, "\n", NULL);
-       len = strlen(terminated_command);
-       written = 0;
-       while (written < len) {
-               result = serial_write(serial, terminated_command + written, len - written);
-               if (result < 0) {
-                       sr_err("Error while sending SCPI command: '%s'.", command);
-                       g_free(terminated_command);
-                       return SR_ERR;
-               }
-               written += result;
-       }
-
-       g_free(terminated_command);
-
-       sr_spew("Successfully sent SCPI command: '%s'.", command);
-
-       return SR_OK;
-}
-
-static int scpi_serial_read_begin(void *priv)
-{
-       struct scpi_serial *sscpi = priv;
-
-       sscpi->last_character = '\0';
-
-       return SR_OK;
-}
-
-static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
-{
-       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 int scpi_serial_read_complete(void *priv)
-{
-       struct scpi_serial *sscpi = priv;
-
-       return (sscpi->last_character == '\n');
-}
-
-static int scpi_serial_close(void *priv)
-{
-       struct scpi_serial *sscpi = priv;
-
-       return serial_close(sscpi->serial);
-}
-
-static void scpi_serial_free(void *priv)
-{
-       struct scpi_serial *sscpi = priv;
-
-       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,
-};