X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Fapi.c;h=90b1b5c62b3ed3a977c78639d8ad6f02d96e623a;hb=3982b93840d99c9176185b0054f9dec70f776395;hp=d2aeb3013d55c034ed2af004c783a59659955898;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index d2aeb301..90b1b5c6 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -25,20 +25,20 @@
 #include <stdlib.h>
 #include <string.h>
 
-static const uint32_t hwopts[] = {
+static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
 
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
 	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_SAMPLERATE,
-	SR_CONF_EXTERNAL_CLOCK,
-	SR_CONF_CLOCK_EDGE,
-	SR_CONF_TRIGGER_MATCH,
-	SR_CONF_TRIGGER_SOURCE,
-	SR_CONF_TRIGGER_SLOPE,
-	SR_CONF_LIMIT_MSEC,
-	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const int32_t trigger_matches[] = {
@@ -99,7 +99,7 @@ static GSList *gen_channel_list(int num_channels)
 	return list;
 }
 
-static struct sr_dev_inst *dev_inst_new(int device_index)
+static struct sr_dev_inst *dev_inst_new()
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -112,7 +112,7 @@ static struct sr_dev_inst *dev_inst_new(int device_index)
 	}
 
 	/* Register the device with libsigrok. */
-	sdi = sr_dev_inst_new(device_index, SR_ST_INACTIVE,
+	sdi = sr_dev_inst_new(SR_ST_INACTIVE,
 			      VENDOR_NAME, MODEL_NAME, NULL);
 	if (!sdi) {
 		sr_err("Failed to instantiate device.");
@@ -138,7 +138,7 @@ static GSList *scan(GSList *options)
 	struct sr_usb_dev_inst *usb;
 	struct sr_config *src;
 	const char *conn;
-	int device_index;
+	char connection_id[64];
 
 	drvc = di->priv;
 	conn = USB_VID_PID;
@@ -152,13 +152,15 @@ static GSList *scan(GSList *options)
 	}
 	usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
 	devices = NULL;
-	device_index = g_slist_length(drvc->instances);
 
 	for (node = usb_devices; node != NULL; node = node->next) {
 		usb = node->data;
 
+		usb_get_port_path(libusb_get_device(usb->devhdl),
+				connection_id, sizeof(connection_id));
+
 		/* Create sigrok device instance. */
-		sdi = dev_inst_new(device_index);
+		sdi = dev_inst_new();
 		if (!sdi) {
 			sr_usb_dev_inst_free(usb);
 			continue;
@@ -166,6 +168,7 @@ static GSList *scan(GSList *options)
 		sdi->driver = di;
 		sdi->inst_type = SR_INST_USB;
 		sdi->conn = usb;
+		sdi->connection_id = g_strdup(connection_id);
 
 		/* Register device instance with driver. */
 		drvc->instances = g_slist_append(drvc->instances, sdi);
@@ -457,11 +460,11 @@ 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, G_N_ELEMENTS(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,
-				hwcaps, G_N_ELEMENTS(hwcaps), sizeof(uint32_t));
+				devopts, G_N_ELEMENTS(devopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_SAMPLERATE:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));