X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=828121ae121bb6614aaa813904e79ce15e462f06;hb=1953564a96798bc298d1c94eb90c129adbde1c9e;hp=3c6b3e2c8107031c3324052b3ef3354c1b7950dd;hpb=5edc02c77c3576a47ee85241f32785cdf0fdddf8;p=libsigrok.git

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 3c6b3e2c..828121ae 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -77,11 +77,11 @@ static const struct sr_samplerates samplerates = {
 };
 
 static const int hwcaps[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_SAMPLERATE,
-	SR_HWCAP_CAPTURE_RATIO,
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_CAPTURE_RATIO,
 
-	SR_HWCAP_LIMIT_MSEC,
+	SR_CONF_LIMIT_MSEC,
 	0,
 };
 
@@ -824,15 +824,15 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
 	devc = sdi->priv;
 
-	if (hwcap == SR_HWCAP_SAMPLERATE) {
+	if (hwcap == SR_CONF_SAMPLERATE) {
 		ret = set_samplerate(sdi, *(const uint64_t *)value);
-	} else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
+	} else if (hwcap == SR_CONF_LIMIT_MSEC) {
 		devc->limit_msec = *(const uint64_t *)value;
 		if (devc->limit_msec > 0)
 			ret = SR_OK;
 		else
 			ret = SR_ERR;
-	} else if (hwcap == SR_HWCAP_CAPTURE_RATIO) {
+	} else if (hwcap == SR_CONF_CAPTURE_RATIO) {
 		devc->capture_ratio = *(const uint64_t *)value;
 		if (devc->capture_ratio < 0 || devc->capture_ratio > 100)
 			ret = SR_ERR;
@@ -1271,7 +1271,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	struct dev_context *devc;
 	struct sr_datafeed_packet *packet;
 	struct sr_datafeed_header *header;
-	struct sr_datafeed_meta_logic meta;
 	struct clockselect_50 clockselect;
 	int frac, triggerpin, ret;
 	uint8_t triggerselect = 0;
@@ -1382,13 +1381,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header->starttime, NULL);
 	sr_session_send(devc->session_dev_id, packet);
 
-	/* Send metadata about the SR_DF_LOGIC packets to come. */
-	packet->type = SR_DF_META_LOGIC;
-	packet->payload = &meta;
-	meta.samplerate = devc->cur_samplerate;
-	meta.num_probes = devc->num_probes;
-	sr_session_send(devc->session_dev_id, packet);
-
 	/* Add capture source. */
 	sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi);