From: hadeshyp <hadeshyp>
Date: Mon, 27 Aug 2012 11:46:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5142b2c50cb873d86c954e31ed9df8e4ad22f07b;p=trb3.git

*** empty log message ***
---

diff --git a/base/.cvsignore b/base/.cvsignore
index c36ae2e..f8a22a5 100644
--- a/base/.cvsignore
+++ b/base/.cvsignore
@@ -10,3 +10,4 @@ version.vhd
 *.sym
 *tmpl.vhd
 *.log
+*debuglog.txt
diff --git a/base/code/mbs_vulom_recv.vhd b/base/code/mbs_vulom_recv.vhd
new file mode 100644
index 0000000..8698fd1
--- /dev/null
+++ b/base/code/mbs_vulom_recv.vhd
@@ -0,0 +1,155 @@
+library ieee;
+use ieee.std_logic_1164.all;
+use ieee.numeric_std.all;
+
+library work;
+use work.trb_net_std.all;
+use work.trb3_components.all;
+
+
+entity mbs_vulom_recv is
+  port(
+    CLK        : in std_logic;  -- e.g. 100 MHz
+    RESET_IN   : in std_logic;  -- could be used after busy_release to make sure entity is in correct state
+
+    --Module inputs
+    MBS_IN     : in std_logic;  -- raw input
+    CLK_200    : in std_logic;  -- internal sampling clock
+    
+    --trigger outputs
+    TRG_ASYNC_OUT  : out std_logic;  -- asynchronous rising edge, length varying, here: approx. 110 ns
+    TRG_SYNC_OUT   : out std_logic;  -- sync. to CLK
+
+    --data output for read-out
+    TRIGGER_IN   : in  std_logic;
+    DATA_OUT     : out std_logic_vector(31 downto 0);
+    WRITE_OUT    : out std_logic;
+    STATUSBIT_OUT: out std_logic_vector(31 downto 0);
+    FINISHED_OUT : out std_logic;
+    
+    --Registers / Debug    
+    CONTROL_REG_IN : in  std_logic_vector(31 downto 0);
+    STATUS_REG_OUT : out std_logic_vector(31 downto 0);
+    DEBUG          : out std_logic_vector(31 downto 0)    
+    );
+end entity;
+
+--MBS format
+--Startbit    (0): “0“
+--Preamb. (1): “1010“
+--Trig.nr.  (2) :24bit
+--Status  (3): unused (2 bits)
+--Paritybit   (4): “0“ or “1“ (positive?)
+--Postam. (5):“1010“
+--Stopbit   (0): “1“
+--Parity check over counter & status bit
+
+--Data Format: 
+-- Bit 23 -  0 : Trigger Number
+-- Bit 30 - 29 : Status
+-- Bit 31      : Error flag
+
+
+
+architecture mbs_vulom_recv_arch of mbs_vulom_recv is
+
+
+signal bitcnt : integer range 0 to 37;
+signal shift_reg : std_logic_vector(36 downto 0);
+
+signal first_bits_fast : std_logic;
+signal first_bits_slow : std_logic;
+signal reg_MBS_IN      : std_logic;
+signal done            : std_logic;
+
+signal numer_reg       : std_logic_vector(23 downto 0);
+signal status_reg      : std_logic_vector(1 downto 0);
+signal error_reg       : std_logic;
+
+signal trg_async       : std_logic;
+signal trg_sync        : std_logic;
+
+type state_t is (IDLE, WAIT1,WAIT2,WAIT3,WAIT4, FINISH);
+signal state           : state_t;
+
+type rdo_state_t is (RDO_IDLE, RDO_WRITE, RDO_FINISH);
+signal rdostate        : rdo_state_t;
+
+begin
+
+
+reg_MBS_IN <= MBS_IN when rising_edge(CLK_200);
+
+PROC_FIRST_BITS : process begin
+  wait until rising_edge(CLK_200);
+  if bitcnt > 32 and RESET_IN = '0' then
+    first_bits_fast <= '1';
+  else
+    first_bits_fast <= '0';
+  end if;
+end process;
+  
+first_bits_slow <= first_bits_fast when rising_edge(CLK);
+
+trg_async     <= not MBS_IN or trg_async when first_bits_fast = '1' else '0';
+trg_sync      <= not reg_MBS_IN or trg_sync when rising_edge(CLK) and first_bits_slow ='1' else '0';
+
+TRG_ASYNC_OUT <= trg_async;
+TRG_SYNC_OUT  <= trg_sync;
+
+PROC_FSM: process begin
+  wait until rising_edge(CLK_200);
+  case state is
+    when IDLE =>
+      bitcnt <= 37;
+      if reg_MBS_IN = '1' then
+        done  <= '0';
+        state <= WAIT1;
+      end if;
+    when WAIT1 =>
+      state <= WAIT2;
+    when WAIT2 =>
+      bitcnt <= bitcnt - 1;
+      shift_reg <= shift_reg(35 downto 1) & reg_MBS_IN;
+      state <= WAIT3;
+    when WAIT3 =>
+      if bitcnt = 0 then
+        state <= FINISH;
+      end if;
+      state <= WAIT4;
+    when WAIT4 =>
+      state <= WAIT1;
+    when FINISH =>
+      state <= IDLE;
+      done <= '1';
+  end case;
+  if RESET_IN = '1' then
+    state <= IDLE;
+    done <= '0';
+  end if;
+end process;
+
+PROC_REG_INFO : process begin
+  wait until rising_edge(CLK);
+  if done = '1' then
+    numer_reg <= shift_reg(31 downto 8);
+    status_reg <= shift_reg(7 downto 6);
+    if shift_reg(36 downto 32) = "01010" and shift_reg(4 downto 0) = "10101" and xor_all(31 downto 5) = '0' then
+      error_reg <= '0';
+    else
+      error_reg <= '1';
+    end if;
+  end if;
+end process;
+
+
+PROC_RDO : process begin
+  wait until rising_edge(CLK);
+  case rdostate is
+    when RDO_IDLE =>
+    when RDO_WRITE =>
+    when RDO_FINISH =>
+  end case;
+end process;
+
+end architecture;
\ No newline at end of file
diff --git a/base/trb3_periph_hub.lpf b/base/trb3_periph_hub.lpf
index 6071fee..177c22b 100644
--- a/base/trb3_periph_hub.lpf
+++ b/base/trb3_periph_hub.lpf
@@ -6,7 +6,7 @@ BLOCK RD_DURING_WR_PATHS ;
 # Basic Settings
 #################################################################
 
-  SYSCONFIG MCCLK_FREQ = 2.5;
+#   SYSCONFIG MCCLK_FREQ = 2.5;
 
   FREQUENCY PORT CLK_PCLK_RIGHT 200 MHz;
   FREQUENCY PORT CLK_PCLK_LEFT  200 MHz;