X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fcommon%2Fscpi_serial.c;h=0ee5894742629833e20fbe4526afa53460cb6b41;hb=c3515cea44f7c3044fa56570e8d3225148c36a8f;hp=5c07c43c6fb5cbae6b6a552d77b2d07898f6903d;hpb=abc4b3356d184401cb62aaa521d1c80ebd7d6f0f;p=libsigrok.git

diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c
index 5c07c43c..0ee58947 100644
--- a/hardware/common/scpi_serial.c
+++ b/hardware/common/scpi_serial.c
@@ -24,20 +24,20 @@
 #include <glib.h>
 #include <string.h>
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi_serial: "
-#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_serial"
 
 #define SCPI_READ_RETRIES 100
 #define SCPI_READ_RETRY_TIMEOUT 10000
 
+struct scpi_serial {
+	struct sr_serial_dev_inst *serial;
+	char last_character;
+};
+
 SR_PRIV 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;
@@ -51,23 +51,26 @@ SR_PRIV int scpi_serial_open(void *priv)
 SR_PRIV 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)
 {
-	struct sr_serial_dev_inst *serial = priv;
+	struct scpi_serial *sscpi = priv;
+	struct sr_serial_dev_inst *serial = sscpi->serial;
 
-	return sr_source_remove(serial->fd);
+	return serial_source_remove(serial);
 }
 
 SR_PRIV 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);
@@ -95,7 +98,8 @@ SR_PRIV int scpi_serial_receive(void *priv, char **scpi_response)
 	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);
 
@@ -142,43 +146,84 @@ 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)
+SR_PRIV int scpi_serial_read_begin(void *priv)
+{
+	struct scpi_serial *sscpi = priv;
+
+	sscpi->last_character = '\0';
+
+	return SR_OK;
+}
+
+SR_PRIV int scpi_serial_read_data(void *priv, char *buf, int maxlen)
 {
-	return serial_read(priv, buf, 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;
 }
+
+SR_PRIV int scpi_serial_read_complete(void *priv)
+{
+	struct scpi_serial *sscpi = priv;
+
+	return (sscpi->last_character == '\n');
+}
+
 static int scpi_serial_close(void *priv)
 {
-	return serial_close(priv);
+	struct scpi_serial *sscpi = priv;
+	struct sr_serial_dev_inst *serial = sscpi->serial;
+
+	return serial_close(serial);
 }
+
 static void scpi_serial_free(void *priv)
 {
-	return sr_serial_dev_inst_free(priv);
+	struct scpi_serial *sscpi = priv;
+	struct sr_serial_dev_inst *serial = sscpi->serial;
+
+	sr_serial_dev_inst_free(serial);
+	g_free(sscpi);
 }
 
 SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
 		const char *serialcomm)
 {
 	struct sr_scpi_dev_inst *scpi;
+	struct scpi_serial *sscpi;
 	struct sr_serial_dev_inst *serial;
 
-	scpi = g_try_malloc(sizeof(struct sr_scpi_dev_inst));
-
 	if (!(serial = sr_serial_dev_inst_new(port, serialcomm)))
-	{
-		g_free(scpi);
 		return NULL;
-	}
+
+	sscpi = g_malloc(sizeof(struct scpi_serial));
+
+	sscpi->serial = serial;
+
+	scpi = g_malloc(sizeof(struct sr_scpi_dev_inst));
 
 	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->read_begin = scpi_serial_read_begin;
+	scpi->read_data = scpi_serial_read_data;
+	scpi->read_complete = scpi_serial_read_complete;
 	scpi->close = scpi_serial_close;
 	scpi->free = scpi_serial_free;
-	scpi->priv = serial;
+	scpi->priv = sscpi;
 
 	return scpi;
 }