X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fasix-sigma%2Fapi.c;h=0aebe695c3bec49308a40427746a7b37bf7491d4;hb=9a0a606a8215aa7fd41bb72a3653dff7ef54505b;hp=255d3d542e3216081f33000d5530443e6dc659bc;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 255d3d54..0aebe695 100644
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -42,7 +42,7 @@ static const uint32_t drvopts[] = {
 
 static const uint32_t devopts[] = {
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
-	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	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,
@@ -64,9 +64,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
-	GSList *devices;
 	struct ftdi_device_list *devlist;
 	char serial_txt[10];
 	uint32_t serial;
@@ -75,10 +73,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	(void)options;
 
-	drvc = di->context;
-
-	devices = NULL;
-
 	devc = g_malloc0(sizeof(struct dev_context));
 
 	ftdi_init(&devc->ftdic);
@@ -108,6 +102,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	devc->cur_samplerate = samplerates[0];
 	devc->period_ps = 0;
 	devc->limit_msec = 0;
+	devc->limit_samples = 0;
 	devc->cur_firmware = -1;
 	devc->num_channels = 0;
 	devc->samples_per_event = 0;
@@ -119,19 +114,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sdi->status = SR_ST_INITIALIZING;
 	sdi->vendor = g_strdup(USB_VENDOR_NAME);
 	sdi->model = g_strdup(USB_MODEL_NAME);
-	sdi->driver = di;
 
 	for (i = 0; i < ARRAY_SIZE(channel_names); i++)
 		sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_names[i]);
 
-	devices = g_slist_append(devices, sdi);
-	drvc->instances = g_slist_append(drvc->instances, sdi);
 	sdi->priv = devc;
 
 	/* We will open the device again when we need it. */
 	ftdi_list_free(&devlist);
 
-	return devices;
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 
 free:
 	ftdi_deinit(&devc->ftdic);
@@ -194,6 +186,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	case SR_CONF_LIMIT_MSEC:
 		*data = g_variant_new_uint64(devc->limit_msec);
 		break;
+	case SR_CONF_LIMIT_SAMPLES:
+		*data = g_variant_new_uint64(devc->limit_samples);
+		break;
 	case SR_CONF_CAPTURE_RATIO:
 		*data = g_variant_new_uint64(devc->capture_ratio);
 		break;
@@ -232,7 +227,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		tmp = g_variant_get_uint64(data);
-		devc->limit_msec = tmp * 1000 / devc->cur_samplerate;
+		devc->limit_samples = tmp;
+		devc->limit_msec = sigma_limit_samples_to_msec(devc, tmp);
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		tmp = g_variant_get_uint64(data);
@@ -268,7 +264,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	case SR_CONF_SAMPLERATE:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
 		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
-				SAMPLERATES_COUNT, sizeof(uint64_t));
+				samplerates_count, sizeof(samplerates[0]));
 		g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
 		*data = g_variant_builder_end(&gvb);
 		break;
@@ -381,7 +377,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	gettimeofday(&devc->start_tv, 0);
 	sigma_set_register(WRITE_MODE, 0x0d, devc);
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Add capture source. */
 	sr_session_source_add(sdi->session, -1, 0, 10, sigma_receive_data, (void *)sdi);