X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi_usbtmc.c;h=c734890ad46a8b4fad996625e254cc1389e26d17;hb=e22aa87808624c86ec52ea8d57d0a6f35c9e018e;hp=9648722c20415c125de663461c95a1d421daea5e;hpb=91e406b9210b2b2c009e9ef8662d2634e5b6e997;p=libsigrok.git diff --git a/hardware/common/scpi_usbtmc.c b/hardware/common/scpi_usbtmc.c index 9648722c..c734890a 100644 --- a/hardware/common/scpi_usbtmc.c +++ b/hardware/common/scpi_usbtmc.c @@ -26,17 +26,35 @@ #include #include -/* Message logging helpers with subsystem-specific prefix string. */ -#define LOG_PREFIX "scpi_usbtmc: " -#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) -#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) -#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) -#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) -#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) +#define LOG_PREFIX "scpi_usbtmc" + +#define MAX_READ_LENGTH 2048 + +struct usbtmc_scpi { + struct sr_usbtmc_dev_inst *usbtmc; + char response_buffer[MAX_READ_LENGTH]; + int response_length; + int response_bytes_read; +}; + +static int scpi_usbtmc_dev_inst_new(void *priv, const char *resource, + char **params, const char *serialcomm) +{ + struct usbtmc_scpi *uscpi = priv; + + (void)params; + (void)serialcomm; + + if (!(uscpi->usbtmc = sr_usbtmc_dev_inst_new(resource))) + return SR_ERR; + + return SR_OK; +} SR_PRIV int scpi_usbtmc_open(void *priv) { - struct sr_usbtmc_dev_inst *usbtmc = priv; + struct usbtmc_scpi *uscpi = priv; + struct sr_usbtmc_dev_inst *usbtmc = uscpi->usbtmc; if ((usbtmc->fd = open(usbtmc->device, O_RDWR)) < 0) return SR_ERR; @@ -47,21 +65,24 @@ SR_PRIV int scpi_usbtmc_open(void *priv) SR_PRIV int scpi_usbtmc_source_add(void *priv, int events, int timeout, sr_receive_data_callback_t cb, void *cb_data) { - struct sr_usbtmc_dev_inst *usbtmc = priv; + struct usbtmc_scpi *uscpi = priv; + struct sr_usbtmc_dev_inst *usbtmc = uscpi->usbtmc; return sr_source_add(usbtmc->fd, events, timeout, cb, cb_data); } SR_PRIV int scpi_usbtmc_source_remove(void *priv) { - struct sr_usbtmc_dev_inst *usbtmc = priv; + struct usbtmc_scpi *uscpi = priv; + struct sr_usbtmc_dev_inst *usbtmc = uscpi->usbtmc; return sr_source_remove(usbtmc->fd); } SR_PRIV int scpi_usbtmc_send(void *priv, const char *command) { - struct sr_usbtmc_dev_inst *usbtmc = priv; + struct usbtmc_scpi *uscpi = priv; + struct sr_usbtmc_dev_inst *usbtmc = uscpi->usbtmc; int len, out; len = strlen(command); @@ -82,55 +103,66 @@ SR_PRIV int scpi_usbtmc_send(void *priv, const char *command) return SR_OK; } -SR_PRIV int scpi_usbtmc_receive(void *priv, char **scpi_response) +SR_PRIV int scpi_usbtmc_read_begin(void *priv) { - struct sr_usbtmc_dev_inst *usbtmc = priv; - GString *response; - char buf[256]; + struct usbtmc_scpi *uscpi = priv; + struct sr_usbtmc_dev_inst *usbtmc = uscpi->usbtmc; int len; - response = g_string_sized_new(1024); - - len = read(usbtmc->fd, buf, sizeof(buf)); + len = read(usbtmc->fd, uscpi->response_buffer, MAX_READ_LENGTH); if (len < 0) { sr_err("Read error: %s", strerror(errno)); - g_string_free(response, TRUE); return SR_ERR; } - response = g_string_append_len(response, buf, len); - - *scpi_response = response->str; - - sr_dbg("SCPI response received (length %d): '%.50s'", - response->len, response->str); - - g_string_free(response, FALSE); + uscpi->response_length = len; + uscpi->response_bytes_read = 0; return SR_OK; } -SR_PRIV int scpi_usbtmc_read(void *priv, char *buf, int maxlen) +SR_PRIV int scpi_usbtmc_read_data(void *priv, char *buf, int maxlen) { - struct sr_usbtmc_dev_inst *usbtmc = priv; - int len; + struct usbtmc_scpi *uscpi = priv; + int read_length; - len = read(usbtmc->fd, buf, maxlen); + if (uscpi->response_length == MAX_READ_LENGTH + && uscpi->response_bytes_read == uscpi->response_length) + if (scpi_usbtmc_read_begin(uscpi) != SR_OK) + return SR_ERR; - if (len < 0) { - sr_err("Read error: %s", strerror(errno)); + if (uscpi->response_bytes_read >= uscpi->response_length) return SR_ERR; - } - return len; + read_length = uscpi->response_length - uscpi->response_bytes_read; + + if (read_length > maxlen) + read_length = maxlen; + + memcpy(buf, uscpi->response_buffer + uscpi->response_bytes_read, read_length); + + uscpi->response_bytes_read += read_length; + + return read_length; +} + +SR_PRIV int scpi_usbtmc_read_complete(void *priv) +{ + struct usbtmc_scpi *uscpi = priv; + + if (uscpi->response_length == MAX_READ_LENGTH + && uscpi->response_bytes_read == uscpi->response_length) + scpi_usbtmc_read_begin(uscpi); + + return (uscpi->response_bytes_read >= uscpi->response_length); } SR_PRIV int scpi_usbtmc_close(void *priv) { - struct sr_usbtmc_dev_inst *usbtmc = priv; + struct usbtmc_scpi *uscpi = priv; - if (close(usbtmc->fd) < 0) + if (close(uscpi->usbtmc->fd) < 0) return SR_ERR; return SR_OK; @@ -138,31 +170,23 @@ SR_PRIV int scpi_usbtmc_close(void *priv) static void scpi_usbtmc_free(void *priv) { - return sr_usbtmc_dev_inst_free(priv); -} - -SR_PRIV struct sr_scpi_dev_inst *scpi_usbtmc_dev_inst_new(const char *device) -{ - struct sr_scpi_dev_inst *scpi; - struct sr_usbtmc_dev_inst *usbtmc; + struct usbtmc_scpi *uscpi = priv; - scpi = g_try_malloc(sizeof(struct sr_scpi_dev_inst)); - - if (!(usbtmc = sr_usbtmc_dev_inst_new(device))) - { - g_free(scpi); - return NULL; - } - - scpi->open = scpi_usbtmc_open; - scpi->source_add = scpi_usbtmc_source_add; - scpi->source_remove = scpi_usbtmc_source_remove; - scpi->send = scpi_usbtmc_send; - scpi->receive = scpi_usbtmc_receive; - scpi->read = scpi_usbtmc_read; - scpi->close = scpi_usbtmc_close; - scpi->free = scpi_usbtmc_free; - scpi->priv = usbtmc; - - return scpi; + sr_usbtmc_dev_inst_free(uscpi->usbtmc); } + +SR_PRIV const struct sr_scpi_dev_inst scpi_usbtmc_dev = { + .name = "USBTMC", + .prefix = "/dev/usbtmc", + .priv_size = sizeof(struct usbtmc_scpi), + .dev_inst_new = scpi_usbtmc_dev_inst_new, + .open = scpi_usbtmc_open, + .source_add = scpi_usbtmc_source_add, + .source_remove = scpi_usbtmc_source_remove, + .send = scpi_usbtmc_send, + .read_begin = scpi_usbtmc_read_begin, + .read_data = scpi_usbtmc_read_data, + .read_complete = scpi_usbtmc_read_complete, + .close = scpi_usbtmc_close, + .free = scpi_usbtmc_free, +};