]> jspc29.x-matter.uni-frankfurt.de Git - jtag_mvd.git/commitdiff
hopefully fixed vector mismatch in jtag_write_m10.vhd
authorHadaq in Frankfurt <hadaq@frankfurt>
Fri, 15 Mar 2013 18:06:12 +0000 (19:06 +0100)
committerHadaq in Frankfurt <hadaq@frankfurt>
Fri, 15 Mar 2013 18:06:12 +0000 (19:06 +0100)
vhdl/code/jtag_write_m10.vhd

index df17fb6f1705c725ef90c73c8ed9a43d52165045..d94cb2bc815f6131f6832485c6780b8e1bb888f2 100644 (file)
@@ -429,14 +429,14 @@ begin
           -- WRITE_DR
           -- *** RAM address for next next step ***
           ram_jtag_registers_a_next(RAM_JTAG_REGISTERS_DEPTH-1 downto RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD) <= std_logic_vector(chipcounter); -- chip address
-          ram_jtag_registers_a_next(RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD-1 downto 0) <=  std_logic_vector(2*regcounter + 2); -- DR Pointer
+          ram_jtag_registers_a_next(RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD-1 downto 0) <=  std_logic_vector(to_unsigned(2*to_integer(regcounter) + 2, RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD)); -- DR Pointer
           -- *** RAM address for next next step ***
           substate_next <= newchip_DR_p3;
         when newchip_DR_p3  =>  -- RAM_ADDR_NEXT: DRLength
           numregs_next <= unsigned(RAM_JTAG_REGISTERS_D_IN(MAX_REGISTERS_PLUS_ONE_LD -1 downto 0));
           -- *** RAM address for next next step ***
           ram_jtag_registers_a_next(RAM_JTAG_REGISTERS_DEPTH-1 downto RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD) <= std_logic_vector(chipcounter); -- chip address
-          ram_jtag_registers_a_next(RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD-1 downto 0) <=  std_logic_vector(2*regcounter + 3); 
+          ram_jtag_registers_a_next(RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD-1 downto 0) <=  std_logic_vector(to_unsigned(2*to_integer(regcounter) + 3, RAM_JTAG_REGISTERS_DEPTH-MAX_NUMCHIPS_LD)); 
           -- *** RAM address for next next step ***
           substate_next <= newchip_DR_wait_p4;
         when newchip_DR_wait_p4 =>