X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=fc086a7d93a306c073667bcb76845ff30ac00957;hb=5d336f1130ddc2faaeabd7ed6ec602904054bfb8;hp=b5923043570e55c4eaa8c89977d3dfc610e819ee;hpb=7f7f6a2e0c4f611c2096e5bc079ab5f5b674aefc;p=libsigrok.git

diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c
index b5923043..fc086a7d 100644
--- a/hardware/gmc-mh-1x-2x/protocol.c
+++ b/hardware/gmc-mh-1x-2x/protocol.c
@@ -648,7 +648,7 @@ static void send_value(struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	memset(&analog, 0, sizeof(analog));
-	analog.probes = sdi->probes;
+	analog.channels = sdi->channels;
 	analog.num_samples = 1;
 	analog.mq = devc->mq;
 	analog.unit = devc->unit;
@@ -1162,7 +1162,7 @@ SR_PRIV int gmc_mh_1x_2x_receive_data(int fd, int revents, void *cb_data)
 		}
 	}
 
-	/* If number of samples or time limit reached, stop aquisition. */
+	/* If number of samples or time limit reached, stop acquisition. */
 	if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
 		sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1213,7 +1213,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data)
 		}
 	}
 
-	/* If number of samples or time limit reached, stop aquisition. */
+	/* If number of samples or time limit reached, stop acquisition. */
 	if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
 		sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1492,13 +1492,13 @@ SR_PRIV const char *gmc_model_str(enum model mcode)
 /** @copydoc sr_dev_driver.config_set
  */
 SR_PRIV int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-		       const struct sr_probe_group *probe_group)
+		       const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	uint8_t params[9];
 	uint8_t msg[42];
 
-	(void)probe_group;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;