X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=b3b0a8efa2963794f0f29c25d2ce8d53801201db;hb=6a4710fac267c07cc146b2a3cd23204b08bea552;hp=eee148912f6a611b630447cedbeea9814912a2bf;hpb=6b8d6f93bb8df26ea04624009e2715cb6766b4f5;p=libsigrok.git

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index eee14891..b3b0a8ef 100644
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -30,16 +30,16 @@
 #include "protocol.h"
 
 static const int hwopts[] = {
-	SR_HWOPT_CONN,
-	SR_HWOPT_SERIALCOMM,
+	SR_CONF_CONN,
+	SR_CONF_SERIALCOMM,
 	0,
 };
 
 static const int hwcaps[] = {
-	SR_HWCAP_MULTIMETER,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_LIMIT_MSEC,
-	SR_HWCAP_CONTINUOUS,
+	SR_CONF_MULTIMETER,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_MSEC,
+	SR_CONF_CONTINUOUS,
 	0,
 };
 
@@ -293,19 +293,19 @@ scan_cleanup:
 
 static GSList *hw_scan(GSList *options, int dmm)
 {
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	GSList *l, *devices;
 	const char *conn, *serialcomm;
 
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
-		case SR_HWOPT_CONN:
-			conn = opt->value;
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			conn = src->value;
 			break;
-		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+		case SR_CONF_SERIALCOMM:
+			serialcomm = src->value;
 			break;
 		}
 	}
@@ -373,27 +373,7 @@ static int hw_cleanup(int dmm)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	switch (info_id) {
-	case SR_DI_HWOPTS:
-		*data = hwopts;
-		break;
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	default:
-		return SR_ERR_ARG;
-	}
-
-	return SR_OK;
-}
-
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-			     const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
@@ -405,19 +385,19 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		return SR_ERR_BUG;
 	}
 
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_SAMPLES:
+	switch (id) {
+	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = *(const uint64_t *)value;
 		sr_dbg("Setting sample limit to %" PRIu64 ".",
 		       devc->limit_samples);
 		break;
-	case SR_HWCAP_LIMIT_MSEC:
+	case SR_CONF_LIMIT_MSEC:
 		devc->limit_msec = *(const uint64_t *)value;
 		sr_dbg("Setting time limit to %" PRIu64 "ms.",
 		       devc->limit_msec);
 		break;
 	default:
-		sr_err("Unknown capability: %d.", hwcap);
+		sr_err("Unknown capability: %d.", id);
 		return SR_ERR;
 		break;
 	}
@@ -425,12 +405,30 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return SR_OK;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		*data = hwopts;
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data, int dmm)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	if (!(devc = sdi->priv)) {
@@ -458,13 +456,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 50ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 50,
 		      dmms[dmm].receive_data, (void *)sdi);
@@ -530,10 +521,10 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
 	.scan = hw_scan_##ID_UPPER, \
 	.dev_list = hw_dev_list_##ID_UPPER, \
 	.dev_clear = clear_instances_##ID_UPPER, \
+	.config_set = config_set, \
+	.config_list = config_list, \
 	.dev_open = hw_dev_open, \
 	.dev_close = hw_dev_close, \
-	.info_get = hw_info_get, \
-	.dev_config_set = hw_dev_config_set, \
 	.dev_acquisition_start = hw_dev_acquisition_start_##ID_UPPER, \
 	.dev_acquisition_stop = hw_dev_acquisition_stop, \
 	.priv = NULL, \