From: Uwe Hermann <redacted>
Date: Wed, 14 Mar 2012 19:02:48 +0000 (+0100)
Subject: sr: s/SR_{USB,SERIAL}_INST/SR_INST_{USB,SERIAL}/.
X-Git-Tag: libsigrok-0.1.0~45
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4101f961e8a414ae17b16c0feb1e10fd07d08d52;p=libsigrok.git

sr: s/SR_{USB,SERIAL}_INST/SR_INST_{USB,SERIAL}/.
---

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index feb6c7eb..b9df6c55 100644
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -691,7 +691,8 @@ static int receive_data(int fd, int revents, void *cb_data)
 	double analog_out[1024];
 	size_t i, s;
 
-	revents = revents;
+	/* Avoid compiler warnings. */
+	(void)revents;
 
 	s = serial_read(fd, in, sizeof(in));
 	if (s <= 0)
diff --git a/sigrok.h b/sigrok.h
index 89be429b..6fb84e2f 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -288,8 +288,10 @@ struct sr_dev_inst {
 
 /* sr_dev_inst types */
 enum {
-	SR_USB_INST,
-	SR_SERIAL_INST,
+	/** Device instance type for USB devices. */
+	SR_INST_USB,
+	/** Device instance type for serial port devices. */
+	SR_INST_SERIAL,
 };
 
 /* Device instance status */