X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fapi.c;h=b019f0f24ed1a83627945d94b3584aa3a825c8d7;hb=fbec8bd2f3ead02358df65240c2cf786c8267f54;hp=66d4ef48331779acff6757a26ae601aba556e139;hpb=388f9d3e25da89df1fb01412688339b6de54e14e;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 66d4ef48..b019f0f2 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -26,11 +26,16 @@
 
 #define UNI_T_UT_D04_NEW "1a86.e008"
 
+static const int hwopts[] = {
+	SR_CONF_CONN,
+	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,
 };
 
@@ -88,7 +93,7 @@ static GSList *hw_scan(GSList *options)
 	struct dev_context *devc;
 	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	struct sr_probe *probe;
 	const char *conn;
 
@@ -101,10 +106,10 @@ static GSList *hw_scan(GSList *options)
 
 	conn = 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;
 		}
 	}
@@ -181,24 +186,20 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	(void)sdi;
 
-	sr_spew("Backend requested info_id %d.", info_id);
+	sr_spew("Backend requested info_id %d.", id);
 
-	switch (info_id) {
+	switch (id) {
+	case SR_DI_HWOPTS:
+		*data = hwopts;
+		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		sr_spew("%s: Returning hwcaps.", __func__);
 		break;
-	case SR_DI_SAMPLERATES:
-		/* TODO: Get rid of this. */
-		*data = NULL;
-		sr_spew("%s: Returning samplerates.", __func__);
-		return SR_ERR_ARG;
-		break;
 	case SR_DI_CUR_SAMPLERATE:
 		/* TODO: Get rid of this. */
 		*data = NULL;
@@ -213,15 +214,14 @@ static int hw_info_get(int info_id, const void **data,
 	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;
 
 	devc = sdi->priv;
 
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_MSEC:
+	switch (id) {
+	case SR_CONF_LIMIT_MSEC:
 		/* TODO: Not yet implemented. */
 		if (*(const uint64_t *)value == 0) {
 			sr_err("Time limit cannot be 0.");
@@ -231,7 +231,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		sr_dbg("Setting time limit to %" PRIu64 "ms.",
 		       devc->limit_msec);
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
 		if (*(const uint64_t *)value == 0) {
 			sr_err("Sample limit cannot be 0.");
 			return SR_ERR;
@@ -241,7 +241,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		       devc->limit_samples);
 		break;
 	default:
-		sr_err("Unknown capability: %d.", hwcap);
+		sr_err("Unknown capability: %d.", id);
 		return SR_ERR;
 		break;
 	}
@@ -249,12 +249,24 @@ 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) {
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
@@ -271,13 +283,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);
-
 	if (!strcmp(di->name, "uni-t-ut61d")) {
 		sr_source_add(0, 0, 10 /* poll_timeout */,
 			      uni_t_ut61d_receive_data, (void *)sdi);
@@ -317,10 +322,11 @@ SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.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,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,
@@ -335,10 +341,11 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.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,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,