From 1d42376fc6ab9a652109b3edd7d30317a8395089 Mon Sep 17 00:00:00 2001 From: Hadaq in Frankfurt Date: Fri, 15 Mar 2013 19:06:12 +0100 Subject: [PATCH] hopefully fixed vector mismatch in jtag_write_m10.vhd --- vhdl/code/jtag_write_m10.vhd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vhdl/code/jtag_write_m10.vhd b/vhdl/code/jtag_write_m10.vhd index df17fb6..d94cb2b 100644 --- a/vhdl/code/jtag_write_m10.vhd +++ b/vhdl/code/jtag_write_m10.vhd @@ -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 => -- 2.43.0