X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fprotocol.c;h=fbb50054ab24f8194d6989985677212eb9184377;hb=79bc9924d70d6c785c3ab28d35ac67f4a3601e1d;hp=ab77a5a15eb26e05f7c5b8353d9948e9a9281164;hpb=365f04d61f54908013021be83450d38fff67964f;p=libsigrok.git

diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index ab77a5a1..fbb50054 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"))
@@ -293,7 +294,7 @@ SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 
 	devc = sdi->priv;
-	sr_source_remove(devc->serial->fd);
+	serial_source_remove(devc->serial);
 
 	/* Terminate session */
 	packet.type = SR_DF_END;
@@ -412,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);
 	}