X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=c3abb0ae8de738e653c3d5a3977f16767d963bf5;hb=709468baf7626b162b5559c101516289d9bbb258;hp=d75debb84420510dafdd0dda68e52941eff2e81f;hpb=2ea67fc9bf2b8e777aa45f88477f8880e5bc6286;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index d75debb8..c3abb0ae 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t devopts[] = {
@@ -54,15 +55,12 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 /* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
 static int dev_clear(const struct sr_dev_driver *di)
 {
+	struct drv_context *drvc = di->context;
 	GSList *l;
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	int ret = SR_OK;
 
-	if (!(drvc = di->priv))
-		return SR_OK;
-
 	/* Properly close and free all devices. */
 	for (l = drvc->instances; l; l = l->next) {
 		if (!(sdi = l->data)) {
@@ -87,11 +85,6 @@ static int dev_clear(const struct sr_dev_driver *di)
 	return ret;
 }
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	int i;
@@ -213,13 +206,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->driver = di;
 		sdi->priv = devc;
 
-		for (i = 0; i < NUM_CHANNELS; i++) {
+		for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
 			chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
 			sr_channel_new(sdi, i, chtype, TRUE, channel_names[i]);
 		}
 
 		//Add the driver
-		struct drv_context *drvc = di->priv;
+		struct drv_context *drvc = di->context;
 		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 	}
@@ -227,11 +220,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->priv))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	int ret;
@@ -263,11 +251,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-	return dev_clear();
-}
-
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -275,13 +258,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 
 	(void)cg;
 
+	if (!sdi)
+		return SR_ERR_ARG;
+
+	devc = sdi->priv;
+
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
-		if (sdi) {
-			devc = sdi->priv;
-			*data = g_variant_new_uint64(devc->cur_rate);
-		} else
-			return SR_ERR;
+		*data = g_variant_new_uint64(devc->cur_rate);
 		break;
 	default:
 		return SR_ERR_NA;
@@ -301,6 +285,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	double pos;
 
 	(void)cg;
+
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -390,7 +375,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	int ret = SR_ERR;
@@ -445,23 +430,20 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	/* Reset trigger state. */
 	devc->trigger_state = 0x00;
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Our first channel is analog, the other 8 are of type 'logic'. */
 	/* TODO. */
 
 	serial_source_add(sdi->session, devc->serial, G_IO_IN, -1,
-			mso_receive_data, cb_data);
+			mso_receive_data, sdi);
 
 	return SR_OK;
 }
 
 /* This stops acquisition on ALL devices, ignoring dev_index. */
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	(void)cb_data;
-
 	stop_acquisition(sdi);
 
 	return SR_OK;
@@ -471,10 +453,10 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.name = "link-mso19",
 	.longname = "Link Instruments MSO-19",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
@@ -483,5 +465,5 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };