]> sigrok.org Git - libsigrok.git/commitdiff
asix-sigma: Trigger code cleanup.
authorBert Vermeulen <redacted>
Thu, 2 Oct 2014 12:53:20 +0000 (14:53 +0200)
committerBert Vermeulen <redacted>
Thu, 2 Oct 2014 12:53:20 +0000 (14:53 +0200)
This cleans up a warning generated by clang's static analyzer.

src/hardware/asix-sigma/asix-sigma.c

index db9f404ee5ac89d1d1efd42c016acb7148850e15..d1bca4ef5bab95576357f2feeba3c7dad02c4f1f 100644 (file)
@@ -201,10 +201,10 @@ static int sigma_read_pos(uint32_t *stoppos, uint32_t *triggerpos,
 
        /* Not really sure why this must be done, but according to spec. */
        if ((--*stoppos & 0x1ff) == 0x1ff)
-               stoppos -= 64;
+               *stoppos -= 64;
 
        if ((*--triggerpos & 0x1ff) == 0x1ff)
-               triggerpos -= 64;
+               *triggerpos -= 64;
 
        return 1;
 }
@@ -1342,6 +1342,7 @@ static void add_trigger_function(enum triggerop oper, enum triggerfunc func,
                aset = (*mask >> i) & 1;
                bset = x[b][a];
 
+               rset = 0;
                if (func == FUNC_AND || func == FUNC_NAND)
                        rset = aset & bset;
                else if (func == FUNC_OR || func == FUNC_NOR)