X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Frigol-ds1xx2%2Fapi.c;h=cb8ad1a9015d35b0fa868710d57d9c739865f9f1;hb=6e772cbe802327ed79cdaae9d366fed1ec6b081c;hp=7cb579126dc83370d485553c488d954f34f95767;hpb=c0eea11c4535e071c72b357fa7e2d1288104c134;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 7cb57912..cb8ad1a9 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -114,7 +114,7 @@ static const char *supported_models[] = {
 	"DS1052E",
 	"DS1102E",
 	"DS1052D",
-	"DS1102D"
+	"DS1102D",
 };
 
 SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
@@ -152,17 +152,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)
@@ -182,16 +172,16 @@ static GSList *hw_scan(GSList *options)
 	const gchar *delimiter = ",";
 	gchar **tokens;
 	const char *manufacturer, *model, *version;
-	int num_models;
 	gboolean matched = FALSE;
 	char buf[256];
 
 	(void)options;
 
-	devices = NULL;
 	drvc = di->priv;
 	drvc->instances = NULL;
 
+	devices = NULL;
+
 	dir = g_dir_open("/sys/class/usb/", 0, NULL);
 
 	if (dir == NULL)
@@ -235,9 +225,7 @@ static GSList *hw_scan(GSList *options)
 			return NULL;
 		}
 
-		num_models = sizeof(supported_models) / sizeof(supported_models[0]);
-
-		for (i = 0; i < num_models; i++) {
+		for (i = 0; i < ARRAY_SIZE(supported_models); i++) {
 			if (!strcmp(model, supported_models[i])) {
 				matched = 1;
 				break;
@@ -282,11 +270,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)
@@ -444,8 +428,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;
 
@@ -458,11 +440,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);
@@ -508,6 +486,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 = NULL,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = hw_dev_open,