From 5162bed2004bf4372071e28cdc7ef41680431e87 Mon Sep 17 00:00:00 2001
From: Peter Lemmens
Date: Tue, 13 Jan 2015 10:50:07 +0100
Subject: [PATCH] Bug Fix in soda_client SCI. Error in sci_sel/address
decoding. How did this ever work?
---
code/Cu_trb3_periph_sodaclient.vhd | 700 ---------------------------
code/ip/serdes_4_sync_downstream.txt | 163 +++++++
code/ip/serdes_sync_upstream.txt | 58 +++
code/ip/sfp_1_125_int.txt | 58 +++
code/ip/sfp_1_200_int.txt | 93 ++++
code/ip/sfp_2_200_int.txt | 93 ++++
code/med_ecp3_sfp_sync_up.vhd | 2 +-
sfp_1_200_int.txt | 1 -
soda_4source_EP.ldf | 338 -------------
trb3_soda_hub.xcf | 4 +-
10 files changed, 468 insertions(+), 1042 deletions(-)
delete mode 100644 code/Cu_trb3_periph_sodaclient.vhd
create mode 100644 code/ip/serdes_4_sync_downstream.txt
create mode 100644 code/ip/serdes_sync_upstream.txt
create mode 100644 code/ip/sfp_1_125_int.txt
create mode 100644 code/ip/sfp_1_200_int.txt
create mode 100644 code/ip/sfp_2_200_int.txt
delete mode 120000 sfp_1_200_int.txt
delete mode 100644 soda_4source_EP.ldf
diff --git a/code/Cu_trb3_periph_sodaclient.vhd b/code/Cu_trb3_periph_sodaclient.vhd
deleted file mode 100644
index de3682d..0000000
--- a/code/Cu_trb3_periph_sodaclient.vhd
+++ /dev/null
@@ -1,700 +0,0 @@
----------------
--- TOP LEVEL --
----------------
-
-library ieee;
-use ieee.std_logic_1164.all;
-use ieee.numeric_std.all;
-
-library work;
-use work.trb_net_std.all;
-use work.trb_net_components.all;
-use work.trb_net16_hub_func.all;
-use work.trb3_components.all;
-use work.soda_components.all;
-use work.med_sync_define.all;
-use work.version.all;
-
-entity Cu_trb3_periph_sodaclient is
- generic(
- SYNC_MODE : integer range 0 to 1 := c_NO; --use the RX clock for internal logic and transmission. Should be NO for soda tests!
- USE_125_MHZ : integer := c_NO;
- CLOCK_FREQUENCY : integer := 100;
- NUM_INTERFACES : integer := 1
- );
- port(
- --Clocks
- CLK_GPLL_LEFT : in std_logic; --Clock Manager 1/(2468), 125 MHz
- CLK_GPLL_RIGHT : in std_logic; --Clock Manager 2/(2468), 200 MHz <-- MAIN CLOCK for FPGA
- CLK_PCLK_LEFT : in std_logic; --Clock Fan-out, 200/400 MHz <-- For TDC. Same oscillator as GPLL right!
- CLK_PCLK_RIGHT : in std_logic; --Clock Fan-out, 200/400 MHz <-- For TDC. Same oscillator as GPLL right!
-
- --Trigger
- --TRIGGER_LEFT : in std_logic; --left side trigger input from fan-out
- --TRIGGER_RIGHT : in std_logic; --right side trigger input from fan-out
- --Serdes Clocks - do not use
- --CLK_SERDES_INT_LEFT : in std_logic; --Clock Manager 1/(1357), off, 125 MHz possible
- --CLK_SERDES_INT_RIGHT : in std_logic; --Clock Manager 2/(1357), 200 MHz, only in case of problems
-
- --serdes I/O - connect as you like, no real use
- SERDES_ADDON_TX : out std_logic_vector(15 downto 0);
- SERDES_ADDON_RX : in std_logic_vector(15 downto 0);
-
- --Inter-FPGA Communication
- FPGA5_COMM : inout std_logic_vector(11 downto 0);
- --Bit 0/1 input, serial link RX active
- --Bit 2/3 output, serial link TX active
- --others yet undefined
- --Connection to AddOn
- LED_LINKOK : out std_logic_vector(6 downto 1);
- LED_RX : out std_logic_vector(6 downto 1);
- LED_TX : out std_logic_vector(6 downto 1);
- SFP_MOD0 : in std_logic_vector(6 downto 1);
- SFP_TXDIS : out std_logic_vector(6 downto 1);
- SFP_LOS : in std_logic_vector(6 downto 1);
- --SFP_MOD1 : inout std_logic_vector(6 downto 1);
- --SFP_MOD2 : inout std_logic_vector(6 downto 1);
- --SFP_RATESEL : out std_logic_vector(6 downto 1);
- --SFP_TXFAULT : in std_logic_vector(6 downto 1);
-
- --Flash ROM & Reboot
- FLASH_CLK : out std_logic;
- FLASH_CS : out std_logic;
- FLASH_DIN : out std_logic;
- FLASH_DOUT : in std_logic;
- PROGRAMN : out std_logic; --reboot FPGA
-
- --Misc
- TEMPSENS : inout std_logic; --Temperature Sensor
- CODE_LINE : in std_logic_vector(1 downto 0);
- LED_GREEN : out std_logic;
- LED_ORANGE : out std_logic;
- LED_RED : out std_logic;
- LED_YELLOW : out std_logic;
- SUPPL : in std_logic; --terminated diff pair, PCLK, Pads
-
- --Test Connectors
- TEST_LINE : out std_logic_vector(15 downto 0)
- );
-
-
- attribute syn_useioff : boolean;
- --no IO-FF for LEDs relaxes timing constraints
- attribute syn_useioff of LED_GREEN : signal is false;
- attribute syn_useioff of LED_ORANGE : signal is false;
- attribute syn_useioff of LED_RED : signal is false;
- attribute syn_useioff of LED_YELLOW : signal is false;
- attribute syn_useioff of TEMPSENS : signal is false;
- attribute syn_useioff of PROGRAMN : signal is false;
- attribute syn_useioff of CODE_LINE : signal is false;
- attribute syn_useioff of LED_LINKOK : signal is false;
- attribute syn_useioff of LED_TX : signal is false;
- attribute syn_useioff of LED_RX : signal is false;
- attribute syn_useioff of SFP_MOD0 : signal is false;
- attribute syn_useioff of SFP_TXDIS : signal is false;
- attribute syn_useioff of SFP_LOS : signal is false;
- attribute syn_useioff of TEST_LINE : signal is false;
-
- --important signals _with_ IO-FF
- attribute syn_useioff of FLASH_CLK : signal is true;
- attribute syn_useioff of FLASH_CS : signal is true;
- attribute syn_useioff of FLASH_DIN : signal is true;
- attribute syn_useioff of FLASH_DOUT : signal is true;
- attribute syn_useioff of FPGA5_COMM : signal is true;
-
-
-end entity;
-
-architecture Cu_trb3_periph_sodaclient_arch of Cu_trb3_periph_sodaclient is
- --Constants
- constant REGIO_NUM_STAT_REGS : integer := 0;
- constant REGIO_NUM_CTRL_REGS : integer := 2;
-
-
- constant USE_200_MHZ : integer := 1 - USE_125_MHZ; -- if USE_125_MHZ=c_NO then USE_200_MHZ=c_YES and ViceVersa
-
- --Clock / Reset
- signal pll_lock : std_logic; --Internal PLL locked. E.g. used to reset all internal logic.
- signal clear_i : std_logic;
- signal reset_i : std_logic;
- signal GSR_N : std_logic;
-
- signal clk_100_osc : std_logic;
- signal clk_200_osc : std_logic;
- signal rx_full_clk : std_logic;
- signal rx_half_clk : std_logic;
- signal tx_full_clk : std_logic;
- signal tx_half_clk : std_logic;
--- signal clk_tdc : std_logic;
- signal time_counter, time_counter2 : unsigned(31 downto 0);
- --Media Interface
- signal med_stat_op : std_logic_vector (NUM_INTERFACES*16-1 downto 0);
- signal med_ctrl_op : std_logic_vector (NUM_INTERFACES*16-1 downto 0);
- signal med_stat_debug : std_logic_vector (NUM_INTERFACES*64-1 downto 0);
- signal med_ctrl_debug : std_logic_vector (NUM_INTERFACES*64-1 downto 0);
- signal med_data_out : std_logic_vector (NUM_INTERFACES*16-1 downto 0);
- signal med_packet_num_out : std_logic_vector (NUM_INTERFACES* 3-1 downto 0);
- signal med_dataready_out : std_logic_vector (NUM_INTERFACES* 1-1 downto 0);
- signal med_read_out : std_logic_vector (NUM_INTERFACES* 1-1 downto 0);
- signal med_data_in : std_logic_vector (NUM_INTERFACES*16-1 downto 0);
- signal med_packet_num_in : std_logic_vector (NUM_INTERFACES* 3-1 downto 0);
- signal med_dataready_in : std_logic_vector (NUM_INTERFACES* 1-1 downto 0);
- signal med_read_in : std_logic_vector (NUM_INTERFACES* 1-1 downto 0);
-
- --Slow Control channel
- signal common_stat_reg : std_logic_vector(std_COMSTATREG*32-1 downto 0);
- signal common_ctrl_reg : std_logic_vector(std_COMCTRLREG*32-1 downto 0);
- signal stat_reg : std_logic_vector(32*2**REGIO_NUM_STAT_REGS-1 downto 0);
- signal ctrl_reg : std_logic_vector(32*2**REGIO_NUM_CTRL_REGS-1 downto 0);
- signal common_stat_reg_strobe : std_logic_vector(std_COMSTATREG-1 downto 0);
- signal common_ctrl_reg_strobe : std_logic_vector(std_COMCTRLREG-1 downto 0);
- signal stat_reg_strobe : std_logic_vector(2**REGIO_NUM_STAT_REGS-1 downto 0);
- signal ctrl_reg_strobe : std_logic_vector(2**REGIO_NUM_CTRL_REGS-1 downto 0);
-
- --RegIO
- signal my_address : std_logic_vector (15 downto 0);
- signal regio_addr_out : std_logic_vector (15 downto 0);
- signal regio_read_enable_out : std_logic;
- signal regio_write_enable_out : std_logic;
- signal regio_data_out : std_logic_vector (31 downto 0);
- signal regio_data_in : std_logic_vector (31 downto 0);
- signal regio_dataready_in : std_logic;
- signal regio_no_more_data_in : std_logic;
- signal regio_write_ack_in : std_logic;
- signal regio_unknown_addr_in : std_logic;
- signal regio_timeout_out : std_logic;
-
- --Timer
- signal global_time : std_logic_vector(31 downto 0);
- signal local_time : std_logic_vector(7 downto 0);
- signal time_since_last_trg : std_logic_vector(31 downto 0);
- signal timer_ticks : std_logic_vector(1 downto 0);
-
- --Flash
- signal spimem_read_en : std_logic;
- signal spimem_write_en : std_logic;
- signal spimem_data_in : std_logic_vector(31 downto 0);
- signal spimem_addr : std_logic_vector(8 downto 0);
- signal spimem_data_out : std_logic_vector(31 downto 0);
- signal spimem_dataready_out : std_logic;
- signal spimem_no_more_data_out : std_logic;
- signal spimem_unknown_addr_out : std_logic;
- signal spimem_write_ack_out : std_logic;
-
- --Cu media interface
- signal sci1_ack : std_logic;
- signal sci1_write : std_logic;
- signal sci1_read : std_logic;
- signal sci1_data_in : std_logic_vector(7 downto 0);
- signal sci1_data_out : std_logic_vector(7 downto 0);
- signal sci1_addr : std_logic_vector(8 downto 0);
- signal sci1_nack : std_logic;
- signal sfp_txdis_S : std_logic_vector(6 downto 1) := (others => '1');
-
--- SiO media interface
--- signal sci2_ack : std_logic;
--- signal sci2_write : std_logic;
--- signal sci2_read : std_logic;
--- signal sci2_data_in : std_logic_vector(7 downto 0);
--- signal sci2_data_out : std_logic_vector(7 downto 0);
--- signal sci2_addr : std_logic_vector(8 downto 0);
--- signal sci2_nack : std_logic;
-
- --SODA
- signal tx_dlm_i : std_logic;
- signal rx_dlm_i : std_logic;
- signal tx_dlm_word : std_logic_vector(7 downto 0);
- signal rx_dlm_word : std_logic_vector(7 downto 0);
- signal make_reset : std_logic;
- signal tx_dlm_preview_S : std_logic; --PL!
- signal link_phase_S : std_logic; --PL!
- signal rx_cdr_lol_S : std_logic;
- signal link_locked_S : std_logic; --PL!
-
- -- SODA slow controll
- signal soda_ack : std_logic;
--- signal soda_nack : std_logic;
- signal soda_write : std_logic;
- signal soda_read : std_logic;
- signal soda_data_in : std_logic_vector(31 downto 0);
- signal soda_data_out : std_logic_vector(31 downto 0);
- signal soda_addr : std_logic_vector(3 downto 0);
- signal soda_leds : std_logic_vector(3 downto 0);
-
- signal link_debug_in_S : std_logic_vector(31 downto 0);
- signal general_reset_i : std_logic := '1';
-
- signal soda_counter_i : unsigned(3 downto 0);
- attribute syn_keep of soda_counter_i : signal is true;
-
- -- fix signal names for constraining
- attribute syn_keep of GSR_N : signal is true;
- attribute syn_preserve of GSR_N : signal is true;
- attribute syn_preserve of rx_full_clk : signal is true;
- attribute syn_keep of rx_full_clk : signal is true;
- attribute syn_preserve of rx_half_clk : signal is true;
- attribute syn_keep of rx_half_clk : signal is true;
- attribute syn_preserve of tx_full_clk : signal is true;
- attribute syn_keep of tx_full_clk : signal is true;
- attribute syn_preserve of tx_half_clk : signal is true;
- attribute syn_keep of tx_half_clk : signal is true;
- attribute syn_preserve of clk_100_osc : signal is true;
- attribute syn_keep of clk_100_osc : signal is true;
- attribute syn_preserve of clk_200_osc : signal is true;
- attribute syn_keep of clk_200_osc : signal is true;
- attribute syn_preserve of tx_dlm_i : signal is true;
- attribute syn_keep of tx_dlm_i : signal is true;
- attribute syn_preserve of rx_dlm_i : signal is true;
- attribute syn_keep of rx_dlm_i : signal is true;
-
-
-begin
----------------------------------------------------------------------------
--- Reset Generation
----------------------------------------------------------------------------
-
-
- LED_RX <= (others => '0'); -- otherwise it is floating
- LED_TX <= (others => '0'); -- otherwise it is floating
- LED_LINKOK <= (others => '0'); -- otherwise it is floating
-
- GSR_N <= pll_lock;
-
- THE_RESET_HANDLER : trb_net_reset_handler
- generic map(
- RESET_DELAY => x"FEEE"
- )
- port map(
- CLEAR_IN => '0', -- reset input (high active, async)
- CLEAR_N_IN => '1', -- reset input (low active, async)
- CLK_IN => clk_200_osc, --clk_raw_internal, -- raw master clock, NOT from PLL/DLL!
- SYSCLK_IN => clk_100_osc, --rx_half_clk, PL 111114, -- PLL/DLL remastered clock
- PLL_LOCKED_IN => pll_lock, -- master PLL lock signal (async)
- RESET_IN => '0', --general_reset_i, -- '0', -- general reset signal (SYSCLK) --peter schakel
- TRB_RESET_IN => med_stat_op(13), -- TRBnet reset signal (SYSCLK)
- CLEAR_OUT => clear_i, -- async reset out, USE WITH CARE!
- RESET_OUT => reset_i, -- synchronous reset out (SYSCLK)
- DEBUG_OUT => open
- );
-
----------------------------------------------------------------------------
--- Clock Handling
----------------------------------------------------------------------------
---gen_200_PLL : if USE_125_MHZ = c_NO generate
- THE_MAIN_PLL : pll_in200_out100
- port map(
- CLK => CLK_GPLL_RIGHT,
- CLKOP => clk_100_osc,
- CLKOK => clk_200_osc,
- LOCK => pll_lock
- );
---end generate;
-
---gen_125 : if USE_125_MHZ = c_YES generate
--- clk_100_osc <= CLK_GPLL_LEFT;
--- clk_200_osc <= CLK_GPLL_LEFT;
---end generate;
-
-
----------------------------------------------------------------------------
--- The TrbNet media interface (to other FPGA)
----------------------------------------------------------------------------
- THE_MEDIA_UPLINK : trb_net16_med_ecp3_sfp
- generic map(
- SERDES_NUM => 1, --number of serdes in quad
- EXT_CLOCK => c_NO, --use internal clock
- USE_200_MHZ => USE_200_MHZ, --run on 200 MHz clock
- USE_125_MHZ => USE_125_MHZ,
- USE_CTC => c_NO,
- USE_SLAVE => SYNC_MODE
- )
- port map(
- CLK => clk_200_osc,
- SYSCLK => clk_100_osc,
- RESET => reset_i,
- CLEAR => clear_i,
- CLK_EN => '1',
- --Internal Connection
- MED_DATA_IN => med_data_out(15 downto 0),
- MED_PACKET_NUM_IN => med_packet_num_out(2 downto 0),
- MED_DATAREADY_IN => med_dataready_out(0),
- MED_READ_OUT => med_read_in(0),
- MED_DATA_OUT => med_data_in(15 downto 0),
- MED_PACKET_NUM_OUT => med_packet_num_in(2 downto 0),
- MED_DATAREADY_OUT => med_dataready_in(0),
- MED_READ_IN => med_read_out(0),
- REFCLK2CORE_OUT => open,
- CLK_RX_HALF_OUT => open,
- CLK_RX_FULL_OUT => open,
-
- --SFP Connection
- SD_RXD_P_IN => SERDES_ADDON_RX(4),
- SD_RXD_N_IN => SERDES_ADDON_RX(5),
- SD_TXD_P_OUT => SERDES_ADDON_TX(4),
- SD_TXD_N_OUT => SERDES_ADDON_TX(5),
- SD_REFCLK_P_IN => '0',
- SD_REFCLK_N_IN => '0',
- SD_PRSNT_N_IN => FPGA5_COMM(0),
- SD_LOS_IN => FPGA5_COMM(0),
- SD_TXDIS_OUT => FPGA5_COMM(2),
-
- SCI_DATA_IN => sci1_data_in,
- SCI_DATA_OUT => sci1_data_out,
- SCI_ADDR => sci1_addr,
- SCI_READ => sci1_read,
- SCI_WRITE => sci1_write,
- SCI_ACK => sci1_ack,
- -- Status and control port
- STAT_OP => med_stat_op(15 downto 0),
- CTRL_OP => med_ctrl_op(15 downto 0),
- STAT_DEBUG => med_stat_debug(63 downto 0),
- CTRL_DEBUG => (others => '0')
- );
-
-
----------------------------------------------------------------------------
--- Endpoint
----------------------------------------------------------------------------
- THE_ENDPOINT : trb_net16_endpoint_hades_full_handler
- generic map(
--- USE_CHANNEL => (c_YES,c_YES,c_NO,c_YES),
- REGIO_NUM_STAT_REGS => REGIO_NUM_STAT_REGS, --4, --16 stat reg
- REGIO_NUM_CTRL_REGS => REGIO_NUM_CTRL_REGS, --3, --8 cotrol reg
- ADDRESS_MASK => x"FFFF",
- BROADCAST_BITMASK => x"FF",
- BROADCAST_SPECIAL_ADDR => x"45",
- REGIO_COMPILE_TIME => std_logic_vector(to_unsigned(VERSION_NUMBER_TIME, 32)),
- REGIO_HARDWARE_VERSION => x"9100b000",
- REGIO_INIT_ADDRESS => x"f35a",
- REGIO_USE_VAR_ENDPOINT_ID => c_YES,
- CLOCK_FREQUENCY => CLOCK_FREQUENCY,
- TIMING_TRIGGER_RAW => c_YES,
- --Configure data handler
- DATA_INTERFACE_NUMBER => 1,
- DATA_BUFFER_DEPTH => 9, --13
- DATA_BUFFER_WIDTH => 32,
- DATA_BUFFER_FULL_THRESH => 256,
- TRG_RELEASE_AFTER_DATA => c_YES,
- HEADER_BUFFER_DEPTH => 9,
- HEADER_BUFFER_FULL_THRESH => 256
- )
- port map(
- CLK => clk_100_osc, --rx_half_clk, PL 111114
- RESET => reset_i,
- CLK_EN => '1',
- MED_DATAREADY_OUT => med_dataready_out(0),
- MED_DATA_OUT => med_data_out,
- MED_PACKET_NUM_OUT => med_packet_num_out,
- MED_READ_IN => med_read_in(0),
- MED_DATAREADY_IN => med_dataready_in(0),
- MED_DATA_IN => med_data_in,
- MED_PACKET_NUM_IN => med_packet_num_in,
- MED_READ_OUT => med_read_out(0),
- MED_STAT_OP_IN => med_stat_op,
- MED_CTRL_OP_OUT => med_ctrl_op,
-
- --Timing trigger in
- TRG_TIMING_TRG_RECEIVED_IN => '0',
- --LVL1 trigger to FEE
- LVL1_TRG_DATA_VALID_OUT => open,
- LVL1_VALID_TIMING_TRG_OUT => open,
- LVL1_VALID_NOTIMING_TRG_OUT => open,
- LVL1_INVALID_TRG_OUT => open,
-
- LVL1_TRG_TYPE_OUT => open,
- LVL1_TRG_NUMBER_OUT => open,
- LVL1_TRG_CODE_OUT => open,
- LVL1_TRG_INFORMATION_OUT => open,
- LVL1_INT_TRG_NUMBER_OUT => open,
-
- --Information about trigger handler errors
- TRG_MULTIPLE_TRG_OUT => open,
- TRG_TIMEOUT_DETECTED_OUT => open,
- TRG_SPURIOUS_TRG_OUT => open,
- TRG_MISSING_TMG_TRG_OUT => open,
- TRG_SPIKE_DETECTED_OUT => open,
-
- --Response from FEE
- FEE_TRG_RELEASE_IN(0) => '1',
- FEE_TRG_STATUSBITS_IN => (others => '0'),
- FEE_DATA_IN => (others => '0'),
- FEE_DATA_WRITE_IN(0) => '0',
- FEE_DATA_FINISHED_IN(0) => '1',
- FEE_DATA_ALMOST_FULL_OUT(0) => open,
-
- -- Slow Control Data Port
- REGIO_COMMON_STAT_REG_IN => (others => '0'), --common_stat_reg, --0x00 because it is floating
- REGIO_COMMON_CTRL_REG_OUT => common_ctrl_reg, --0x20
- REGIO_COMMON_STAT_STROBE_OUT => common_stat_reg_strobe,
- REGIO_COMMON_CTRL_STROBE_OUT => common_ctrl_reg_strobe,
- REGIO_STAT_REG_IN => stat_reg, --start 0x80
- REGIO_CTRL_REG_OUT => ctrl_reg, --start 0xc0
- REGIO_STAT_STROBE_OUT => stat_reg_strobe,
- REGIO_CTRL_STROBE_OUT => ctrl_reg_strobe,
- REGIO_VAR_ENDPOINT_ID(1 downto 0) => CODE_LINE,
- REGIO_VAR_ENDPOINT_ID(15 downto 2) => (others => '0'),
-
- BUS_ADDR_OUT => regio_addr_out,
- BUS_READ_ENABLE_OUT => regio_read_enable_out,
- BUS_WRITE_ENABLE_OUT => regio_write_enable_out,
- BUS_DATA_OUT => regio_data_out,
- BUS_DATA_IN => regio_data_in,
- BUS_DATAREADY_IN => regio_dataready_in,
- BUS_NO_MORE_DATA_IN => regio_no_more_data_in,
- BUS_WRITE_ACK_IN => regio_write_ack_in,
- BUS_UNKNOWN_ADDR_IN => regio_unknown_addr_in,
- BUS_TIMEOUT_OUT => regio_timeout_out,
- ONEWIRE_INOUT => TEMPSENS,
- ONEWIRE_MONITOR_OUT => open,
-
- TIME_GLOBAL_OUT => global_time,
- TIME_LOCAL_OUT => local_time,
- TIME_SINCE_LAST_TRG_OUT => time_since_last_trg,
- TIME_TICKS_OUT => timer_ticks,
-
- STAT_DEBUG_IPU => open,
- STAT_DEBUG_1 => open,
- STAT_DEBUG_2 => open,
- STAT_DEBUG_DATA_HANDLER_OUT => open,
- STAT_DEBUG_IPU_HANDLER_OUT => open,
- STAT_TRIGGER_OUT => open,
- CTRL_MPLEX => (others => '0'),
- IOBUF_CTRL_GEN => (others => '0'),
- STAT_ONEWIRE => open,
- STAT_ADDR_DEBUG => open,
- DEBUG_LVL1_HANDLER_OUT => open
- );
-
----------------------------------------------------------------------------
--- Bus Handler
----------------------------------------------------------------------------
- THE_BUS_HANDLER : trb_net16_regio_bus_handler
- generic map(
- PORT_NUMBER => 3,
- PORT_ADDRESSES => (0 => x"d000", 1 => x"b000", 2 => x"be00", others => x"0000"),
- PORT_ADDR_MASK => (0 => 9, 1 => 9, 2 => 4, others => 0)
- )
- port map(
- CLK => clk_100_osc, --rx_half_clk, PL 111114
- RESET => reset_i,
-
- DAT_ADDR_IN => regio_addr_out,
- DAT_DATA_IN => regio_data_out,
- DAT_DATA_OUT => regio_data_in,
- DAT_READ_ENABLE_IN => regio_read_enable_out,
- DAT_WRITE_ENABLE_IN => regio_write_enable_out,
- DAT_TIMEOUT_IN => regio_timeout_out,
- DAT_DATAREADY_OUT => regio_dataready_in,
- DAT_WRITE_ACK_OUT => regio_write_ack_in,
- DAT_NO_MORE_DATA_OUT => regio_no_more_data_in,
- DAT_UNKNOWN_ADDR_OUT => regio_unknown_addr_in,
-
- BUS_READ_ENABLE_OUT(0) => spimem_read_en,
- BUS_READ_ENABLE_OUT(1) => sci1_read,
- BUS_READ_ENABLE_OUT(2) => soda_read,
-
- BUS_WRITE_ENABLE_OUT(0) => spimem_write_en,
- BUS_WRITE_ENABLE_OUT(1) => sci1_write,
- BUS_WRITE_ENABLE_OUT(2) => soda_write,
-
- BUS_DATA_OUT(0*32+31 downto 0*32) => spimem_data_in,
- BUS_DATA_OUT(1*32+7 downto 1*32) => sci1_data_in,
- BUS_DATA_OUT(1*32+31 downto 1*32+8) => open,
- BUS_DATA_OUT(2*32+31 downto 2*32) => soda_data_in,
-
- BUS_ADDR_OUT(0*16+8 downto 0*16) => spimem_addr,
- BUS_ADDR_OUT(0*16+15 downto 0*16+9) => open,
- BUS_ADDR_OUT(1*16+8 downto 1*16) => sci1_addr,
- BUS_ADDR_OUT(1*16+15 downto 1*16+9) => open,
- BUS_ADDR_OUT(2*16+3 downto 2*16) => soda_addr,
- BUS_ADDR_OUT(2*16+15 downto 2*16+4) => open,
-
- BUS_TIMEOUT_OUT(0) => open,
- BUS_TIMEOUT_OUT(1) => open,
- BUS_TIMEOUT_OUT(2) => open,
-
- BUS_DATA_IN(0*32+31 downto 0*32) => spimem_data_out,
- BUS_DATA_IN(1*32+7 downto 1*32) => sci1_data_out,
- BUS_DATA_IN(1*32+31 downto 1*32+8) => open,
- BUS_DATA_IN(2*32+31 downto 2*32) => soda_data_out,
-
- BUS_DATAREADY_IN(0) => spimem_dataready_out,
- BUS_DATAREADY_IN(1) => sci1_ack,
- BUS_DATAREADY_IN(2) => soda_ack,
-
- BUS_WRITE_ACK_IN(0) => spimem_write_ack_out,
- BUS_WRITE_ACK_IN(1) => sci1_ack,
- BUS_WRITE_ACK_IN(2) => soda_ack,
-
- BUS_NO_MORE_DATA_IN(0) => spimem_no_more_data_out,
- BUS_NO_MORE_DATA_IN(1) => '0',
- BUS_NO_MORE_DATA_IN(2) => '0',
-
- BUS_UNKNOWN_ADDR_IN(0) => spimem_unknown_addr_out,
- BUS_UNKNOWN_ADDR_IN(1) => '0',
- BUS_UNKNOWN_ADDR_IN(2) => '0',
-
- STAT_DEBUG => open
- );
-
----------------------------------------------------------------------------
--- SPI / Flash
----------------------------------------------------------------------------
-
-THE_SPI_RELOAD : spi_flash_and_fpga_reload --.flash_reboot_arch
- port map(
- CLK_IN => clk_100_osc, --rx_half_clk, PL 111114
- RESET_IN => reset_i,
-
- BUS_ADDR_IN => spimem_addr,
- BUS_READ_IN => spimem_read_en,
- BUS_WRITE_IN => spimem_write_en,
- BUS_DATAREADY_OUT => spimem_dataready_out,
- BUS_WRITE_ACK_OUT => spimem_write_ack_out,
- BUS_UNKNOWN_ADDR_OUT => spimem_unknown_addr_out,
- BUS_NO_MORE_DATA_OUT => spimem_no_more_data_out,
- BUS_DATA_IN => spimem_data_in,
- BUS_DATA_OUT => spimem_data_out,
-
- DO_REBOOT_IN => common_ctrl_reg(15),
- PROGRAMN => PROGRAMN,
-
- SPI_CS_OUT => FLASH_CS,
- SPI_SCK_OUT => FLASH_CLK,
- SPI_SDO_OUT => FLASH_DIN,
- SPI_SDI_IN => FLASH_DOUT
- );
-
-
----------------------------------------------------------------------------
--- The synchronous interface for Soda tests
----------------------------------------------------------------------------
-
-THE_SYNC_LINK : soda_only_ecp3_sfp_sync_up
- generic map(
- SERDES_NUM => 1, --number of serdes in quad
- IS_SYNC_SLAVE => c_YES
- )
- port map(
- OSCCLK => clk_200_osc, --clk_raw_internal,
- SYSCLK => clk_100_osc,
- RESET => reset_i,
- CLEAR => clear_i,
-
- RX_HALF_CLK_OUT => rx_half_clk, --soda_rx_clock_half,
- RX_FULL_CLK_OUT => rx_full_clk, --soda_rx_clock_full,
- TX_HALF_CLK_OUT => tx_half_clk,
- TX_FULL_CLK_OUT => tx_full_clk,
- RX_CDR_LOL_OUT => rx_cdr_lol_S,
-
- RX_DLM => rx_dlm_i,
- RX_DLM_WORD => rx_dlm_word,
- TX_DLM => tx_dlm_i,
- TX_DLM_WORD => tx_dlm_word,
- TX_DLM_PREVIEW_IN => tx_dlm_preview_S, --PL!
- LINK_PHASE_OUT => link_phase_S, --PL!
- --SFP Connection
- SD_RXD_P_IN => SERDES_ADDON_RX(0),
- SD_RXD_N_IN => SERDES_ADDON_RX(1),
- SD_TXD_P_OUT => SERDES_ADDON_TX(0),
- SD_TXD_N_OUT => SERDES_ADDON_TX(1),
- SD_REFCLK_P_IN => '0',
- SD_REFCLK_N_IN => '0',
- SD_PRSNT_N_IN => SFP_MOD0(3), --(1),
- SD_LOS_IN => SFP_LOS(3), --(1),
- SD_TXDIS_OUT => sfp_txdis_S(3), --(1), --SFP_TXDIS(1),
-
- SCI_DATA_IN => (others => '0'), --sci2_data_in,
- SCI_DATA_OUT => open, --sci2_data_out,
- SCI_ADDR => (others => '0'), --sci2_addr,
- SCI_READ => '0', --sci2_read,
- SCI_WRITE => '0', --sci2_write,
- SCI_ACK => open, --sci2_ack,
- SCI_NACK => open --sci2_nack
- );
-
-
--- SFP_TXDIS(1) <= sfp_txdis_S(1);
- SFP_TXDIS <= sfp_txdis_S;
-
----------------------------------------------------------------------------
--- The Soda Central
----------------------------------------------------------------------------
-
- A_SODA_CLIENT : soda_client
- port map(
- SYSCLK => rx_half_clk, --clk_100_osc,
- SODACLK => rx_full_clk,
- RESET => reset_i,
- CLEAR => clear_i,
- CLK_EN => '1',
- --Internal Connection
- RX_DLM_WORD_IN => rx_dlm_word,
- RX_DLM_IN => rx_dlm_i,
- TX_DLM_OUT => tx_dlm_i,
- TX_DLM_WORD_OUT => tx_dlm_word,
- TX_DLM_PREVIEW_OUT => tx_dlm_preview_S,
- LINK_PHASE_IN => link_phase_S,
- SODA_DATA_IN => soda_data_in,
- SODA_DATA_OUT => soda_data_out,
- SODA_ADDR_IN => soda_addr,
- SODA_READ_IN => soda_read,
- SODA_WRITE_IN => soda_write,
- SODA_ACK_OUT => soda_ack,
- LEDS_OUT => soda_leds,
- LINK_DEBUG_IN => link_debug_in_S
- );
-
-
----------------------------------------------------------------------------
--- LED
----------------------------------------------------------------------------
- LED_ORANGE <= SFP_LOS(3); --med_stat_op(8);
- LED_YELLOW <= sfp_txdis_S(3); --med_stat_op(10);
- LED_GREEN <= time_counter(25); --med_stat_op(12); --tx_pll_lol
- LED_RED <= med_stat_op(11); --rx_cdr_lol
--- LED_ORANGE <= not reset_i when rising_edge(clk_100_osc);
--- LED_YELLOW <= soda_leds(0); --'1';
--- LED_GREEN <= not med_stat_op(9);
--- LED_RED <= not (med_stat_op(10) or med_stat_op(11));
--- LED_ORANGE <= soda_leds(0);
--- LED_YELLOW <= soda_leds(1);
--- LED_GREEN <= soda_leds(2);
--- LED_RED <= soda_leds(3);
-
----------------------------------------------------------------------------
--- DEBUG
----------------------------------------------------------------------------
- link_debug_in_S(31 downto 16) <= med_stat_op(15 downto 0);
- link_debug_in_S(15 downto 0) <= (3 => pll_lock, others => '0');
----------------------------------------------------------------------------
--- Test Circuits
----------------------------------------------------------------------------
- clock_counter_proc : process(clk_100_osc)
- begin
- if rising_edge(clk_100_osc) then
- time_counter <= time_counter + 1;
- end if;
- end process;
-
- process(rx_full_clk) --soda_rx_clock_full) --clk_soda_i)
- begin
- if rising_edge(rx_full_clk) then
- soda_counter_i <= soda_counter_i+1;
- end if;
- end process;
-
- TEST_LINE(0) <= time_counter(1);
- TEST_LINE(1) <= '0';
- TEST_LINE(2) <= '0';
- TEST_LINE(3) <= soda_counter_i(2);
- TEST_LINE(4) <= '0';
- TEST_LINE(5) <= '0';
- TEST_LINE(6) <= rx_half_clk;
- TEST_LINE(7) <= '0';
- TEST_LINE(8) <= '0';
-
- TEST_LINE(15 downto 9) <= (others => '0'); -- otherwise it is floating
-
-
-end Cu_trb3_periph_sodaclient_arch;
\ No newline at end of file
diff --git a/code/ip/serdes_4_sync_downstream.txt b/code/ip/serdes_4_sync_downstream.txt
new file mode 100644
index 0000000..8e076a7
--- /dev/null
+++ b/code/ip/serdes_4_sync_downstream.txt
@@ -0,0 +1,163 @@
+# This file is used by the simulation model as well as the ispLEVER bitstream
+# generation process to automatically initialize the PCSD quad to the mode
+# selected in the IPexpress. This file is expected to be modified by the
+# end user to adjust the PCSD quad to the final design requirements.
+
+DEVICE_NAME "LFE3-150EA"
+CH0_PROTOCOL "G8B10B"
+CH1_PROTOCOL "G8B10B"
+CH2_PROTOCOL "G8B10B"
+CH3_PROTOCOL "G8B10B"
+CH0_MODE "RXTX"
+CH1_MODE "RXTX"
+CH2_MODE "RXTX"
+CH3_MODE "RXTX"
+CH0_CDR_SRC "REFCLK_CORE"
+CH1_CDR_SRC "REFCLK_CORE"
+CH2_CDR_SRC "REFCLK_CORE"
+CH3_CDR_SRC "REFCLK_CORE"
+PLL_SRC "REFCLK_CORE"
+TX_DATARATE_RANGE "MEDHIGH"
+CH0_RX_DATARATE_RANGE "MEDHIGH"
+CH1_RX_DATARATE_RANGE "MEDHIGH"
+CH2_RX_DATARATE_RANGE "MEDHIGH"
+CH3_RX_DATARATE_RANGE "MEDHIGH"
+REFCK_MULT "10X"
+#REFCLK_RATE 200
+CH0_RX_DATA_RATE "FULL"
+CH1_RX_DATA_RATE "FULL"
+CH2_RX_DATA_RATE "FULL"
+CH3_RX_DATA_RATE "FULL"
+CH0_TX_DATA_RATE "FULL"
+CH1_TX_DATA_RATE "FULL"
+CH2_TX_DATA_RATE "FULL"
+CH3_TX_DATA_RATE "FULL"
+CH0_TX_DATA_WIDTH "8"
+CH1_TX_DATA_WIDTH "8"
+CH2_TX_DATA_WIDTH "8"
+CH3_TX_DATA_WIDTH "8"
+CH0_RX_DATA_WIDTH "8"
+CH1_RX_DATA_WIDTH "8"
+CH2_RX_DATA_WIDTH "8"
+CH3_RX_DATA_WIDTH "8"
+CH0_TX_FIFO "DISABLED"
+CH1_TX_FIFO "DISABLED"
+CH2_TX_FIFO "DISABLED"
+CH3_TX_FIFO "DISABLED"
+CH0_RX_FIFO "ENABLED"
+CH1_RX_FIFO "ENABLED"
+CH2_RX_FIFO "ENABLED"
+CH3_RX_FIFO "ENABLED"
+CH0_TDRV "0"
+CH1_TDRV "0"
+CH2_TDRV "0"
+CH3_TDRV "0"
+#CH0_TX_FICLK_RATE 200
+#CH1_TX_FICLK_RATE 200
+#CH2_TX_FICLK_RATE 200
+#CH3_TX_FICLK_RATE 200
+#CH0_RXREFCLK_RATE "200"
+#CH1_RXREFCLK_RATE "200"
+#CH2_RXREFCLK_RATE "200"
+#CH3_RXREFCLK_RATE "200"
+#CH0_RX_FICLK_RATE 200
+#CH1_RX_FICLK_RATE 200
+#CH2_RX_FICLK_RATE 200
+#CH3_RX_FICLK_RATE 200
+CH0_TX_PRE "DISABLED"
+CH1_TX_PRE "DISABLED"
+CH2_TX_PRE "DISABLED"
+CH3_TX_PRE "DISABLED"
+CH0_RTERM_TX "50"
+CH1_RTERM_TX "50"
+CH2_RTERM_TX "50"
+CH3_RTERM_TX "50"
+CH0_RX_EQ "DISABLED"
+CH1_RX_EQ "DISABLED"
+CH2_RX_EQ "DISABLED"
+CH3_RX_EQ "DISABLED"
+CH0_RTERM_RX "50"
+CH1_RTERM_RX "50"
+CH2_RTERM_RX "50"
+CH3_RTERM_RX "50"
+CH0_RX_DCC "DC"
+CH1_RX_DCC "DC"
+CH2_RX_DCC "DC"
+CH3_RX_DCC "DC"
+CH0_LOS_THRESHOLD_LO "2"
+CH1_LOS_THRESHOLD_LO "2"
+CH2_LOS_THRESHOLD_LO "2"
+CH3_LOS_THRESHOLD_LO "2"
+PLL_TERM "50"
+PLL_DCC "DC"
+PLL_LOL_SET "0"
+CH0_TX_SB "DISABLED"
+CH1_TX_SB "DISABLED"
+CH2_TX_SB "DISABLED"
+CH3_TX_SB "DISABLED"
+CH0_RX_SB "DISABLED"
+CH1_RX_SB "DISABLED"
+CH2_RX_SB "DISABLED"
+CH3_RX_SB "DISABLED"
+CH0_TX_8B10B "ENABLED"
+CH1_TX_8B10B "ENABLED"
+CH2_TX_8B10B "ENABLED"
+CH3_TX_8B10B "ENABLED"
+CH0_RX_8B10B "ENABLED"
+CH1_RX_8B10B "ENABLED"
+CH2_RX_8B10B "ENABLED"
+CH3_RX_8B10B "ENABLED"
+CH0_COMMA_A "1100000101"
+CH1_COMMA_A "1100000101"
+CH2_COMMA_A "1100000101"
+CH3_COMMA_A "1100000101"
+CH0_COMMA_B "0011111010"
+CH1_COMMA_B "0011111010"
+CH2_COMMA_B "0011111010"
+CH3_COMMA_B "0011111010"
+CH0_COMMA_M "1111111100"
+CH1_COMMA_M "1111111100"
+CH2_COMMA_M "1111111100"
+CH3_COMMA_M "1111111100"
+CH0_RXWA "ENABLED"
+CH1_RXWA "ENABLED"
+CH2_RXWA "ENABLED"
+CH3_RXWA "ENABLED"
+CH0_ILSM "ENABLED"
+CH1_ILSM "ENABLED"
+CH2_ILSM "ENABLED"
+CH3_ILSM "ENABLED"
+CH0_CTC "DISABLED"
+CH1_CTC "DISABLED"
+CH2_CTC "DISABLED"
+CH3_CTC "DISABLED"
+CH0_CC_MATCH4 "0000011100"
+CH1_CC_MATCH4 "0000011100"
+CH2_CC_MATCH4 "0000011100"
+CH3_CC_MATCH4 "0000011100"
+CH0_CC_MATCH_MODE "1"
+CH1_CC_MATCH_MODE "1"
+CH2_CC_MATCH_MODE "1"
+CH3_CC_MATCH_MODE "1"
+CH0_CC_MIN_IPG "3"
+CH1_CC_MIN_IPG "3"
+CH2_CC_MIN_IPG "3"
+CH3_CC_MIN_IPG "3"
+CCHMARK "9"
+CCLMARK "7"
+CH0_SSLB "DISABLED"
+CH1_SSLB "DISABLED"
+CH2_SSLB "DISABLED"
+CH3_SSLB "DISABLED"
+CH0_SPLBPORTS "DISABLED"
+CH1_SPLBPORTS "DISABLED"
+CH2_SPLBPORTS "DISABLED"
+CH3_SPLBPORTS "DISABLED"
+CH0_PCSLBPORTS "DISABLED"
+CH1_PCSLBPORTS "DISABLED"
+CH2_PCSLBPORTS "DISABLED"
+CH3_PCSLBPORTS "DISABLED"
+INT_ALL "DISABLED"
+QD_REFCK2CORE "ENABLED"
+
+
diff --git a/code/ip/serdes_sync_upstream.txt b/code/ip/serdes_sync_upstream.txt
new file mode 100644
index 0000000..a057cb3
--- /dev/null
+++ b/code/ip/serdes_sync_upstream.txt
@@ -0,0 +1,58 @@
+# This file is used by the simulation model as well as the ispLEVER bitstream
+# generation process to automatically initialize the PCSD quad to the mode
+# selected in the IPexpress. This file is expected to be modified by the
+# end user to adjust the PCSD quad to the final design requirements.
+
+DEVICE_NAME "LFE3-150EA"
+CH3_PROTOCOL "G8B10B"
+CH0_MODE "DISABLED"
+CH1_MODE "DISABLED"
+CH2_MODE "DISABLED"
+CH3_MODE "RXTX"
+CH3_CDR_SRC "REFCLK_CORE"
+PLL_SRC "REFCLK_CORE"
+TX_DATARATE_RANGE "MEDHIGH"
+CH3_RX_DATARATE_RANGE "MEDHIGH"
+REFCK_MULT "10X"
+#REFCLK_RATE 200
+CH3_RX_DATA_RATE "FULL"
+CH3_TX_DATA_RATE "FULL"
+CH3_TX_DATA_WIDTH "8"
+CH3_RX_DATA_WIDTH "8"
+CH3_TX_FIFO "DISABLED"
+CH3_RX_FIFO "DISABLED"
+CH3_TDRV "0"
+#CH3_TX_FICLK_RATE 200
+#CH3_RXREFCLK_RATE "200"
+#CH3_RX_FICLK_RATE 200
+CH3_TX_PRE "DISABLED"
+CH3_RTERM_TX "50"
+CH3_RX_EQ "DISABLED"
+CH3_RTERM_RX "50"
+CH3_RX_DCC "DC"
+CH3_LOS_THRESHOLD_LO "2"
+PLL_TERM "50"
+PLL_DCC "AC"
+PLL_LOL_SET "0"
+CH3_TX_SB "DISABLED"
+CH3_RX_SB "DISABLED"
+CH3_TX_8B10B "ENABLED"
+CH3_RX_8B10B "ENABLED"
+CH3_COMMA_A "1100000101"
+CH3_COMMA_B "0011111010"
+CH3_COMMA_M "1111111100"
+CH3_RXWA "ENABLED"
+CH3_ILSM "ENABLED"
+CH3_CTC "DISABLED"
+CH3_CC_MATCH4 "0100011100"
+CH3_CC_MATCH_MODE "1"
+CH3_CC_MIN_IPG "3"
+CCHMARK "9"
+CCLMARK "7"
+CH3_SSLB "DISABLED"
+CH3_SPLBPORTS "DISABLED"
+CH3_PCSLBPORTS "DISABLED"
+INT_ALL "DISABLED"
+QD_REFCK2CORE "ENABLED"
+
+
diff --git a/code/ip/sfp_1_125_int.txt b/code/ip/sfp_1_125_int.txt
new file mode 100644
index 0000000..a684493
--- /dev/null
+++ b/code/ip/sfp_1_125_int.txt
@@ -0,0 +1,58 @@
+# This file is used by the simulation model as well as the ispLEVER bitstream
+# generation process to automatically initialize the PCSD quad to the mode
+# selected in the IPexpress. This file is expected to be modified by the
+# end user to adjust the PCSD quad to the final design requirements.
+
+DEVICE_NAME "LFE3-150EA"
+CH1_PROTOCOL "G8B10B"
+CH0_MODE "DISABLED"
+CH1_MODE "RXTX"
+CH2_MODE "DISABLED"
+CH3_MODE "DISABLED"
+CH1_CDR_SRC "REFCLK_CORE"
+PLL_SRC "REFCLK_CORE"
+TX_DATARATE_RANGE "MEDHIGH"
+CH1_RX_DATARATE_RANGE "MEDHIGH"
+REFCK_MULT "20X"
+#REFCLK_RATE 125.0
+CH1_RX_DATA_RATE "FULL"
+CH1_TX_DATA_RATE "FULL"
+CH1_TX_DATA_WIDTH "16"
+CH1_RX_DATA_WIDTH "16"
+CH1_TX_FIFO "ENABLED"
+CH1_RX_FIFO "ENABLED"
+CH1_TDRV "0"
+#CH1_TX_FICLK_RATE 125.0
+#CH1_RXREFCLK_RATE "125.0"
+#CH1_RX_FICLK_RATE 125.0
+CH1_TX_PRE "DISABLED"
+CH1_RTERM_TX "50"
+CH1_RX_EQ "DISABLED"
+CH1_RTERM_RX "50"
+CH1_RX_DCC "DC"
+CH1_LOS_THRESHOLD_LO "2"
+PLL_TERM "50"
+PLL_DCC "AC"
+PLL_LOL_SET "0"
+CH1_TX_SB "DISABLED"
+CH1_RX_SB "DISABLED"
+CH1_TX_8B10B "ENABLED"
+CH1_RX_8B10B "ENABLED"
+CH1_COMMA_A "1100000101"
+CH1_COMMA_B "0011111010"
+CH1_COMMA_M "1111111100"
+CH1_RXWA "ENABLED"
+CH1_ILSM "ENABLED"
+CH1_CTC "DISABLED"
+CH1_CC_MATCH4 "0100011100"
+CH1_CC_MATCH_MODE "1"
+CH1_CC_MIN_IPG "3"
+CCHMARK "9"
+CCLMARK "7"
+CH1_SSLB "DISABLED"
+CH1_SPLBPORTS "DISABLED"
+CH1_PCSLBPORTS "DISABLED"
+INT_ALL "DISABLED"
+QD_REFCK2CORE "ENABLED"
+
+
diff --git a/code/ip/sfp_1_200_int.txt b/code/ip/sfp_1_200_int.txt
new file mode 100644
index 0000000..82c5a8a
--- /dev/null
+++ b/code/ip/sfp_1_200_int.txt
@@ -0,0 +1,93 @@
+# This file is used by the simulation model as well as the ispLEVER bitstream
+# generation process to automatically initialize the PCSD quad to the mode
+# selected in the IPexpress. This file is expected to be modified by the
+# end user to adjust the PCSD quad to the final design requirements.
+
+DEVICE_NAME "LFE3-150EA"
+CH1_PROTOCOL "G8B10B"
+CH3_PROTOCOL "G8B10B"
+CH0_MODE "DISABLED"
+CH1_MODE "RXTX"
+CH2_MODE "DISABLED"
+CH3_MODE "RXTX"
+CH1_CDR_SRC "REFCLK_CORE"
+CH3_CDR_SRC "REFCLK_CORE"
+PLL_SRC "REFCLK_CORE"
+TX_DATARATE_RANGE "MEDHIGH"
+CH1_RX_DATARATE_RANGE "MEDHIGH"
+CH3_RX_DATARATE_RANGE "MEDHIGH"
+REFCK_MULT "10X"
+#REFCLK_RATE 200
+CH1_RX_DATA_RATE "FULL"
+CH3_RX_DATA_RATE "FULL"
+CH1_TX_DATA_RATE "FULL"
+CH3_TX_DATA_RATE "FULL"
+CH1_TX_DATA_WIDTH "16"
+CH3_TX_DATA_WIDTH "8"
+CH1_RX_DATA_WIDTH "16"
+CH3_RX_DATA_WIDTH "8"
+CH1_TX_FIFO "ENABLED"
+CH3_TX_FIFO "DISABLED"
+CH1_RX_FIFO "ENABLED"
+CH3_RX_FIFO "DISABLED"
+CH1_TDRV "0"
+CH3_TDRV "0"
+#CH1_TX_FICLK_RATE 100
+#CH3_TX_FICLK_RATE 200
+#CH1_RXREFCLK_RATE "200"
+#CH3_RXREFCLK_RATE "200"
+#CH1_RX_FICLK_RATE 100
+#CH3_RX_FICLK_RATE 200
+CH1_TX_PRE "DISABLED"
+CH3_TX_PRE "DISABLED"
+CH1_RTERM_TX "50"
+CH3_RTERM_TX "50"
+CH1_RX_EQ "DISABLED"
+CH3_RX_EQ "DISABLED"
+CH1_RTERM_RX "50"
+CH3_RTERM_RX "50"
+CH1_RX_DCC "DC"
+CH3_RX_DCC "DC"
+CH1_LOS_THRESHOLD_LO "2"
+CH3_LOS_THRESHOLD_LO "2"
+PLL_TERM "50"
+PLL_DCC "AC"
+PLL_LOL_SET "0"
+CH1_TX_SB "DISABLED"
+CH3_TX_SB "DISABLED"
+CH1_RX_SB "DISABLED"
+CH3_RX_SB "DISABLED"
+CH1_TX_8B10B "ENABLED"
+CH3_TX_8B10B "ENABLED"
+CH1_RX_8B10B "ENABLED"
+CH3_RX_8B10B "ENABLED"
+CH1_COMMA_A "1100000101"
+CH3_COMMA_A "1100000101"
+CH1_COMMA_B "0011111010"
+CH3_COMMA_B "0011111010"
+CH1_COMMA_M "1111111100"
+CH3_COMMA_M "1111111100"
+CH1_RXWA "ENABLED"
+CH3_RXWA "ENABLED"
+CH1_ILSM "ENABLED"
+CH3_ILSM "ENABLED"
+CH1_CTC "DISABLED"
+CH3_CTC "DISABLED"
+CH1_CC_MATCH4 "0100011100"
+CH3_CC_MATCH4 "0000000000"
+CH1_CC_MATCH_MODE "1"
+CH3_CC_MATCH_MODE "1"
+CH1_CC_MIN_IPG "3"
+CH3_CC_MIN_IPG "3"
+CCHMARK "9"
+CCLMARK "7"
+CH1_SSLB "DISABLED"
+CH3_SSLB "DISABLED"
+CH1_SPLBPORTS "DISABLED"
+CH3_SPLBPORTS "DISABLED"
+CH1_PCSLBPORTS "DISABLED"
+CH3_PCSLBPORTS "DISABLED"
+INT_ALL "DISABLED"
+QD_REFCK2CORE "ENABLED"
+
+
diff --git a/code/ip/sfp_2_200_int.txt b/code/ip/sfp_2_200_int.txt
new file mode 100644
index 0000000..82c5a8a
--- /dev/null
+++ b/code/ip/sfp_2_200_int.txt
@@ -0,0 +1,93 @@
+# This file is used by the simulation model as well as the ispLEVER bitstream
+# generation process to automatically initialize the PCSD quad to the mode
+# selected in the IPexpress. This file is expected to be modified by the
+# end user to adjust the PCSD quad to the final design requirements.
+
+DEVICE_NAME "LFE3-150EA"
+CH1_PROTOCOL "G8B10B"
+CH3_PROTOCOL "G8B10B"
+CH0_MODE "DISABLED"
+CH1_MODE "RXTX"
+CH2_MODE "DISABLED"
+CH3_MODE "RXTX"
+CH1_CDR_SRC "REFCLK_CORE"
+CH3_CDR_SRC "REFCLK_CORE"
+PLL_SRC "REFCLK_CORE"
+TX_DATARATE_RANGE "MEDHIGH"
+CH1_RX_DATARATE_RANGE "MEDHIGH"
+CH3_RX_DATARATE_RANGE "MEDHIGH"
+REFCK_MULT "10X"
+#REFCLK_RATE 200
+CH1_RX_DATA_RATE "FULL"
+CH3_RX_DATA_RATE "FULL"
+CH1_TX_DATA_RATE "FULL"
+CH3_TX_DATA_RATE "FULL"
+CH1_TX_DATA_WIDTH "16"
+CH3_TX_DATA_WIDTH "8"
+CH1_RX_DATA_WIDTH "16"
+CH3_RX_DATA_WIDTH "8"
+CH1_TX_FIFO "ENABLED"
+CH3_TX_FIFO "DISABLED"
+CH1_RX_FIFO "ENABLED"
+CH3_RX_FIFO "DISABLED"
+CH1_TDRV "0"
+CH3_TDRV "0"
+#CH1_TX_FICLK_RATE 100
+#CH3_TX_FICLK_RATE 200
+#CH1_RXREFCLK_RATE "200"
+#CH3_RXREFCLK_RATE "200"
+#CH1_RX_FICLK_RATE 100
+#CH3_RX_FICLK_RATE 200
+CH1_TX_PRE "DISABLED"
+CH3_TX_PRE "DISABLED"
+CH1_RTERM_TX "50"
+CH3_RTERM_TX "50"
+CH1_RX_EQ "DISABLED"
+CH3_RX_EQ "DISABLED"
+CH1_RTERM_RX "50"
+CH3_RTERM_RX "50"
+CH1_RX_DCC "DC"
+CH3_RX_DCC "DC"
+CH1_LOS_THRESHOLD_LO "2"
+CH3_LOS_THRESHOLD_LO "2"
+PLL_TERM "50"
+PLL_DCC "AC"
+PLL_LOL_SET "0"
+CH1_TX_SB "DISABLED"
+CH3_TX_SB "DISABLED"
+CH1_RX_SB "DISABLED"
+CH3_RX_SB "DISABLED"
+CH1_TX_8B10B "ENABLED"
+CH3_TX_8B10B "ENABLED"
+CH1_RX_8B10B "ENABLED"
+CH3_RX_8B10B "ENABLED"
+CH1_COMMA_A "1100000101"
+CH3_COMMA_A "1100000101"
+CH1_COMMA_B "0011111010"
+CH3_COMMA_B "0011111010"
+CH1_COMMA_M "1111111100"
+CH3_COMMA_M "1111111100"
+CH1_RXWA "ENABLED"
+CH3_RXWA "ENABLED"
+CH1_ILSM "ENABLED"
+CH3_ILSM "ENABLED"
+CH1_CTC "DISABLED"
+CH3_CTC "DISABLED"
+CH1_CC_MATCH4 "0100011100"
+CH3_CC_MATCH4 "0000000000"
+CH1_CC_MATCH_MODE "1"
+CH3_CC_MATCH_MODE "1"
+CH1_CC_MIN_IPG "3"
+CH3_CC_MIN_IPG "3"
+CCHMARK "9"
+CCLMARK "7"
+CH1_SSLB "DISABLED"
+CH3_SSLB "DISABLED"
+CH1_SPLBPORTS "DISABLED"
+CH3_SPLBPORTS "DISABLED"
+CH1_PCSLBPORTS "DISABLED"
+CH3_PCSLBPORTS "DISABLED"
+INT_ALL "DISABLED"
+QD_REFCK2CORE "ENABLED"
+
+
diff --git a/code/med_ecp3_sfp_sync_up.vhd b/code/med_ecp3_sfp_sync_up.vhd
index 366c25d..462d6e5 100644
--- a/code/med_ecp3_sfp_sync_up.vhd
+++ b/code/med_ecp3_sfp_sync_up.vhd
@@ -262,7 +262,7 @@ THE_SERDES : entity work.serdes_sync_upstream
SCI_RDDATA => sci_data_out_i,
SCI_ADDR => sci_addr_i(5 downto 0),
SCI_SEL_QUAD => sci_qd_i,
- SCI_SEL_ch3 => sci_ch_i(0),
+ SCI_SEL_ch3 => sci_ch_i(3),
SCI_RD => sci_read_i,
SCI_WRN => sci_write_i,
diff --git a/sfp_1_200_int.txt b/sfp_1_200_int.txt
deleted file mode 120000
index 65141a0..0000000
--- a/sfp_1_200_int.txt
+++ /dev/null
@@ -1 +0,0 @@
-../trbnet/media_interfaces/ecp3_sfp/sfp_1_200_int.txt
\ No newline at end of file
diff --git a/soda_4source_EP.ldf b/soda_4source_EP.ldf
deleted file mode 100644
index b15517a..0000000
--- a/soda_4source_EP.ldf
+++ /dev/null
@@ -1,338 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/trb3_soda_hub.xcf b/trb3_soda_hub.xcf
index 03f5f60..f3172e1 100644
--- a/trb3_soda_hub.xcf
+++ b/trb3_soda_hub.xcf
@@ -101,8 +101,8 @@
1
0
- /local/lemmens/lattice/soda/trb3_periph_sodaclient_20150108.bit
- 01/07/15 16:18:12
+ /local/lemmens/lattice/soda/trb3_periph_sodaclient_20150113.bit
+ 01/13/15 09:01:54
Fast Program