engine_control separe the bytes counting when producing and consuming

git-svn-id: http://svn.ohwr.org/cern-fip/trunk/hdl/design@85 7f0067c9-7624-46c7-bd39-3fb5400c0213

engine_control separe the bytes counting when producing and consuming
git-svn-id: http://svn.ohwr.org/cern-fip/trunk/hdl/design@85 7f0067c9-7624-46c7-bd39-3fb5400c0213
11d339ce · egousiou · 643090f8 · 11d339ce · 11d339ce · 11d339ce
Commit 11d339ce authored Sep 27, 2010 by egousiou
Showing with 96 additions and 67 deletions

nanofip.vhd nanofip.vhd +16 -16

wf_engine_control.vhd wf_engine_control.vhd +75 -46

wf_package.vhd wf_package.vhd +1 -1

wf_produced_vars.vhd wf_produced_vars.vhd +4 -4

No files found.
--- a/nanofip.vhd
+++ b/nanofip.vhd
@@ -98,22 +98,23 @@ entity nanofip is
 -- WorldFIP settings
    rate_i    : in  std_logic_vector (1 downto 0); --! Bit rate
    subs_i    : in  std_logic_vector (7 downto 0); --! Subscriber number coding.
-    s_id_o    : out std_logic_vector (1 downto 0); --! Identification selection
    m_id_i    : in  std_logic_vector (3 downto 0); --! Model identification settings
    c_id_i    : in  std_logic_vector (3 downto 0); --! Constructor identification settings
    p3_lgth_i : in  std_logic_vector (2 downto 0); --! Produced variable data length

+    s_id_o    : out std_logic_vector (1 downto 0); --! Identification selection
 
 --  FIELDRIVE connections

-    fd_rstn_o : out std_logic; --! Initialisation control, active low
+    fx_rxa_i  : in  std_logic; --! Reception activity detection
+    fx_rxd_i  : in  std_logic; --! Receiver data
    fd_wdgn_i : in  std_logic; --! Watchdog on transmitter
    fd_txer_i : in  std_logic; --! Transmitter error
+
    fd_txena_o: out std_logic; --! Transmitter enable
    fd_txck_o : out std_logic; --! Line driver half bit clock
    fx_txd_o  : out std_logic; --! Transmitter data
-    fx_rxa_i  : in  std_logic; --! Reception activity detection
-    fx_rxd_i  : in  std_logic; --! Receiver data
+    fd_rstn_o : out std_logic; --! Initialisation control, active low

 
 --  USER INTERFACE, General signals
@@ -121,35 +122,34 @@ entity nanofip is
    uclk_i    : in  std_logic; --! 40 MHz clock
    slone_i   : in  std_logic; --! Stand-alone mode
    nostat_i  : in  std_logic; --! No NanoFIP status transmission
-
    rstin_i   : in  std_logic; --! Initialisation control, active low

    rston_o   : out std_logic; --! Reset output, active low


-
 --  USER INTERFACE, non WISHBONE

-    var1_rdy_o: out std_logic; --! Variable 1 ready
-
    var1_acc_i: in  std_logic; --! Variable 1 access
-    var2_rdy_o: out std_logic; --! Variable 2 ready
    var2_acc_i: in  std_logic; --! Variable 2 access
-    var3_rdy_o: out std_logic; --! Variable 3 ready
    var3_acc_i: in  std_logic; --! Variable 3 access

+    var1_rdy_o: out std_logic; --! Variable 1 ready
+    var2_rdy_o: out std_logic; --! Variable 2 ready
+    var3_rdy_o: out std_logic; --! Variable 3 ready
+
+
 --  USER INTERFACE, WISHBONE SLAVE

    wclk_i    : in  std_logic; --! WISHBONE clock. May be independent of UCLK.
-    dat_i     : in  std_logic_vector (15 downto 0); --! Data in
-
-    dat_o     : out std_logic_vector (15 downto 0); --! Data out
-    adr_i     : in  std_logic_vector ( 9 downto 0); --! Address
    rst_i     : in  std_logic; --! WISHBONE reset. Does not reset other internal logic.
    stb_i     : in  std_logic; --! Strobe
-    ack_o     : out std_logic; --! Acknowledge
    cyc_i     : in std_logic;
-    we_i      : in  std_logic  --! Write enable
+    we_i      : in  std_logic;  --! Write enable
+    adr_i     : in  std_logic_vector ( 9 downto 0); --! Address
+    dat_i     : in  std_logic_vector (15 downto 0); --! Data in
+
+    dat_o     : out std_logic_vector (15 downto 0); --! Data out
+    ack_o     : out std_logic --! Acknowledge

    );


--- a/wf_engine_control.vhd
+++ b/wf_engine_control.vhd
--- a/wf_package.vhd
+++ b/wf_package.vhd
@@ -84,7 +84,7 @@ package wf_package is
     3 => "00100000",     -- 32 bytes
     4 => "01000000",     -- 64 bytes 
     5 => "01111100",     -- 124 bytes
-     others => "00000000" -- reserved
+     others => "00000010" -- reserved ----------!!!!!!!!!!
     );  



--- a/wf_produced_vars.vhd
+++ b/wf_produced_vars.vhd
@@ -391,13 +391,13 @@ architecture rtl of wf_produced_vars is
        -- The one but last byte if the input nostat_i is negated is the nanoFIP status byte
        -- (if nostat_i is not negated, the "else" condition takes place) 

-        elsif unsigned(s_byte_index) = (unsigned(data_length_i)-1 ) and nostat_i = '0' then 
-          byte_o        <= nFIP_status_byte_i;                            
-          sending_mps_o <= '0'; 
+       -- elsif unsigned(s_byte_index) = (unsigned(data_length_i)-1 ) and nostat_i = '0' then !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       --   byte_o        <= nFIP_status_byte_i;                            
+       --   sending_mps_o <= '0'; 

        --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  -- 
        -- The last byte is the MPS status
-        elsif s_byte_index = (data_length_i)then    
+        elsif s_byte_index = (data_length_i)  then    
          byte_o        <= mps_status_byte_i;
          sending_mps_o <= '1';                       -- indication: MPS byte is being sent