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 feb6c7eb4b479d6a5db86c478d47a5ef2a654021..b9df6c55e08661148e19f247a55cecddef875935 100644 (file)
--- 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 89be429bf978c959eba3827f5e7e32f1c28628e3..6fb84e2fa084aa5d814ce9bd007fab051e1ffef8 100644 (file)
--- 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 */