X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=463fa189bea34714d34a7122767c818f5d04e5a0;hb=c27e5f1e82819cad599b95a24bf9f617abd6fafb;hp=e4f6a9f424dfcdfdbe82d8a6642e44d9f55f92e8;hpb=123e13138385055003cb6bc09e74df783df5af85;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index e4f6a9f4..463fa189 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -153,9 +153,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 	struct session_vdev *vdev;
 
 	switch (id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
 	case SR_CONF_SAMPLERATE:
 		if (sdi) {
 			vdev = sdi->priv;
@@ -207,13 +204,27 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+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;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		void *cb_data)
 {
 	struct zip_stat zs;
 	struct session_vdev *vdev;
-	struct sr_datafeed_header *header;
-	struct sr_datafeed_packet *packet;
 	int ret;
 
 	vdev = sdi->priv;
@@ -239,28 +250,11 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		return SR_ERR;
 	}
 
-	/* freewheeling source */
-	sr_session_source_add(-1, 0, 0, receive_data, cb_data);
-
-	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("%s: packet malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("%s: header malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
 	/* 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);
 
-	g_free(header);
-	g_free(packet);
+	/* freewheeling source */
+	sr_session_source_add(-1, 0, 0, receive_data, cb_data);
 
 	return SR_OK;
 }
@@ -274,6 +268,7 @@ SR_PRIV struct sr_dev_driver session_driver = {
 	.cleanup = hw_cleanup,
 	.config_get = config_get,
 	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = NULL,
 	.dev_acquisition_start = hw_dev_acquisition_start,