X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=098ba92ffa397a7d5a36534ff84c1e9dd4225e5b;hb=4c0e310ca305ba776aa70d8062f467ac246c910b;hp=c4346ba6fe9fb9778523cb16dec692ebb98f81d0;hpb=1ebe4b4e6926eb1288ce77b179a92bc670eb9eca;p=libsigrok.git

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index c4346ba6..098ba92f 100644
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -44,11 +44,6 @@ static const int hwcaps[] = {
 	0,
 };
 
-static const char *probe_names[] = {
-	"P1",
-	NULL,
-};
-
 SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 static struct sr_dev_driver *di = &colead_slm_driver_info;
 
@@ -97,7 +92,7 @@ static GSList *hw_scan(GSList *options)
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	struct sr_probe *probe;
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
@@ -108,13 +103,13 @@ static GSList *hw_scan(GSList *options)
 
 	conn = serialcomm = NULL;
 	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;
 		}
 	}
@@ -199,7 +194,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
 		       const struct sr_dev_inst *sdi)
 {
-	
 	(void)sdi;
 
 	switch (info_id) {
@@ -209,12 +203,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 = probe_names;
-		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -265,7 +253,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_analog meta;
 	struct dev_context *devc;
 
 	if (!(devc = sdi->priv)) {
@@ -285,13 +272,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header.starttime, NULL);
 	sr_session_send(devc->cb_data, &packet);
 
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	sr_dbg("Sending SR_DF_META_ANALOG.");
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = 1;
-	sr_session_send(devc->cb_data, &packet);
-
 	/* Poll every 150ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 150, colead_slm_receive_data,
 			(void *)sdi);