Index: firmware/FAD/FACT_FAD_lib/hdl/fad_board_struct.vhd =================================================================== --- firmware/FAD/FACT_FAD_lib/hdl/fad_board_struct.vhd (revision 11800) +++ firmware/FAD/FACT_FAD_lib/hdl/fad_board_struct.vhd (revision 11801) @@ -3,5 +3,5 @@ -- Created: -- by - daqct3.UNKNOWN (IHP110) --- at - 19:03:20 03.08.2011 +-- at - 17:22:06 05.08.2011 -- -- Generated by Mentor Graphics' HDL Designer(TM) 2009.1 (Build 12) @@ -76,5 +76,5 @@ -- Created: -- by - daqct3.UNKNOWN (IHP110) --- at - 19:03:20 03.08.2011 +-- at - 17:22:07 05.08.2011 -- -- Generated by Mentor Graphics' HDL Designer(TM) 2009.1 (Build 12) Index: firmware/FAD/FACT_FAD_lib/hdl/fad_definitions.vhd =================================================================== --- firmware/FAD/FACT_FAD_lib/hdl/fad_definitions.vhd (revision 11800) +++ firmware/FAD/FACT_FAD_lib/hdl/fad_definitions.vhd (revision 11801) @@ -55,5 +55,5 @@ --constant SUBVERSION_NUMBER : std_logic_vector (15 downto 0) := conv_std_logic_vector(str_to_int(SUBVERSION_STRING),16); constant PACKAGE_VERSION : std_logic_vector(7 downto 0) := X"02"; - constant PACKAGE_SUB_VERSION : std_logic_vector(7 downto 0) := X"13"; + constant PACKAGE_SUB_VERSION : std_logic_vector(7 downto 0) := X"14"; constant PACKAGE_HEADER_LENGTH : integer := 36; constant PACKAGE_HEADER_ZEROS : integer := 0; @@ -107,5 +107,6 @@ -- - constant W5300_TX_FIFO_SIZE_8B : integer := 15360; -- Socket TX FIFO-Size in Bytes + --constant W5300_TX_FIFO_SIZE_8B : integer := 15360; -- Socket TX FIFO-Size in Bytes + constant W5300_TX_FIFO_SIZE_8B : integer := 61440; -- Socket TX FIFO-Size in Bytes constant W5300_TX_FIFO_SIZE : integer := (W5300_TX_FIFO_SIZE_8B / 2); -- Socket TX FIFO-Size in 16 Bit Words @@ -177,6 +178,6 @@ constant CMD_TRIGGER_S : std_logic_vector := X"20"; -constant CMD_BUSY_ON : std_logic_vector := X"24"; -constant CMD_BUSY_OFF : std_logic_vector := X"25"; +constant CMD_BUSY_FIX_OFF_TRUE : std_logic_vector := X"24"; +constant CMD_BUSY_FIX_OFF_FALSE : std_logic_vector := X"25"; constant CMD_STATUS : std_logic_vector := X"FF"; Index: firmware/FAD/FACT_FAD_lib/hdl/fad_main_struct.vhd =================================================================== --- firmware/FAD/FACT_FAD_lib/hdl/fad_main_struct.vhd (revision 11800) +++ firmware/FAD/FACT_FAD_lib/hdl/fad_main_struct.vhd (revision 11801) @@ -3,5 +3,5 @@ -- Created: -- by - daqct3.UNKNOWN (IHP110) --- at - 19:03:18 03.08.2011 +-- at - 17:22:05 05.08.2011 -- -- Generated by Mentor Graphics' HDL Designer(TM) 2009.1 (Build 12) @@ -83,5 +83,5 @@ -- Created: -- by - daqct3.UNKNOWN (IHP110) --- at - 19:03:19 03.08.2011 +-- at - 17:22:06 05.08.2011 -- -- Generated by Mentor Graphics' HDL Designer(TM) 2009.1 (Build 12) @@ -571,5 +571,5 @@ sclk_enable : OUT std_logic := '1'; -- default DWRITE HIGH. srclk_enable : OUT std_logic := '1'; -- default SRCLK on. - busy_enable : OUT std_logic := '0'; + busy_enable : OUT std_logic := '1'; socket_send_mode_out : OUT std_logic ; busy_manual : OUT std_logic := '0'; Index: firmware/FAD/FACT_FAD_lib/hdl/w5300_modul.vhd =================================================================== --- firmware/FAD/FACT_FAD_lib/hdl/w5300_modul.vhd (revision 11800) +++ firmware/FAD/FACT_FAD_lib/hdl/w5300_modul.vhd (revision 11801) @@ -81,5 +81,5 @@ sclk_enable : out std_logic := '1'; -- default DWRITE HIGH. srclk_enable : out std_logic := '1'; -- default SRCLK on. - busy_enable : out std_logic := '0'; + busy_enable : out std_logic := '1'; socket_send_mode_out : out std_logic; busy_manual : out std_logic := '0'; @@ -450,5 +450,5 @@ else socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then state_interrupt_2 <= IR2_05; else @@ -483,5 +483,5 @@ next_state <= INTERRUPT; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; --state_interrupt_2 <= IR2_06; @@ -506,5 +506,5 @@ else if ( data_read(7 downto 0) = SOCKET_CLOSED ) then - if ( socket_cnt = 7 ) then + if ( socket_cnt = 1 ) then socket_cnt <= "000"; state_interrupt_2 <= IR2_06; @@ -546,5 +546,5 @@ c_trigger_enable <= '0'; trigger_enable_sig <= '0'; - busy_enable <= '0'; + busy_enable <= '1'; busy_manual <= '0'; socket_send_mode <= '0'; @@ -674,41 +674,45 @@ -- Socket TX Memory Size when STX => - par_data <= X"0F0F"; -- 15K TX - - par_addr <= W5300_TMS01R; - state_init <=WRITE_REG; - next_state <= STX1; - when STX1 => - par_addr <= W5300_TMS23R; - state_init <=WRITE_REG; - next_state <= STX2; - when STX2 => - par_addr <= W5300_TMS45R; - state_init <=WRITE_REG; - next_state <= STX3; - when STX3 => - par_addr <= W5300_TMS67R; - state_init <=WRITE_REG; - next_state <= SRX; + par_data <= X"3C3C"; -- 60K TX + par_addr <= W5300_TMS01R; + state_init <=WRITE_REG; + next_state <= STX1; + when STX1 => + par_data <= X"0000"; --- nothing + par_addr <= W5300_TMS23R; + state_init <=WRITE_REG; + next_state <= STX2; + when STX2 => + par_data <= X"0000"; --- nothing + par_addr <= W5300_TMS45R; + state_init <=WRITE_REG; + next_state <= STX3; + when STX3 => + par_data <= X"0000"; --- nothing + par_addr <= W5300_TMS67R; + state_init <=WRITE_REG; + next_state <= SRX; - -- Socket RX Memory Size - when SRX => - par_data <= X"0101"; -- 1K RX - - par_addr <= W5300_RMS01R; - state_init <=WRITE_REG; - next_state <= SRX1; - when SRX1 => - par_addr <= W5300_RMS23R; - state_init <=WRITE_REG; - next_state <= SRX2; - when SRX2 => - par_addr <= W5300_RMS45R; - state_init <=WRITE_REG; - next_state <= SRX3; - when SRX3 => - par_addr <= W5300_RMS67R; - state_init <=WRITE_REG; - next_state <= MAC; + -- Socket RX Memory Size + when SRX => + par_data <= X"0404"; -- 4K RX + par_addr <= W5300_RMS01R; + state_init <=WRITE_REG; + next_state <= SRX1; + when SRX1 => + par_data <= X"0000"; --- nothing + par_addr <= W5300_RMS23R; + state_init <=WRITE_REG; + next_state <= SRX2; + when SRX2 => + par_data <= X"0000"; --- nothing + par_addr <= W5300_RMS45R; + state_init <=WRITE_REG; + next_state <= SRX3; + when SRX3 => + par_data <= X"0000"; --- nothing + par_addr <= W5300_RMS67R; + state_init <=WRITE_REG; + next_state <= MAC; -- MAC @@ -826,5 +830,5 @@ state_init <= WRITE_REG; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= ESTABLISH; -- All Sockets open @@ -845,5 +849,5 @@ case data_read (7 downto 0) is when X"17" => -- established - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; busy <= '0'; @@ -875,5 +879,5 @@ state_init <= WRITE_REG; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= SET_Sn_KPALVTR; @@ -887,5 +891,5 @@ socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= MAIN; @@ -905,5 +909,5 @@ initial_message_counter <= 0; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= INITIAL_CONNECTION_MESSAGE_SET_SIZE_HIGH_BYTE; @@ -918,5 +922,5 @@ next_state <= INITIAL_CONNECTION_MESSAGE_SET_SIZE_HIGH_BYTE; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= INITIAL_CONNECTION_MESSAGE_SET_SIZE_LOW_BYTE; @@ -930,5 +934,5 @@ next_state <= INITIAL_CONNECTION_MESSAGE_SET_SIZE_LOW_BYTE; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= INITIAL_CONNECTION_MESSAGE_SEND; @@ -942,5 +946,5 @@ next_state <= INITIAL_CONNECTION_MESSAGE_SEND; socket_cnt <= socket_cnt + 1; - if (socket_cnt = 7) then + if (socket_cnt = 1) then socket_cnt <= "000"; next_state <= MAIN; @@ -1197,8 +1201,8 @@ state_read_data <= RD_5; - when CMD_BUSY_ON => + when CMD_BUSY_FIX_OFF_TRUE => busy_enable <= '1'; state_read_data <= RD_5; - when CMD_BUSY_OFF => + when CMD_BUSY_FIX_OFF_FALSE => busy_enable <= '0'; state_read_data <= RD_5;