X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=9da525792625267db897a6158776257169f9e0ee;hb=329733d92c5004f0fe308eff26b9537fded2cdf3;hp=4647031c289df9d7a30926e49c91ed9fdbb42915;hpb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 4647031c..9da52579 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -21,7 +21,6 @@
 #include "protocol.h"
 
 SR_PRIV struct sr_dev_driver scpi_pps_driver_info;
-static struct sr_dev_driver *di = &scpi_pps_driver_info;
 extern unsigned int num_pps_profiles;
 extern const struct scpi_pps pps_profiles[];
 
@@ -34,13 +33,13 @@ static const uint32_t drvopts[] = {
 	SR_CONF_POWER_SUPPLY,
 };
 
-static struct pps_channel_instance pci[] = {
+static const struct pps_channel_instance pci[] = {
 	{ SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" },
 	{ SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" },
 	{ SR_MQ_POWER, SCPI_CMD_GET_MEAS_POWER, "P" },
 };
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
@@ -90,12 +89,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	}
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_ACTIVE;
+	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup(vendor);
 	sdi->model = g_strdup(hw_info->model);
 	sdi->version = g_strdup(hw_info->firmware_version);
 	sdi->conn = scpi;
-	sdi->driver = di;
+	sdi->driver = &scpi_pps_driver_info;
 	sdi->inst_type = SR_INST_SCPI;
 	sdi->serial_num = g_strdup(hw_info->serial_number);
 
@@ -105,9 +104,9 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 
 	if (device->num_channels) {
 		/* Static channels and groups. */
-		channels = device->channels;
+		channels = (struct channel_spec *)device->channels;
 		num_channels = device->num_channels;
-		channel_groups = device->channel_groups;
+		channel_groups = (struct channel_group_spec *)device->channel_groups;
 		num_channel_groups = device->num_channel_groups;
 	} else {
 		/* Channels and groups need to be probed. */
@@ -172,17 +171,17 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	return sdi;
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	return sr_scpi_scan(di->priv, options, probe_device);
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, NULL);
 }
@@ -193,7 +192,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	struct sr_scpi_dev_inst *scpi;
 	GVariant *beeper;
 
-	if (sdi->status != SR_ST_ACTIVE)
+	if (sdi->status != SR_ST_INACTIVE)
 		return SR_ERR;
 
 	scpi = sdi->conn;
@@ -247,7 +246,7 @@ static void clear_helper(void *priv)
 	g_free(devc);
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, clear_helper);
 }
@@ -420,7 +419,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 {
 	struct dev_context *devc;
 	struct sr_channel *ch;
-	struct channel_spec *ch_spec;
+	const struct channel_spec *ch_spec;
 	GVariant *gvar;
 	GVariantBuilder gvb;
 	int ret, i;