X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=0bc02576d70c389bec90eeebdfa23c4498c3d7fc;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=fcec20c6bbfc2595c8e49da35772c77108b39982;hpb=1987b8d63e748f0813dc6a4630e99686e4fe1728;p=libsigrok.git

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index fcec20c6..0bc02576 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -22,13 +22,13 @@
 #include "protocol.h"
 
 static const int hwcaps[] = {
-	SR_HWCAP_LOGIC_ANALYZER,
-	SR_HWCAP_SAMPLERATE,
-	SR_HWCAP_TRIGGER_SLOPE,
-	SR_HWCAP_HORIZ_TRIGGERPOS,
-//      SR_HWCAP_CAPTURE_RATIO,
-	SR_HWCAP_LIMIT_SAMPLES,
-//      SR_HWCAP_RLE,
+	SR_CONF_LOGIC_ANALYZER,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_TRIGGER_SLOPE,
+	SR_CONF_HORIZ_TRIGGERPOS,
+//      SR_CONF_CAPTURE_RATIO,
+	SR_CONF_LIMIT_SAMPLES,
+//      SR_CONF_RLE,
 	0,
 };
 
@@ -41,12 +41,11 @@ SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", NULL
 };
 
-/*supported samplerates */
 static const struct sr_samplerates samplerates = {
-	SR_HZ(100),
-	SR_MHZ(200),
-	SR_HZ(100),
-	NULL,
+	.low  = SR_HZ(100),
+	.high = SR_MHZ(200),
+	.step = SR_HZ(100),
+	.list = NULL,
 };
 
 SR_PRIV struct sr_dev_driver link_mso19_driver_info;
@@ -54,17 +53,7 @@ static struct sr_dev_driver *di = &link_mso19_driver_info;
 
 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)
@@ -82,10 +71,10 @@ static GSList *hw_scan(GSList *options)
 	for (l = options; l; l = l->next) {
 		src = l->data;
 		switch (src->key) {
-		case SR_HWOPT_CONN:
+		case SR_CONF_CONN:
 			conn = src->value;
 			break;
-		case SR_HWOPT_SERIALCOMM:
+		case SR_CONF_SERIALCOMM:
 			serialcomm = src->value;
 			break;
 		}
@@ -211,11 +200,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)
@@ -298,22 +283,12 @@ static int hw_cleanup(void)
 	return ret;
 }
 
-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 dev_context *devc;
 
-	switch (info_id) {
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		break;
-	case SR_DI_SAMPLERATES:
-		*data = &samplerates;
-		break;
-	case SR_DI_TRIGGER_TYPES:
-		*data = (char *)TRIGGER_TYPES;
-		break;
-	case SR_DI_CUR_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		if (sdi) {
 			devc = sdi->priv;
 			*data = &devc->cur_rate;
@@ -327,8 +302,7 @@ 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)
 {
 	int ret;
 	struct dev_context *devc;
@@ -341,13 +315,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR;
 
-	switch (hwcap) {
-	case SR_HWCAP_SAMPLERATE:
+	switch (id) {
+	case SR_CONF_SAMPLERATE:
 		// FIXME
 		return mso_configure_rate(sdi, *(const uint64_t *)value);
 		ret = SR_OK;
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
 		num_samples = *(uint64_t *)value;
 		if (num_samples < 1024) {
 			sr_err("minimum of 1024 samples required");
@@ -359,10 +333,10 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 			ret = SR_OK;
 		}
 		break;
-	case SR_HWCAP_CAPTURE_RATIO:
+	case SR_CONF_CAPTURE_RATIO:
 		ret = SR_OK;
 		break;
-	case SR_HWCAP_TRIGGER_SLOPE:
+	case SR_CONF_TRIGGER_SLOPE:
 		slope = *(uint64_t *)value;
 		if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) {
 			sr_err("Invalid trigger slope");
@@ -372,7 +346,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 			ret = SR_OK;
 		}
 		break;
-	case SR_HWCAP_HORIZ_TRIGGERPOS:
+	case SR_CONF_HORIZ_TRIGGERPOS:
 		pos = *(float *)value;
 		if (pos < 0 || pos > 255) {
 			sr_err("Trigger position (%f) should be between 0 and 255.", pos);
@@ -383,7 +357,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 			ret = SR_OK;
 		}
 		break;
-	case SR_HWCAP_RLE:
+	case SR_CONF_RLE:
 		ret = SR_OK;
 		break;
 	default:
@@ -394,11 +368,31 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return ret;
 }
 
+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_SAMPLERATE:
+		*data = &samplerates;
+		break;
+	case SR_CONF_TRIGGER_TYPE:
+		*data = (char *)TRIGGER_TYPE;
+		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 sr_datafeed_packet *packet;
-	struct sr_datafeed_header *header;
 	struct dev_context *devc;
 	int ret = SR_ERR;
 
@@ -449,27 +443,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	if (ret != SR_OK)
 		return ret;
 
-	sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
-
-	if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-		sr_err("Datafeed packet malloc failed.");
-		return SR_ERR_MALLOC;
-	}
+	/* Send header packet to the session bus. */
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
-	if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-		sr_err("Datafeed header malloc failed.");
-		g_free(packet);
-		return SR_ERR_MALLOC;
-	}
-
-	packet->type = SR_DF_HEADER;
-	packet->payload = (unsigned char *)header;
-	header->feed_version = 1;
-	gettimeofday(&header->starttime, NULL);
-	sr_session_send(cb_data, packet);
-
-	g_free(header);
-	g_free(packet);
+	sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
 
 	return SR_OK;
 }
@@ -493,10 +470,11 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = hw_cleanup,
+	.config_get = config_get,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,