X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic-pro%2Fapi.c;h=9c257d2c6060d28f7664a04ed66b1988768ce128;hb=e66d1892d0dd16ed166fc8f13493f95de0607362;hp=a7cd83d73b43a41f696d529c84a580c74a708c70;hpb=f2b8a31be5d9cdbd6c50257de78c125f2bb25c74;p=libsigrok.git

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index a7cd83d7..9c257d2c 100644
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -353,23 +353,10 @@ static int config_list(uint32_t key, GVariant **data,
 	GVariant *gvar;
 	GVariantBuilder gvb;
 
-	(void)sdi;
-	(void)cg;
-
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		break;
 	case SR_CONF_DEVICE_OPTIONS:
-		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;
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_SAMPLERATE:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
 		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
@@ -395,8 +382,6 @@ static void dev_acquisition_abort(const struct sr_dev_inst *sdi)
 	}
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi);
-
 static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi = cb_data;
@@ -409,7 +394,7 @@ static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 
 	/* Handle timeout */
 	if (!revents)
-		dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 
 	return TRUE;
 }