X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=910bb843b5919addb45d8bed5704a1f60b8d90d9;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=b5850314eab9b5b0a0476210b136fee5fba5aad1;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index b5850314..910bb843 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -23,16 +23,19 @@
 SR_PRIV struct sr_dev_driver beaglelogic_driver_info;
 static struct sr_dev_driver *di = &beaglelogic_driver_info;
 
-/* Hardware capabiities */
-static const uint32_t hwcaps[] = {
-	SR_CONF_LOGIC_ANALYZER,
-	SR_CONF_SAMPLERATE,
-	SR_CONF_TRIGGER_MATCH,
+/* Scan options */
+static const uint32_t scanopts[] = {
+	SR_CONF_NUM_LOGIC_CHANNELS,
+};
 
-	SR_CONF_LIMIT_SAMPLES,
+/* Hardware capabilities */
+static const uint32_t devopts[] = {
+	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_CONTINUOUS,
-
-	SR_CONF_NUM_LOGIC_CHANNELS,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+	SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_GET,
 };
 
 /* Trigger matching capabilities */
@@ -52,9 +55,9 @@ SR_PRIV const char *beaglelogic_channel_names[NUM_CHANNELS + 1] = {
 
 /* Possible sample rates : 10 Hz to 100 MHz = (100 / x) MHz */
 static const uint64_t samplerates[] = {
-		SR_HZ(10),
-		SR_MHZ(100),
-		SR_HZ(1),
+	SR_HZ(10),
+	SR_MHZ(100),
+	SR_HZ(1),
 };
 
 static int init(struct sr_context *sr_ctx)
@@ -94,7 +97,10 @@ static GSList *scan(GSList *options)
 	if (!g_file_test(BEAGLELOGIC_DEV_NODE, G_FILE_TEST_EXISTS))
 		return NULL;
 
-	sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, NULL, "BeagleLogic", "1.0");
+	sdi = sr_dev_inst_new();
+	sdi->status = SR_ST_INACTIVE;
+	sdi->model = g_strdup("BeagleLogic");
+	sdi->version = g_strdup("1.0");
 	sdi->driver = di;
 
 	/* Unless explicitly specified, keep max channels to 8 only */
@@ -302,9 +308,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
 	ret = SR_OK;
 	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:
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
+				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_SAMPLERATE:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
@@ -314,7 +324,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		*data = g_variant_builder_end(&gvb);
 		break;
 	case SR_CONF_TRIGGER_MATCH:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
 				sizeof(int32_t));
 		break;