X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=ebcc0f253fbc23016f70b506725fd30047c4d8e3;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=65e7000c0245225b8b3938537bba0a112457f837;hpb=9a6517d14b1248855cde0d88ec9519f99184cc77;p=libsigrok.git

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 65e7000c..ebcc0f25 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. */
@@ -350,11 +341,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-	struct drv_context *drvc;
-
-	drvc = di->priv;
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -422,24 +409,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) {
-	/* TODO remove this */
-	case SR_CONF_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;
@@ -861,8 +830,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
 	const struct libusb_pollfd **lupfd;
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_header header;
 	struct dev_context *devc;
 	struct drv_context *drvc = di->priv;
 	int i;
@@ -892,11 +859,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	free(lupfd);
 
 	/* Send header packet to the session bus. */
-	packet.type = SR_DF_HEADER;
-	packet.payload = (unsigned char *)&header;
-	header.feed_version = 1;
-	gettimeofday(&header.starttime, NULL);
-	sr_session_send(cb_data, &packet);
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
 	return SR_OK;
 }
@@ -925,7 +888,6 @@ 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,