Skip to content
Snippets Groups Projects
Commit a60ef5a9 authored by Frans Schreuder's avatar Frans Schreuder
Browse files

Merge branch 'phase2/release-5.1' into 'phase2/master' 

Phase2/release 5.1

See merge request !569
parents d84e6b4a f028949e
No related branches found
No related tags found
1 merge request!569Phase2/release 5.1
Pipeline #7723606 waiting for manual action
Stage: vsg
    Stage: sim
      Stage: build_full_gbt_4ch
        Stage: build_strip_pixel_4ch
          Stage: build_lpgbt_bcmp_4ch
            Stage: build_interlaken_8ch
              Stage: manual
                +4
                Hide whitespace changes
                Inline Side-by-side
                sources/CRToHost/ToHostAxiStreamController.vhd
                + 1
                − 0
                View file @ a60ef5a9
                ......@@ -436,6 +436,7 @@ begin
                end if;
                if(blockCounter = 0) then
                first_subchunk := '0';
                last_subchunk := '0';
                end if;
                -- if((blockCounter = (NUMBER_OF_WORDS_PER_BLOCK-2)) and create_timeout_trailer = '0' and create_trailer = '0' and ((s_axis.tvalid = '1'and s_axis_tready_s = '1') or blockCounter /= 0)) then --end of block, always create trailer.
                if(((word32out_valid_s = '0' AND blockCounter = (NUMBER_OF_WORDS_PER_BLOCK-1)) or
                ......
                0% or .
                You are about to add 0 people to the discussion. Proceed with caution.
                Finish editing this message first!
                Please register or to comment