X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fprotocol.c;h=19840efb8aa95cf96c9514abb5780c89bb522d61;hb=a006798b9979ed3b8a2803927727dfbd870277f7;hp=d41a9e72251fc4817e29c3d92f70fc2464c0ed57;hpb=5952553f569f82b878717b9d97053690014604c9;p=libsigrok.git

diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index d41a9e72..19840efb 100644
--- a/hardware/link-mso19/protocol.c
+++ b/hardware/link-mso19/protocol.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
  * Copyright (C) 2012 Renato Caldas <rmsc@fe.up.pt>
@@ -215,7 +215,8 @@ SR_PRIV int mso_parse_serial(const char *iSerial, const char *iProduct,
 {
 	unsigned int u1, u2, u3, u4, u5, u6;
 
-	iProduct = iProduct;
+	(void)iProduct;
+
 	/* FIXME: This code is in the original app, but I think its
 	 * used only for the GUI */
 	/*    if (strstr(iProduct, "REV_02") || strstr(iProduct, "REV_03"))
@@ -333,7 +334,7 @@ SR_PRIV int mso_configure_rate(const struct sr_dev_inst *sdi, uint32_t rate)
 	return ret;
 }
 
-SR_PRIV int mso_check_trigger(struct sr_serial_dev_inst *serial, uint8_t * info)
+SR_PRIV int mso_check_trigger(struct sr_serial_dev_inst *serial, uint8_t *info)
 {
 	uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) };
 	int ret;
@@ -346,7 +347,8 @@ SR_PRIV int mso_check_trigger(struct sr_serial_dev_inst *serial, uint8_t * info)
 	uint8_t buf = 0;
 	if (serial_read(serial, &buf, 1) != 1)	/* FIXME: Need timeout */
 		ret = SR_ERR;
-	*info = buf;
+	if (!info)
+		*info = buf;
 
 	sr_dbg("Trigger state is: 0x%x.", *info);
 	return ret;
@@ -411,6 +413,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
 		/* FIXME: Need to do conversion to mV */
 		analog_out[i] = (devc->buffer[i * 3] & 0x3f) |
 		    ((devc->buffer[i * 3 + 1] & 0xf) << 6);
+		(void)analog_out;
 		logic_out[i] = ((devc->buffer[i * 3 + 1] & 0x30) >> 4) |
 		    ((devc->buffer[i * 3 + 2] & 0x3f) << 2);
 	}