X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fradioshack-dmm%2Fprotocol.c;h=de925b56838ebd376bbecb723fb710cee2b8172b;hb=401476daaf3006c0362bdeb7ee99f1d9b9b78809;hp=96342cecb508ed96a7d0dcb0b593e9e8e6fabaf7;hpb=19ee7dff78f7195bfc82f14ef659751cdd0f6476;p=libsigrok.git

diff --git a/hardware/radioshack-dmm/protocol.c b/hardware/radioshack-dmm/protocol.c
index 96342cec..de925b56 100644
--- a/hardware/radioshack-dmm/protocol.c
+++ b/hardware/radioshack-dmm/protocol.c
@@ -419,7 +419,7 @@ static void handle_packet(struct rs_22_812_packet *rs_packet,
 	g_free(analog);
 }
 
-static void handle_new_data(struct dev_context *devc, int fd)
+static void handle_new_data(struct dev_context *devc)
 {
 	int len;
 	size_t i, offset = 0;
@@ -427,7 +427,7 @@ static void handle_new_data(struct dev_context *devc, int fd)
 
 	/* Try to get as much data as the buffer can hold. */
 	len = RS_DMM_BUFSIZE - devc->buflen;
-	len = serial_read(fd, devc->buf + devc->buflen, len);
+	len = serial_read(devc->serial, devc->buf + devc->buflen, len);
 	if (len < 1) {
 		sr_err("Serial port read error.");
 		return;
@@ -456,6 +456,8 @@ SR_PRIV int radioshack_dmm_receive_data(int fd, int revents, void *cb_data)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -464,7 +466,7 @@ SR_PRIV int radioshack_dmm_receive_data(int fd, int revents, void *cb_data)
 
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
-		handle_new_data(devc, fd);
+		handle_new_data(devc);
 	}
 
 	if (devc->num_samples >= devc->limit_samples) {