X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fapi.c;h=acbb971823846f326d72c7880765562da55ade70;hb=2cb63065f525655d3abccc1b26edd7275937b034;hp=245b7062229838d08c5525359043bf5b52695d80;hpb=f254bc4bba68d2cade0c8f7993d8fa8d3d9b556a;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 245b7062..acbb9718 100644
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -22,21 +22,24 @@
 
 #define SERIALCOMM "115200/8n1"
 
-static const uint32_t hwopts[] = {
+static const uint32_t drvopts[] = {
+	SR_CONF_LOGIC_ANALYZER,
+};
+
+static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM,
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_SAMPLERATE,
-	SR_CONF_TRIGGER_MATCH,
-	SR_CONF_CAPTURE_RATIO,
-	SR_CONF_LIMIT_SAMPLES,
-	SR_CONF_EXTERNAL_CLOCK,
-	SR_CONF_PATTERN_MODE,
-	SR_CONF_SWAP,
-	SR_CONF_RLE,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_EXTERNAL_CLOCK | SR_CONF_SET,
+	SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_SWAP | SR_CONF_SET,
+	SR_CONF_RLE | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const int32_t trigger_matches[] = {
@@ -125,8 +128,7 @@ static GSList *scan(GSList *options)
 	if (serialcomm == NULL)
 		serialcomm = SERIALCOMM;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 	/* The discovery procedure is like this: first send the Reset
 	 * command (0x00) 5 times, since the device could be anywhere
@@ -135,7 +137,7 @@ static GSList *scan(GSList *options)
 	 * have a match.
 	 */
 	sr_info("Probing %s.", conn);
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
 	ret = SR_OK;
@@ -161,7 +163,7 @@ static GSList *scan(GSList *options)
 
 	if (probefd.revents != G_IO_IN)
 		return NULL;
-	if (serial_read_blocking(serial, buf, 4) != 4)
+	if (serial_read_blocking(serial, buf, 4, serial_timeout(serial, 4)) != 4)
 		return NULL;
 	if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
 		return NULL;
@@ -173,18 +175,19 @@ static GSList *scan(GSList *options)
 	if (g_poll(&probefd, 1, 10) > 0) {
 		/* Got metadata. */
 		sdi = get_metadata(serial);
-		sdi->index = 0;
 		devc = sdi->priv;
 	} else {
 		/* Not an OLS -- some other board that uses the sump protocol. */
 		sr_info("Device does not support metadata.");
-		sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
-				"Sump", "Logic Analyzer", "v1.0");
+		sdi = g_malloc0(sizeof(struct sr_dev_inst));
+		sdi->status = SR_ST_INACTIVE;
+		sdi->vendor = g_strdup("Sump");
+		sdi->model = g_strdup("Logic Analyzer");
+		sdi->version = g_strdup("v1.0");
 		sdi->driver = di;
 		for (i = 0; i < 32; i++) {
-			if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
-					ols_channel_names[i])))
-				return 0;
+			ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+					ols_channel_names[i]);
 			sdi->channels = g_slist_append(sdi->channels, ch);
 		}
 		devc = ols_dev_new();
@@ -364,11 +367,15 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
+				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+		if (!sdi)
+			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+					drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+		else
+			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_SAMPLERATE:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));