diff --git a/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json b/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json index 39a2bdd..8e7650b 100644 --- a/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json +++ b/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json @@ -1,5 +1,5 @@ [{ - "ip_name" : "generic_sequencer", + "ip_name" : "generic_sequencer_15", "bus" : "csr", "addr_width" : "4", "description" : "Generic Sequencer core", @@ -273,4 +273,21 @@ } } } +}, +{ + "ip_name" : "generic_sequencer_15", + "bus" : "seq", + "addr_hi_bit" : "8", + "addr_lo_bit" : "0", + "process_regs" : "disabled", + "description" : "This block is the generic sequencer. It is a leaf block for the sequence bus", + "registers" : { + "seq_buff" : { + "address" : "0", + "width" : "32", + "type" : "w", + "reset" : "0", + "description" : "Sequence buffer" + } + } }] \ No newline at end of file diff --git a/generic_ip/pulse_generator/1/doc/pulse_generator_1.json b/generic_ip/pulse_generator/1/doc/pulse_generator_1.json index b9438fa..0c78552 100644 --- a/generic_ip/pulse_generator/1/doc/pulse_generator_1.json +++ b/generic_ip/pulse_generator/1/doc/pulse_generator_1.json @@ -229,13 +229,13 @@ "description": "Fractional Divider Enable" }, "udp_max_pos": { - "type": "r", + "type": "w", "bit_len": "1", "reset": "0x0", "description": "Clear the encoder jitter for DIR-0" }, "udp_min_pos": { - "type": "r", + "type": "w", "bit_len": "1", "reset": "0x0", "description": "Clear the encoder jitter for DIR-1" diff --git a/generic_ip/som_ctrl/1/doc/som_ctrl_1.json b/generic_ip/som_ctrl/1/doc/som_ctrl_1.json index 5e83ddb..3f8fb30 100644 --- a/generic_ip/som_ctrl/1/doc/som_ctrl_1.json +++ b/generic_ip/som_ctrl/1/doc/som_ctrl_1.json @@ -50,7 +50,7 @@ "minor_number" : { "type" : "c", "bit_len" : "8", - "reset" : "0x00", + "reset" : "0x01", "description" : "Minor number" }, "major_number" : { @@ -195,16 +195,24 @@ "description": "0 => Driving MP-3, 1 => MP-3 output three-stated" } } + }, + "mon_pt_sel": { + "address": "5", + "width": "4", + "reset": "0x0", + "type": "w", + "description": "Monitoring Points Stretch-Pulse enable" + } }, "som_led": { "type": "w", - "address": "5", + "address": "6", "reset": "0x00", "width": "5", "description": "SOM LEDs value" }, "stm8_ift": { - "address": "6", + "address": "7", "width": "9", "description": "STM8 interface", "fields": { @@ -226,6 +234,13 @@ "description": "stm8_alert_tx" } } + }, + "mon_pt_pin_sel": { + "type": "w", + "address": "8", + "reset": "0x0", + "width": "1", + "description": "Rewire Monitoring Points pins to SOM header J5 (Debug)" } - } + } }] \ No newline at end of file diff --git a/generic_ip/som_ctrl/1/src/som_ctrl_1.vhd b/generic_ip/som_ctrl/1/src/som_ctrl_1.vhd index 8fc2107..a1f9e96 100644 --- a/generic_ip/som_ctrl/1/src/som_ctrl_1.vhd +++ b/generic_ip/som_ctrl/1/src/som_ctrl_1.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2018-05-15 --- Last update: 2018-12-20 +-- Last update: 2019-01-28 -- SVN ID : Git -- Standard : VHDL 2008 ------------------------------------------------------------------------------- @@ -35,6 +35,7 @@ entity som_ctrl_1 is avs_readdatavalid : out std_logic; avs_readdata : out std_logic_vector(31 downto 0); -- SOM Specific I/Fs: + som_mon_pt_pin_rewire : out std_logic; som_mon_pt_en : out std_logic_vector( 3 downto 0); -- SOM Timing Output enable som_mon_pt : out std_logic_vector( 3 downto 0); -- SOM Timing I/Os mon_pt_src : in std_logic_vector(31 downto 0); -- Source signals for the SOM monitoring points @@ -62,11 +63,12 @@ end entity som_ctrl_1; architecture rtl of som_ctrl_1 is constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF0F"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000100"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000101"; signal swim_write, swim_read, swim_read_d : std_logic; signal avs_read_d : std_logic; - signal avs_addr : std_logic_vector( 2 downto 0); + signal mon_pt_pin_rewire : std_logic; + signal avs_addr : std_logic_vector( 3 downto 0); signal swim_addr, mp_stretch_en : std_logic_vector( 3 downto 0); signal mon_pt_i, mon_pt_ii : std_logic_vector( 3 downto 0); signal mon_pt_sel_0, mon_pt_sel_1 : std_logic_vector( 7 downto 0); @@ -98,7 +100,8 @@ begin ----------------------------------------------------------------------------- -- MOnitoring Points ----------------------------------------------------------------------------- - + + som_mon_pt_pin_rewire <= mon_pt_pin_rewire; -- som_mon_pt_en(0) <= not mon_pt_sel_0(7); som_mon_pt_en(1) <= not mon_pt_sel_1(7); @@ -142,7 +145,7 @@ begin swim_write <= '1' when avs_write = '1' and avs_address(5) = '1' else '0'; swim_read <= '1' when avs_read = '1' and avs_address(5) = '1' else '0'; - avs_addr <= avs_address(2 downto 0); + avs_addr <= avs_address(3 downto 0); pCTRL_STATUS : process(reset_n, clk) begin @@ -164,6 +167,9 @@ begin mon_pt_sel_2 <= (7 => '1', others => '0'); mon_pt_sel_3 <= (7 => '1', others => '0'); mp_stretch_en <= (others => '0'); + -- + mon_pt_pin_rewire <= '0'; + -- som_led <= (others => '0'); elsif(clk = '1' and clk'event) then @@ -189,6 +195,8 @@ begin som_led <= avs_writedata( 4 downto 0); when CSR_STM8_ADDR => stm8_trigger_rx <= avs_writedata(0); + when CSR_MON_PT_PIN_SEL => + mon_pt_pin_rewire <= avs_writedata(0); when others => null; end case; end if; @@ -219,6 +227,8 @@ begin avs_readdata_i <= 27x"0" & som_led; when CSR_STM8_ADDR => avs_readdata_i <= (0 => stm8_trigger_rx, 8 => stm8_alert_tx, others => '0'); + when CSR_MON_PT_PIN_SEL => + avs_readdata_i <= (0 => mon_pt_pin_rewire, others => '0'); when others => avs_readdata <= X"BAD1BAD0"; end case; diff --git a/generic_ip/som_ctrl/1/src/som_ctrl_1_pkg.vhd b/generic_ip/som_ctrl/1/src/som_ctrl_1_pkg.vhd index 560755f..5991f89 100644 --- a/generic_ip/som_ctrl/1/src/som_ctrl_1_pkg.vhd +++ b/generic_ip/som_ctrl/1/src/som_ctrl_1_pkg.vhd @@ -6,7 +6,7 @@ -- Author : GMG -- Company : Global Inkjet Systems -- Created : 2018-05-21 --- Last update: 2018-12-20 +-- Last update: 2019-01-25 -- SVN ID : Git -- Standard : VHDL'2008 ------------------------------------------------------------------------------- @@ -20,14 +20,15 @@ use ieee.numeric_std.all; package som_ctrl_1_pkg is - constant CSR_IP_ID_ADDR : std_logic_vector(2 downto 0) := 3x"0"; - constant CSR_IP_VER_ADDR : std_logic_vector(2 downto 0) := 3x"1"; - constant CSR_PWR_GOOD_ADDR : std_logic_vector(2 downto 0) := 3x"2"; - constant CSR_HOST_PWR_ADDR : std_logic_vector(2 downto 0) := 3x"3"; - constant CSR_MON_PT_SEL_ADDR : std_logic_vector(2 downto 0) := 3x"4"; - constant CSR_MON_PT_STRETCH_ADDR : std_logic_vector(2 downto 0) := 3x"5"; - constant CSR_SOM_LED_ADDR : std_logic_vector(2 downto 0) := 3x"6"; - constant CSR_STM8_ADDR : std_logic_vector(2 downto 0) := 3x"7"; + constant CSR_IP_ID_ADDR : std_logic_vector(3 downto 0) := 4x"0"; + constant CSR_IP_VER_ADDR : std_logic_vector(3 downto 0) := 4x"1"; + constant CSR_PWR_GOOD_ADDR : std_logic_vector(3 downto 0) := 4x"2"; + constant CSR_HOST_PWR_ADDR : std_logic_vector(3 downto 0) := 4x"3"; + constant CSR_MON_PT_SEL_ADDR : std_logic_vector(3 downto 0) := 4x"4"; + constant CSR_MON_PT_STRETCH_ADDR : std_logic_vector(3 downto 0) := 4x"5"; + constant CSR_SOM_LED_ADDR : std_logic_vector(3 downto 0) := 4x"6"; + constant CSR_STM8_ADDR : std_logic_vector(3 downto 0) := 4x"7"; + constant CSR_MON_PT_PIN_SEL : std_logic_vector(3 downto 0) := 4x"8"; -- offset for the SWIM interface subblock constant CSR_SWIM_IF_OFFSET : std_logic_vector(5 downto 0) := 6x"20";