X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fconrad-digi-35-cpu%2Fapi.c;h=63c0e4f18703f2614b31740ce5fbeec3cd657a1c;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=dc52426441205759a2c21adc3b0efb134122a010;hpb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;p=libsigrok.git

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index dc524264..63c0e4f1 100644
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -22,6 +22,7 @@
  *  @internal
  */
 
+#include <config.h>
 #include "protocol.h"
 
 #define SERIALCOMM "9600/8n1"
@@ -33,20 +34,12 @@ static const uint32_t scanopts[] = {
 
 static const uint32_t devopts[] = {
 	SR_CONF_POWER_SUPPLY,
-	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_SET,
-	SR_CONF_OUTPUT_CURRENT | SR_CONF_SET,
+	SR_CONF_VOLTAGE | SR_CONF_SET,
+	SR_CONF_CURRENT | SR_CONF_SET,
 	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
 };
 
-SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
-static struct sr_dev_driver *di = &conrad_digi_35_cpu_driver_info;
-
-static int init(struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
@@ -56,7 +49,7 @@ static GSList *scan(GSList *options)
 	const char *conn, *serialcomm;
 
 	devices = NULL;
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 	conn = serialcomm = NULL;
 
@@ -93,7 +86,7 @@ static GSList *scan(GSList *options)
 	sr_spew("Conrad DIGI 35 CPU assumed at %s.", conn);
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_ACTIVE;
+	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Conrad");
 	sdi->model = g_strdup("DIGI 35 CPU");
 	sdi->conn = serial;
@@ -106,16 +99,6 @@ static GSList *scan(GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(void)
-{
-	return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int cleanup(void)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -127,9 +110,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	ret = SR_OK;
 	switch (key) {
-	case SR_CONF_OUTPUT_VOLTAGE:
+	case SR_CONF_VOLTAGE:
 		dblval = g_variant_get_double(data);
 		if ((dblval < 0.0) || (dblval > 35.0)) {
 			sr_err("Voltage out of range (0 - 35.0)!");
@@ -137,7 +119,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		}
 		ret = send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
 		break;
-	case SR_CONF_OUTPUT_CURRENT:
+	case SR_CONF_CURRENT:
 		dblval = g_variant_get_double(data);
 		if ((dblval < 0.01) || (dblval > 2.55)) {
 			sr_err("Current out of range (0 - 2.55)!");
@@ -183,34 +165,30 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return ret;
 }
 
-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)
 {
-	(void)cb_data;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
 	return SR_OK;
 }
 
-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;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
+static struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
 	.name = "conrad-digi-35-cpu",
 	.longname = "Conrad DIGI 35 CPU",
 	.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 = NULL,
 	.config_get = NULL,
 	.config_set = config_set,
@@ -219,5 +197,6 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(conrad_digi_35_cpu_driver_info);