X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=c3cd244ccd22fe4d15f06ab843d38c495e3f2905;hb=f3f19d1131025b68d29a11273b627c83d748e7ea;hp=9f5daf1ce9d88bf1093497a08995263d3aa821f5;hpb=bf622e6d00e7985e36a0ddb643e2bf05d66679a6;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 9f5daf1c..c3cd244c 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -168,7 +168,7 @@ static const char *scope_digital_channel_names[] = {
 	"D7"
 };
 
-static struct scope_config scope_models[] = {
+static const struct scope_config scope_models[] = {
 	{
 		.model_id   = {"710105",  "710115",  "710125",  NULL},
 		.model_name = {"DLM2022", "DLM2032", "DLM2052", NULL},
@@ -235,7 +235,7 @@ static struct scope_config scope_models[] = {
  * @param config This is the scope configuration.
  * @param state The current scope state to print.
  */
-static void scope_state_dump(struct scope_config *config,
+static void scope_state_dump(const struct scope_config *config,
 		struct scope_state *state)
 {
 	unsigned int i;
@@ -376,7 +376,7 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
  * @return SR_ERR on error, SR_OK otherwise.
  */
 static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
-		struct scope_config *config,
+		const struct scope_config *config,
 		struct scope_state *state)
 {
 	int i, j;
@@ -439,7 +439,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
  * @return SR_ERR on error, SR_OK otherwise.
  */
 static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
-		struct scope_config *config,
+		const struct scope_config *config,
 		struct scope_state *state)
 {
 	unsigned int i;
@@ -514,7 +514,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct scope_state *state;
-	struct scope_config *config;
+	const struct scope_config *config;
 	float tmp_float;
 	gchar *response;
 	int i;
@@ -588,7 +588,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi)
  *
  * @return The newly allocated scope_state struct.
  */
-static struct scope_state *dlm_scope_state_new(struct scope_config *config)
+static struct scope_state *dlm_scope_state_new(const struct scope_config *config)
 {
 	struct scope_state *state;
 
@@ -669,9 +669,8 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 
 	/* Add analog channels. */
 	for (i = 0; i < scope_models[model_index].analog_channels; i++) {
-		ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE,
+		ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
 				(*scope_models[model_index].analog_names)[i]);
-		sdi->channels = g_slist_append(sdi->channels, ch);
 
 		devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
 
@@ -698,9 +697,8 @@ SR_PRIV int dlm_device_init(struct sr_dev_inst *sdi, int model_index)
 
 	/* Add digital channels. */
 	for (i = 0; i < scope_models[model_index].digital_channels; i++) {
-		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+		ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
 				(*scope_models[model_index].digital_names)[i]);
-		sdi->channels = g_slist_append(sdi->channels, ch);
 
 		devc->digital_groups[i / 8]->channels = g_slist_append(
 				devc->digital_groups[i / 8]->channels, ch);
@@ -1003,7 +1001,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
 		devc->current_channel = devc->current_channel->next;
 
 	if (dlm_channel_data_request(sdi) != SR_OK) {
-		sr_err("Failed to request aquisition data.");
+		sr_err("Failed to request acquisition data.");
 		goto fail;
 	}