X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=299fe20c119e5bb8a0533c040db665eb53cd71d3;hb=57981a0716a5d9bec807cad8289d091893de0919;hp=5d6e3dc786b71277d1252c13f6a69ad339d8cc0a;hpb=e4f2b2adc17bf0ab6dfa38b7511caf5a5dcfa7fd;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 5d6e3dc7..299fe20c 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -152,17 +152,7 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-	struct drv_context *drvc;
-	(void)sr_ctx;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	di->priv = drvc;
-
-	return SR_OK;
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -188,10 +178,11 @@ static GSList *hw_scan(GSList *options)
 
 	(void)options;
 
-	devices = NULL;
 	drvc = di->priv;
 	drvc->instances = NULL;
 
+	devices = NULL;
+
 	dir = g_dir_open("/sys/class/usb/", 0, NULL);
 
 	if (dir == NULL)
@@ -282,11 +273,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)
@@ -324,27 +311,6 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	switch (id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_TIMEBASES:
-		*data = timebases;
-		break;
-	case SR_DI_TRIGGER_SOURCES:
-		*data = trigger_sources;
-		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;
@@ -439,12 +405,21 @@ 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_COUPLING:
 		*data = coupling;
 		break;
 	case SR_CONF_VDIV:
 		*data = vdivs;
 		break;
+	case SR_CONF_TIMEBASE:
+		*data = timebases;
+		break;
+	case SR_CONF_TRIGGER_SOURCE:
+		*data = trigger_sources;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -456,8 +431,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
 	struct dev_context *devc;
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_header header;
 	char buf[256];
 	int len;
 
@@ -470,11 +443,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_source_add(devc->fd, G_IO_IN, 50, rigol_ds1xx2_receive_data, (void *)sdi);
 
 	/* 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);
 
 	/* Hardcoded to CH1 only. */
 	devc->enabled_probes = g_slist_append(NULL, sdi->probes->data);
@@ -520,7 +489,7 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
-	.config_get = config_get,
+	.config_get = NULL,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = hw_dev_open,