X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=source%2Fdrv-api.c;h=fee866e9840ecf6e91eb91f55dbcd41f2d84a01d;hb=0832e7d675a9ea308ddcafbb2a1ed425c720fa1e;hp=831c942c134f5b168467d69c99215b16cd14fd55;hpb=4b527a01e5fbcf7fa69dcfa7a3ad2422bf9087b6;p=sigrok-util.git

diff --git a/source/drv-api.c b/source/drv-api.c
index 831c942..fee866e 100644
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -22,7 +22,7 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-SR_PRIV struct sr_dev_driver driver_info;
+SR_PRIV struct sr_dev_driver ${lib}_driver_info;
 static struct sr_dev_driver *di = &${lib}_driver_info;
 
 /* Properly close and free all devices. */
@@ -33,7 +33,9 @@ static int clear_instances(void)
 	struct dev_context *devc;
 	GSList *l;
 
-	drvc = di->priv;
+	if (!(drvc = di->priv))
+		return SR_OK;
+
 	for (l = drvc->instances; l; l = l->next) {
 		if (!(sdi = l->data))
 			continue;
@@ -51,17 +53,18 @@ static int clear_instances(void)
 	return SR_OK;
 }
 
-static int hw_init(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("${short}: Driver context malloc failed.");
-		return SR_ERR;
+		sr_err("Driver context malloc failed.");
+		return SR_ERR_MALLOC;
 	}
 
 	/* TODO */
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -121,6 +124,7 @@ static int hw_info_get(int info_id, const void **data,
 	switch (info_id) {
 	/* TODO */
 	default:
+		sr_err("Unknown info_id: %d.", info_id);
 		return SR_ERR_ARG;
 	}
 
@@ -132,13 +136,16 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 {
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
+	if (sdi->status != SR_ST_ACTIVE) {
+		sr_err("Device inactive, can't set config options.");
 		return SR_ERR;
+	}
 
 	ret = SR_OK;
 	switch (hwcap) {
 	/* TODO */
 	default:
+		sr_err("Unknown hardware capability: %d.", hwcap);
 		ret = SR_ERR_ARG;
 	}
 
@@ -153,13 +160,14 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-				   void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	(void)cb_data;
 
-	if (sdi->status != SR_ST_ACTIVE)
+	if (sdi->status != SR_ST_ACTIVE) {
+		sr_err("Device inactive, can't stop acquisition.");
 		return SR_ERR;
+	}
 
 	/* TODO */