]> sigrok.org Git - libsigrok.git/commitdiff
pipistrello: rename registers to match actual function
authorWolfram Sang <redacted>
Wed, 2 Jan 2019 12:15:24 +0000 (13:15 +0100)
committerUwe Hermann <redacted>
Sun, 13 Jan 2019 19:07:27 +0000 (20:07 +0100)
Magnus (creator of the Pipistrello) confirmed that he mixed up the
register names. The code was doing it correctly nonetheless but was
confusing to read because of this. Fix it to make it easier to
comprehend.

Signed-off-by: Wolfram Sang <redacted>
src/hardware/pipistrello-ols/api.c
src/hardware/pipistrello-ols/protocol.h

index a7b43c4c52f69fd677caee2504af43eac556574d..8f9829666db820342cd7ab5eb03e8e4e0f58b6a2 100644 (file)
@@ -557,13 +557,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        arg[1] = ((readcount - 1) & 0xff00) >> 8;
        arg[2] = ((readcount - 1) & 0xff0000) >> 16;
        arg[3] = ((readcount - 1) & 0xff000000) >> 24;
-       if (write_longcommand(devc, CMD_CAPTURE_DELAY, arg) != SR_OK)
+       if (write_longcommand(devc, CMD_CAPTURE_READCOUNT, arg) != SR_OK)
                return SR_ERR;
        arg[0] = ((delaycount - 1) & 0xff);
        arg[1] = ((delaycount - 1) & 0xff00) >> 8;
        arg[2] = ((delaycount - 1) & 0xff0000) >> 16;
        arg[3] = ((delaycount - 1) & 0xff000000) >> 24;
-       if (write_longcommand(devc, CMD_CAPTURE_COUNT, arg) != SR_OK)
+       if (write_longcommand(devc, CMD_CAPTURE_DELAYCOUNT, arg) != SR_OK)
                return SR_ERR;
 
        /* Flag register. */
index 1ac0d06d6f1c23f3127a76abfb8d095cb611fdef..2f0249072366566a0e5a2c0238e2fa63284f0ebf 100644 (file)
@@ -49,8 +49,8 @@
 #define CMD_METADATA               0x04
 #define CMD_SET_DIVIDER            0x80
 #define CMD_SET_FLAGS              0x82
-#define CMD_CAPTURE_COUNT          0x83
-#define CMD_CAPTURE_DELAY          0x84
+#define CMD_CAPTURE_DELAYCOUNT     0x83
+#define CMD_CAPTURE_READCOUNT      0x84
 #define CMD_SET_TRIGGER_MASK       0xc0
 #define CMD_SET_TRIGGER_VALUE      0xc1
 #define CMD_SET_TRIGGER_CONFIG     0xc2