X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session_driver.c;h=f3cd4b6c8b57e3bff710fdb9e7b90ff590ee372e;hb=7ec5b54955118d8c1ee003a02c3334f1a0046457;hp=43ad24d6b0b489ddc4763cdaa0f760902863d187;hpb=a885ce3ee9ed770594d5b231f6dec0b740bba03b;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index 43ad24d6..f3cd4b6c 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -53,8 +53,8 @@ struct session_vdev {
 
 static GSList *dev_insts = NULL;
 static const int hwcaps[] = {
-	SR_HWCAP_CAPTUREFILE,
-	SR_HWCAP_CAPTURE_UNITSIZE,
+	SR_CONF_CAPTUREFILE,
+	SR_CONF_CAPTURE_UNITSIZE,
 	0,
 };
 
@@ -117,8 +117,10 @@ static int receive_data(int fd, int revents, void *cb_data)
 /* driver callbacks */
 static int hw_cleanup(void);
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
+	(void)sr_ctx;
+
 	return SR_OK;
 }
 
@@ -146,16 +148,12 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	struct session_vdev *vdev;
 
-	switch (info_id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_CUR_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		if (sdi) {
 			vdev = sdi->priv;
 			*data = &vdev->samplerate;
@@ -169,44 +167,59 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct session_vdev *vdev;
 	const uint64_t *tmp_u64;
 
 	vdev = sdi->priv;
 
-	switch (hwcap) {
-	case SR_HWCAP_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		tmp_u64 = value;
 		vdev->samplerate = *tmp_u64;
 		sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate);
 		break;
-	case SR_HWCAP_SESSIONFILE:
+	case SR_CONF_SESSIONFILE:
 		vdev->sessionfile = g_strdup(value);
 		sr_info("Setting sessionfile to '%s'.", vdev->sessionfile);
 		break;
-	case SR_HWCAP_CAPTUREFILE:
+	case SR_CONF_CAPTUREFILE:
 		vdev->capturefile = g_strdup(value);
 		sr_info("Setting capturefile to '%s'.", vdev->capturefile);
 		break;
-	case SR_HWCAP_CAPTURE_UNITSIZE:
+	case SR_CONF_CAPTURE_UNITSIZE:
 		tmp_u64 = value;
 		vdev->unitsize = *tmp_u64;
 		break;
-	case SR_HWCAP_CAPTURE_NUM_PROBES:
+	case SR_CONF_CAPTURE_NUM_PROBES:
 		tmp_u64 = value;
 		vdev->num_probes = *tmp_u64;
 		break;
 	default:
-		sr_err("Unknown capability: %d.", hwcap);
+		sr_err("Unknown capability: %d.", id);
 		return SR_ERR;
 	}
 
 	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)
 {
@@ -214,7 +227,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	struct session_vdev *vdev;
 	struct sr_datafeed_header *header;
 	struct sr_datafeed_packet *packet;
-	struct sr_datafeed_meta_logic meta;
 	int ret;
 
 	vdev = sdi->priv;
@@ -260,13 +272,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header->starttime, NULL);
 	sr_session_send(cb_data, packet);
 
-	/* Send metadata about the SR_DF_LOGIC packets to come. */
-	packet->type = SR_DF_META_LOGIC;
-	packet->payload = &meta;
-	meta.samplerate = vdev->samplerate;
-	meta.num_probes = vdev->num_probes;
-	sr_session_send(cb_data, packet);
-
 	g_free(header);
 	g_free(packet);
 
@@ -280,10 +285,11 @@ SR_PRIV struct sr_dev_driver session_driver = {
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = NULL,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = NULL,
 };