Skip to content

S
SPEC7
Commit d1aaf89a authored by Peter Jansweijer's avatar Peter Jansweijer
Browse files
Options

add generic g_dac_bits (default 16)

parent 0f14c67b
Pipeline #3607 failed with stage
    in 2 minutes and 7 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 12 additions and 10 deletions
    hdl/board/wr_spec7_pkg.vhd
    View file @ d1aaf89a
    ...@@ -134,7 +134,7 @@ package wr_spec7_pkg is ...@@ -134,7 +134,7 @@ package wr_spec7_pkg is
    wrs_rx_cfg_i : in t_rx_streamer_cfg := c_rx_streamer_cfg_default; wrs_rx_cfg_i : in t_rx_streamer_cfg := c_rx_streamer_cfg_default;
    aux_diag_i : in t_generic_word_array(g_diag_ro_size-1 downto 0) := (others => (others => '0')); aux_diag_i : in t_generic_word_array(g_diag_ro_size-1 downto 0) := (others => (others => '0'));
    aux_diag_o : out t_generic_word_array(g_diag_rw_size-1 downto 0); aux_diag_o : out t_generic_word_array(g_diag_rw_size-1 downto 0);
    tm_dac_value_o : out std_logic_vector(23 downto 0); tm_dac_value_o : out std_logic_vector(31 downto 0);
    tm_dac_wr_o : out std_logic_vector(g_aux_clks-1 downto 0); tm_dac_wr_o : out std_logic_vector(g_aux_clks-1 downto 0);
    tm_clk_aux_lock_en_i : in std_logic_vector(g_aux_clks-1 downto 0) := (others => '0'); tm_clk_aux_lock_en_i : in std_logic_vector(g_aux_clks-1 downto 0) := (others => '0');
    tm_clk_aux_locked_o : out std_logic_vector(g_aux_clks-1 downto 0); tm_clk_aux_locked_o : out std_logic_vector(g_aux_clks-1 downto 0);
    ......
    hdl/board/wrc_board_spec7.vhd
    View file @ d1aaf89a
    ...@@ -262,7 +262,7 @@ entity wrc_board_spec7 is ...@@ -262,7 +262,7 @@ entity wrc_board_spec7 is
    --------------------------------------------------------------------------- ---------------------------------------------------------------------------
    -- Aux clocks control -- Aux clocks control
    --------------------------------------------------------------------------- ---------------------------------------------------------------------------
    tm_dac_value_o : out std_logic_vector(23 downto 0); tm_dac_value_o : out std_logic_vector(31 downto 0);
    tm_dac_wr_o : out std_logic_vector(g_aux_clks-1 downto 0); tm_dac_wr_o : out std_logic_vector(g_aux_clks-1 downto 0);
    tm_clk_aux_lock_en_i : in std_logic_vector(g_aux_clks-1 downto 0) := (others => '0'); tm_clk_aux_lock_en_i : in std_logic_vector(g_aux_clks-1 downto 0) := (others => '0');
    tm_clk_aux_locked_o : out std_logic_vector(g_aux_clks-1 downto 0); tm_clk_aux_locked_o : out std_logic_vector(g_aux_clks-1 downto 0);
    ......
    hdl/board/xwrc_board_spec7.vhd
    View file @ d1aaf89a
    ...@@ -78,7 +78,7 @@ entity xwrc_board_spec7 is ...@@ -78,7 +78,7 @@ entity xwrc_board_spec7 is
    g_diag_ro_size : integer := 0; g_diag_ro_size : integer := 0;
    g_diag_rw_size : integer := 0; g_diag_rw_size : integer := 0;
    g_dac_bits : integer := 16; g_dac_bits : integer := 16;
    g_refclk_tune_pos_slope : boolean := TRUE; g_refclk_tune_pos_slope : boolean := TRUE
    ); );
    port ( port (
    --------------------------------------------------------------------------- ---------------------------------------------------------------------------
    ...@@ -228,7 +228,7 @@ entity xwrc_board_spec7 is ...@@ -228,7 +228,7 @@ entity xwrc_board_spec7 is
    --------------------------------------------------------------------------- ---------------------------------------------------------------------------
    -- Aux clocks control -- Aux clocks control
    --------------------------------------------------------------------------- ---------------------------------------------------------------------------
    tm_dac_value_o : out std_logic_vector(23 downto 0); tm_dac_value_o : out std_logic_vector(31 downto 0);
    tm_dac_wr_o : out std_logic_vector(g_aux_clks-1 downto 0); tm_dac_wr_o : out std_logic_vector(g_aux_clks-1 downto 0);
    tm_clk_aux_lock_en_i : in std_logic_vector(g_aux_clks-1 downto 0) := (others => '0'); tm_clk_aux_lock_en_i : in std_logic_vector(g_aux_clks-1 downto 0) := (others => '0');
    tm_clk_aux_locked_o : out std_logic_vector(g_aux_clks-1 downto 0); tm_clk_aux_locked_o : out std_logic_vector(g_aux_clks-1 downto 0);
    ...@@ -309,9 +309,9 @@ architecture struct of xwrc_board_spec7 is ...@@ -309,9 +309,9 @@ architecture struct of xwrc_board_spec7 is
    -- PLL DACs -- PLL DACs
    signal dac_dmtd_load : std_logic; signal dac_dmtd_load : std_logic;
    signal dac_dmtd_data : std_logic_vector(15 downto 0); signal dac_dmtd_data : std_logic_vector(g_dac_bits-1 downto 0);
    signal dac_refclk_load : std_logic; signal dac_refclk_load : std_logic;
    signal dac_refclk_data : std_logic_vector(15 downto 0); signal dac_refclk_data : std_logic_vector(g_dac_bits-1 downto 0);
    signal sit5359_scl_pad_oen, sit5359_sda_pad_oen : std_logic; signal sit5359_scl_pad_oen, sit5359_sda_pad_oen : std_logic;
    signal sit5359_scl_pad_in, sit5359_sda_pad_in : std_logic; signal sit5359_scl_pad_in, sit5359_sda_pad_in : std_logic;
    ...@@ -613,7 +613,7 @@ begin -- architecture struct ...@@ -613,7 +613,7 @@ begin -- architecture struct
    port map ( port map (
    clk_i => clk_sys_62m5, clk_i => clk_sys_62m5,
    rst_n_i => rst_62m5_n, rst_n_i => rst_62m5_n,
    value_i => dac_dmtd_data, value_i => dac_dmtd_data(g_dac_bits-1 downto g_dac_bits-16),
    cs_sel_i => "1", cs_sel_i => "1",
    load_i => dac_dmtd_load, load_i => dac_dmtd_load,
    sclk_divsel_i => "001", sclk_divsel_i => "001",
    ...@@ -635,7 +635,8 @@ begin -- architecture struct ...@@ -635,7 +635,8 @@ begin -- architecture struct
    cmp_sit5359_wr_interface: entity work.xwr_sit5359_interface cmp_sit5359_wr_interface: entity work.xwr_sit5359_interface
    generic map ( generic map (
    g_simulation => g_simulation) g_simulation => g_simulation,
    g_dac_bits => g_dac_bits)
    port map ( port map (
    clk_sys_i => clk_sys_62m5, clk_sys_i => clk_sys_62m5,
    rst_n_i => rst_62m5_n, rst_n_i => rst_62m5_n,
    ...@@ -663,7 +664,7 @@ begin -- architecture struct ...@@ -663,7 +664,7 @@ begin -- architecture struct
    port map ( port map (
    clk_i => clk_sys_62m5, clk_i => clk_sys_62m5,
    rst_n_i => rst_62m5_n, rst_n_i => rst_62m5_n,
    value_i => dac_refclk_data_slp, value_i => dac_refclk_data_slp(g_dac_bits-1 downto g_dac_bits-16),
    cs_sel_i => "1", cs_sel_i => "1",
    load_i => dac_refclk_load, load_i => dac_refclk_load,
    sclk_divsel_i => "001", sclk_divsel_i => "001",
    ...@@ -699,6 +700,7 @@ begin -- architecture struct ...@@ -699,6 +700,7 @@ begin -- architecture struct
    g_diag_ver => g_diag_ver, g_diag_ver => g_diag_ver,
    g_diag_ro_size => g_diag_ro_size, g_diag_ro_size => g_diag_ro_size,
    g_diag_rw_size => g_diag_rw_size, g_diag_rw_size => g_diag_rw_size,
    g_dac_bits => g_dac_bits,
    g_streamers_op_mode => g_streamers_op_mode, g_streamers_op_mode => g_streamers_op_mode,
    g_tx_streamer_params => g_tx_streamer_params, g_tx_streamer_params => g_tx_streamer_params,
    g_rx_streamer_params => g_rx_streamer_params, g_rx_streamer_params => g_rx_streamer_params,
    ......
    wr-cores @ 8f838645
    Subproject commit e621505c33305c2a128de6f2a46e3aa72833c3c3 Subproject commit 8f83864567d594743b213e9548679aa1939ca842
    Markdown is supported
    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