GPL headers: Use correct project name.

[libsigrok.git] / hardware / link-mso19 / protocol.c

diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index d94e2b6c1b3d6625042d26f64d93e4f0f7792cb0..fd9c0130975070b623f2cbb721309d0913a2db63 100644 (file)
--- 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>
@@ -121,7 +121,7 @@ SR_PRIV int mso_configure_trigger(const struct sr_dev_inst *sdi)
        uint16_t ops[18];
        ops[0] = mso_trans(3, threshold_value & 0xff);
        //The trigger_config also holds the 2 MSB bits from the threshold value
-       ops[1] = mso_trans(4, trigger_config | (threshold_value >> 8) & 0x03);
+       ops[1] = mso_trans(4, trigger_config | ((threshold_value >> 8) & 0x03));
        ops[2] = mso_trans(5, devc->la_trigger);
        ops[3] = mso_trans(6, devc->la_trigger_mask);
        ops[4] = mso_trans(7, devc->trigger_holdoff[0]);
@@ -333,7 +333,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 +346,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 +412,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);
        }