X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi_serial.c;h=7000962aad06bab1e6c9c648d506733be183d94b;hb=811d6255bbed786183616867196029b639fd7891;hp=9711c010a80fb9f5c92cfe60af7710d5e8760684;hpb=8a2aaffa02d333219ba9159b581a2a7482e5185f;p=libsigrok.git

diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c
index 9711c010..7000962a 100644
--- a/hardware/common/scpi_serial.c
+++ b/hardware/common/scpi_serial.c
@@ -22,23 +22,61 @@
 #include "libsigrok-internal.h"
 
 #include <glib.h>
+#include <stdlib.h>
 #include <string.h>
 
 #define LOG_PREFIX "scpi_serial"
 
-#define SCPI_READ_RETRIES 100
-#define SCPI_READ_RETRY_TIMEOUT 10000
+#define BUFFER_SIZE 1024
 
 struct scpi_serial {
 	struct sr_serial_dev_inst *serial;
-	char last_character;
+	char buffer[BUFFER_SIZE];
+	size_t count;
+	size_t read;
 };
 
-static int scpi_serial_dev_inst_new(void *priv, const char *resource,
-		char **params, const char *serialcomm)
+static struct {
+	uint16_t vendor_id;
+	uint16_t product_id;
+	const char *serialcomm;
+} scpi_serial_usb_ids[] = {
+	{ 0x0403, 0xed72, "115200/8n1/flow=1" }, /* Hameg HO720 */
+	{ 0x0403, 0xed73, "115200/8n1/flow=1" }, /* Hameg HO730 */
+};
+
+static GSList *scpi_serial_scan(struct drv_context *drvc)
+{
+	GSList *l, *r, *resources = NULL;
+	gchar *res;
+	unsigned i;
+
+	(void)drvc;
+
+	for (i = 0; i < ARRAY_SIZE(scpi_serial_usb_ids); i++) {
+		if ((l = sr_serial_find_usb(scpi_serial_usb_ids[i].vendor_id,
+		                            scpi_serial_usb_ids[i].product_id)) == NULL)
+			continue;
+		for (r = l; r; r = r->next) {
+			if (scpi_serial_usb_ids[i].serialcomm)
+				res = g_strdup_printf("%s:%s", (char *) r->data,
+				                      scpi_serial_usb_ids[i].serialcomm);
+			else
+				res = g_strdup(r->data);
+			resources = g_slist_append(resources, res);
+		}
+		g_slist_free_full(l, g_free);
+	}
+
+	return resources;
+}
+
+static int scpi_serial_dev_inst_new(void *priv, struct drv_context *drvc,
+		const char *resource, char **params, const char *serialcomm)
 {
 	struct scpi_serial *sscpi = priv;
 
+	(void)drvc;
 	(void)params;
 
 	if (!(sscpi->serial = sr_serial_dev_inst_new(resource, serialcomm)))
@@ -58,11 +96,14 @@ static int scpi_serial_open(void *priv)
 	if (serial_flush(serial) != SR_OK)
 		return SR_ERR;
 
+	sscpi->count = 0;
+	sscpi->read = 0;
+
 	return SR_OK;
 }
 
 static int scpi_serial_source_add(void *priv, int events, int timeout,
-			sr_receive_data_callback_t cb, void *cb_data)
+			sr_receive_data_callback cb, void *cb_data)
 {
 	struct scpi_serial *sscpi = priv;
 	struct sr_serial_dev_inst *serial = sscpi->serial;
@@ -107,9 +148,7 @@ static int scpi_serial_send(void *priv, const char *command)
 
 static int scpi_serial_read_begin(void *priv)
 {
-	struct scpi_serial *sscpi = priv;
-
-	sscpi->last_character = '\0';
+	(void) priv;
 
 	return SR_OK;
 }
@@ -117,27 +156,56 @@ static int scpi_serial_read_begin(void *priv)
 static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_serial *sscpi = priv;
-	int ret;
+	int len, ret;
+
+	len = BUFFER_SIZE - sscpi->count;
+
+	/* Try to read new data into the buffer if there is space. */
+	if (len > 0) {
+		ret = serial_read(sscpi->serial, sscpi->buffer + sscpi->read,
+				BUFFER_SIZE - sscpi->count);
 
-	ret = serial_read(sscpi->serial, buf, maxlen);
+		if (ret < 0)
+			return ret;
 
-	if (ret < 0)
-		return ret;
+		sscpi->count += ret;
 
-	if (ret > 0) {
-		sscpi->last_character = buf[ret - 1];
-		if (sscpi->last_character == '\n')
-			ret--;
+		if (ret > 0)
+			sr_spew("Read %d bytes into buffer.", ret);
 	}
 
-	return ret;
+	/* Return as many bytes as possible from buffer, excluding any trailing newline. */
+	if (sscpi->read < sscpi->count) {
+		len = sscpi->count - sscpi->read;
+		if (len > maxlen)
+			len = maxlen;
+		if (sscpi->buffer[sscpi->read + len - 1] == '\n')
+			len--;
+		sr_spew("Returning %d bytes from buffer.", len);
+		memcpy(buf, sscpi->buffer + sscpi->read, len);
+		sscpi->read += len;
+		if (sscpi->read == BUFFER_SIZE) {
+			sr_spew("Resetting buffer.");
+			sscpi->count = 0;
+			sscpi->read = 0;
+		}
+		return len;
+	}
+
+	return 0;
 }
 
 static int scpi_serial_read_complete(void *priv)
 {
 	struct scpi_serial *sscpi = priv;
 
-	return (sscpi->last_character == '\n');
+	/* If the next character is a newline, discard it and report complete. */
+	if (sscpi->read < sscpi->count && sscpi->buffer[sscpi->read] == '\n') {
+		sscpi->read++;
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 static int scpi_serial_close(void *priv)
@@ -158,6 +226,7 @@ SR_PRIV const struct sr_scpi_dev_inst scpi_serial_dev = {
 	.name          = "serial",
 	.prefix        = "",
 	.priv_size     = sizeof(struct scpi_serial),
+	.scan          = scpi_serial_scan,
 	.dev_inst_new  = scpi_serial_dev_inst_new,
 	.open          = scpi_serial_open,
 	.source_add    = scpi_serial_source_add,