X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fapi.c;h=721ceda12937045c100794fce79147d88d118210;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=293d3c8549b7ca4adceccb5497275d872d6cfec9;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index 293d3c85..721ceda1 100644
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -24,14 +24,15 @@
 #define VENDOR "Kecheng"
 #define USB_INTERFACE 0
 
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
 	SR_CONF_SOUNDLEVELMETER,
-	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_DATALOG,
-	SR_CONF_SPL_WEIGHT_FREQ,
-	SR_CONF_SPL_WEIGHT_TIME,
-	SR_CONF_DATA_SOURCE,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_SAMPLE_INTERVAL | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_DATALOG | SR_CONF_GET,
+	SR_CONF_SPL_WEIGHT_FREQ | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_SPL_WEIGHT_TIME | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 SR_PRIV const uint64_t kecheng_kc_330b_sample_intervals[][2] = {
@@ -128,10 +129,10 @@ static GSList *scan(GSList *options)
 		for (l = usb_devices; l; l = l->next) {
 			if (scan_kecheng(l->data, &model) != SR_OK)
 				continue;
-			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, VENDOR,
-					model, NULL)))
-				return NULL;
-			g_free(model);
+			sdi = sr_dev_inst_new();
+			sdi->status = SR_ST_INACTIVE;
+			sdi->vendor = g_strdup(VENDOR);
+			sdi->model = model; /* Already g_strndup()'d. */
 			sdi->driver = di;
 			sdi->inst_type = SR_INST_USB;
 			sdi->conn = l->data;
@@ -390,7 +391,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	switch (key) {
 	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_SAMPLE_INTERVAL:
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -429,7 +430,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	struct sr_usb_dev_inst *usb;
 	GVariant *gvar, *rational[2];
 	const uint64_t *si;
-	int stored_mqflags, req_len, buf_len, len, ret;
+	int req_len, buf_len, len, ret;
 	unsigned char buf[9];
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -461,8 +462,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	} else {
 		if (kecheng_kc_330b_log_info_get(sdi, buf) != SR_OK)
 			return SR_ERR;
-		stored_mqflags = buf[4] ? SR_MQFLAG_SPL_TIME_WEIGHT_S : SR_MQFLAG_SPL_TIME_WEIGHT_F;
-		stored_mqflags |= buf[5] ? SR_MQFLAG_SPL_FREQ_WEIGHT_C : SR_MQFLAG_SPL_FREQ_WEIGHT_A;
+		devc->mqflags = buf[4] ? SR_MQFLAG_SPL_TIME_WEIGHT_S : SR_MQFLAG_SPL_TIME_WEIGHT_F;
+		devc->mqflags |= buf[5] ? SR_MQFLAG_SPL_FREQ_WEIGHT_C : SR_MQFLAG_SPL_FREQ_WEIGHT_A;
 		devc->stored_samples = (buf[7] << 8) | buf[8];
 		if (devc->stored_samples == 0) {
 			/* Notify frontend of empty log by sending start/end packets. */