X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=cad91c75adfacc4f0059920aee54cb9ad5c45bb7;hb=815e3cb83e715fad442c491d406f6ceba79e3a74;hp=77feac8637d54c00d039fd761cf5a39794bba0d3;hpb=bf622e6d00e7985e36a0ddb643e2bf05d66679a6;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 77feac86..cad91c75 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -23,7 +23,6 @@
 #define SERIALCOMM "115200/8n1/flow=1"
 
 SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
-static struct sr_dev_driver *di = &hameg_hmo_driver_info;
 
 static const char *manufacturers[] = {
 	"HAMEG",
@@ -45,7 +44,7 @@ enum {
 	CG_DIGITAL,
 };
 
-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);
 }
@@ -85,7 +84,7 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi
 	sdi->model = g_strdup(hw_info->model);
 	sdi->version = g_strdup(hw_info->firmware_version);
 	sdi->serial_num = g_strdup(hw_info->serial_number);
-	sdi->driver = di;
+	sdi->driver = &hameg_hmo_driver_info;
 	sdi->inst_type = SR_INST_SCPI;
 	sdi->conn = scpi;
 
@@ -110,18 +109,17 @@ fail:
 		sr_scpi_hw_info_free(hw_info);
 	if (sdi)
 		sr_dev_inst_free(sdi);
-	if (devc)
-		g_free(devc);
+	g_free(devc);
 
 	return NULL;
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	return sr_scpi_scan(di->priv, options, hmo_probe_serial_device);
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
@@ -140,7 +138,7 @@ static void clear_helper(void *priv)
 	g_free(devc);
 }
 
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, clear_helper);
 }
@@ -170,9 +168,9 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-	dev_clear();
+	dev_clear(di);
 
 	return SR_OK;
 }
@@ -181,7 +179,7 @@ static int check_channel_group(struct dev_context *devc,
 			     const struct sr_channel_group *cg)
 {
 	unsigned int i;
-	struct scope_config *model;
+	const struct scope_config *model;
 
 	model = devc->model_config;
 
@@ -207,7 +205,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	int ret, cg_type;
 	unsigned int i;
 	struct dev_context *devc;
-	struct scope_config *model;
+	const struct scope_config *model;
 	struct scope_state *state;
 
 	if (!sdi || !(devc = sdi->priv))
@@ -332,7 +330,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	unsigned int i, j;
 	char command[MAX_COMMAND_SIZE], float_str[30];
 	struct dev_context *devc;
-	struct scope_config *model;
+	const struct scope_config *model;
 	struct scope_state *state;
 	const char *tmp;
 	uint64_t p, q;
@@ -502,7 +500,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 {
 	int cg_type = CG_NONE;
 	struct dev_context *devc = NULL;
-	struct scope_config *model = NULL;
+	const struct scope_config *model = NULL;
 
 	if (sdi && (devc = sdi->priv)) {
 		if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
@@ -573,7 +571,7 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
 	char command[MAX_COMMAND_SIZE];
 	struct sr_channel *ch;
 	struct dev_context *devc;
-	struct scope_config *model;
+	const struct scope_config *model;
 
 	devc = sdi->priv;
 	model = devc->model_config;
@@ -641,7 +639,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 	gboolean *pod_enabled, setup_changed;
 	char command[MAX_COMMAND_SIZE];
 	struct scope_state *state;
-	struct scope_config *model;
+	const struct scope_config *model;
 	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;