X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=97742ffe88a4a8bb225a2449e016162bbbcd9b4c;hb=c4227fc637431113ba92092ddbda86461703c06c;hp=a23161cbf14cd27a6ef233394accfa197c5b4a7e;hpb=035a1078fda93cf1da37d19b3a1d95311b99b00f;p=libsigrok.git

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index a23161cb..97742ffe 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -259,17 +259,7 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-	struct drv_context *drvc;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	drvc->sr_ctx = sr_ctx;
-	di->priv = drvc;
-
-	return SR_OK;
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -285,11 +275,12 @@ static GSList *hw_scan(GSList *options)
 
 	(void)options;
 
-	devcnt = 0;
-	devices = 0;
 	drvc = di->priv;
 	drvc->instances = NULL;
 
+	devcnt = 0;
+	devices = 0;
+
 	clear_instances();
 
 	/* Find all Hantek DSO devices and upload firmware to all of them. */
@@ -422,45 +413,6 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-	uint64_t tmp;
-
-	(void)sdi;
-
-	switch (id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_BUFFERSIZES:
-		*data = buffersizes;
-		break;
-	case SR_DI_TIMEBASES:
-		*data = timebases;
-		break;
-	case SR_DI_TRIGGER_SOURCES:
-		*data = trigger_sources;
-		break;
-	case SR_DI_FILTERS:
-		*data = filter_targets;
-		break;
-	case SR_DI_VDIVS:
-		*data = vdivs;
-		break;
-	case SR_DI_COUPLING:
-		*data = coupling;
-		break;
-	/* TODO remove this */
-	case SR_DI_CUR_SAMPLERATE:
-		*data = &tmp;
-		break;
-	default:
-		return SR_ERR_ARG;
-	}
-
-	return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -580,6 +532,40 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	case SR_CONF_BUFFERSIZE:
+		*data = buffersizes;
+		break;
+	case SR_CONF_COUPLING:
+		*data = coupling;
+		break;
+	case SR_CONF_VDIV:
+		*data = vdivs;
+		break;
+	case SR_CONF_FILTER:
+		*data = filter_targets;
+		break;
+	case SR_CONF_TIMEBASE:
+		*data = timebases;
+		break;
+	case SR_CONF_TRIGGER_SOURCE:
+		*data = trigger_sources;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
 		int num_samples)
 {
@@ -912,8 +898,8 @@ SR_PRIV struct sr_dev_driver hantek_dso_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,
 	.dev_acquisition_start = hw_dev_acquisition_start,