conflict fix and merge

diff --cc trb_net_std.vhd
index 9e251ee6bd798a93b53f1663d1e872f07efc7a15,d62e1dcfd73cdde99c55a438fac1862d7cfa0257..24c7a6f8ea309f4b3dad68d2537c92c72738e931
--- 1/trb_net_std.vhd
--- 2/trb_net_std.vhd
+++ b/trb_net_std.vhd
@@@ -149,9 -149,57 +149,58 @@@ package trb_net_std i
    --constant VERSION_NUMBER_TIME  : std_logic_vector(31 downto 0)   := conv_std_logic_vector(1234567890,32);
  
  
+   type CTRLBUS_TX is record
+     data       : std_logic_vector(31 downto 0);
+     ack        : std_logic;
+     wack,rack  : std_logic; --for the old-fashioned guys
+     unknown    : std_logic;
+     nack       : std_logic;
+   end record;
+ 
+   type CTRLBUS_RX is record
+     data       : std_logic_vector(31 downto 0);
+     addr       : std_logic_vector(15 downto 0);
+     write      : std_logic;
+     read       : std_logic;
+     timeout    : std_logic;
+   end record; 
+ 
+   
+   type READOUT_RX is record 
+     data_valid         : std_logic;
+     valid_timing_trg   : std_logic;
+     valid_notiming_trg : std_logic;
+     invalid_trg        : std_logic;
+     --
+     trg_type           : std_logic_vector( 3 downto 0);
+     trg_number         : std_logic_vector(15 downto 0);
+     trg_code           : std_logic_vector( 7 downto 0);
+     trg_information    : std_logic_vector(23 downto 0);
+     trg_int_number     : std_logic_vector(15 downto 0);    
+     --
+     trg_multiple       : std_logic;
+     trg_timeout        : std_logic;
+     trg_spurious       : std_logic;
+     trg_missing        : std_logic;
+     trg_spike          : std_logic;
+     --
+     buffer_almost_full : std_logic;
+   end record; 
+   
+   
+   type READOUT_TX is record
+     busy_release  : std_logic;
+     statusbits    : std_logic_vector(31 downto 0);
+     data          : std_logic_vector(31 downto 0);
+     data_write    : std_logic;
+     data_finished : std_logic;
+   end record;
+     
+     
+     
    type std_logic_vector_array_36 is array (integer range <>) of std_logic_vector(35 downto 0);
    type std_logic_vector_array_32 is array (integer range <>) of std_logic_vector(31 downto 0);
 +  type std_logic_vector_array_31 is array (integer range <>) of std_logic_vector(30 downto 0);
    type std_logic_vector_array_24 is array (integer range <>) of std_logic_vector(23 downto 0);
    type std_logic_vector_array_11 is array (integer range <>) of std_logic_vector(10 downto 0);
    type std_logic_vector_array_8  is array (integer range <>) of std_logic_vector(7 downto 0);