X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.c;h=c5554cb926140dd96f05b7b5272a61e2c26f5d2b;hb=3be42bc22f8b36599a448273c12a76d3e0f7a940;hp=879007da76bd3c9902a835078357a81d1e34cbdf;hpb=936b1c00e86855b854390d8cdb54ccb3d631dec0;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c
index 879007da..c5554cb9 100644
--- a/src/hardware/gmc-mh-1x-2x/protocol.c
+++ b/src/hardware/gmc-mh-1x-2x/protocol.c
@@ -652,12 +652,12 @@ static void clean_ctmv_rs_v(struct dev_context *devc)
 static void send_value(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct sr_datafeed_packet packet;
 
 	devc = sdi->priv;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+	memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 	analog.channels = sdi->channels;
 	analog.num_samples = 1;
 	analog.mq = devc->mq;
@@ -666,7 +666,7 @@ static void send_value(struct sr_dev_inst *sdi)
 	analog.data = &devc->value;
 
 	memset(&packet, 0, sizeof(struct sr_datafeed_packet));
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
 	sr_session_send(devc->cb_data, &packet);
 
@@ -873,7 +873,7 @@ static void process_msg_inf_13(struct sr_dev_inst *sdi)
  *  @param buf Pointer to array of 14 data bytes.
  *  @param[in] raw Write only data bytes, no interpretation.
  */
-void dump_msg14(guchar *buf, gboolean raw)
+static void dump_msg14(guchar *buf, gboolean raw)
 {
 	if (!buf)
 		return;
@@ -938,7 +938,6 @@ static int chk_msg14(struct sr_dev_inst *sdi)
 	}
 
 	if (devc->buf[1] == 0) { /* Error msg from device! */
-		retc = SR_ERR_ARG;
 		switch (devc->buf[2]) {
 		case 1: /* Not used */
 			sr_err("Device: Illegal error code!");
@@ -1262,7 +1261,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data)
  *  @param[in] params Further parameters (9 bytes)
  *  @param[out] buf Buffer to create msg in (42 bytes).
  */
-void create_cmd_14(guchar addr, guchar func, guchar *params, guchar *buf)
+static void create_cmd_14(guchar addr, guchar func, guchar *params, guchar *buf)
 {
 	uint8_t dta[GMC_REPLY_SIZE];	/* Unencoded message */
 	int cnt;