X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=fcec20c6bbfc2595c8e49da35772c77108b39982;hb=1987b8d63e748f0813dc6a4630e99686e4fe1728;hp=0ae1eb630174ef960a07b76245bbaf397d834438;hpb=00b44ccb8b2482c2c4c7e832ed11f7460f289e15;p=libsigrok.git

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 0ae1eb63..fcec20c6 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -74,19 +74,19 @@ static GSList *hw_scan(GSList *options)
 	const char *conn = NULL;
 	const char *serialcomm = NULL;
 	GSList *l;
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	struct udev *udev;
 
 	(void)options;
 
 	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
+		src = l->data;
+		switch (src->key) {
 		case SR_HWOPT_CONN:
-			conn = opt->value;
+			conn = src->value;
 			break;
 		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+			serialcomm = src->value;
 			break;
 		}
 	}
@@ -307,12 +307,6 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = mso19_probe_names;
-		break;
 	case SR_DI_SAMPLERATES:
 		*data = &samplerates;
 		break;
@@ -405,7 +399,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
 	struct sr_datafeed_packet *packet;
 	struct sr_datafeed_header *header;
-	struct sr_datafeed_meta_logic meta;
 	struct dev_context *devc;
 	int ret = SR_ERR;
 
@@ -475,12 +468,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header->starttime, NULL);
 	sr_session_send(cb_data, packet);
 
-	packet->type = SR_DF_META_LOGIC;
-	packet->payload = &meta;
-	meta.samplerate = devc->cur_rate;
-	meta.num_probes = NUM_PROBES;
-	sr_session_send(cb_data, packet);
-
 	g_free(header);
 	g_free(packet);