]> jspc29.x-matter.uni-frankfurt.de Git - tdc.git/commitdiff
A bit of cleanup in registers
authorJan Michel <j.michel@gsi.de>
Mon, 23 Jan 2017 16:18:18 +0000 (17:18 +0100)
committerJan Michel <j.michel@gsi.de>
Mon, 23 Jan 2017 16:18:18 +0000 (17:18 +0100)
.kateproject [new file with mode: 0644]
releases/tdc_v2.3/TDC_record.vhd

diff --git a/.kateproject b/.kateproject
new file mode 100644 (file)
index 0000000..56d683f
--- /dev/null
@@ -0,0 +1,4 @@
+{
+  "name": "TDC"
+, "files": [ { "git": 1 } ]
+}
index 2cc12130564c3b5dad79cf2fedea468c8f16d489..ccf3572330b22a13cfd7cbad3c7c600761d04c03 100644 (file)
@@ -675,8 +675,9 @@ begin
   status_registers_bus(0)(31 downto 28) <= busreadout_rx.trg_type when rising_edge(CLK_READOUT);
 
   -- debug info
-  status_registers_bus(1)(3 downto 0) <= trg_handler_status_registers(23 downto 20);
-  status_registers_bus(2)             <= trg_time(31 downto 0) when (trg_rdo = '1' and rising_edge(CLK_READOUT));
+  status_registers_bus(1)(3 downto  0) <= trg_handler_status_registers(23 downto 20);
+  status_registers_bus(1)(31 downto 4) <= (others => '0');
+  status_registers_bus(2)              <= trg_time(31 downto 0) when (trg_rdo = '1' and rising_edge(CLK_READOUT));
 
   -- trigger window
   status_registers_bus(3)(10 downto 0)  <= trg_win_pre;
@@ -686,21 +687,21 @@ begin
   status_registers_bus(3)(31)           <= trg_win_en;
 
   -- statistics
-  status_registers_bus(4)(23 downto 0)  <= readout_statistics(0);
-  status_registers_bus(5)(23 downto 0)  <= readout_statistics(1);
-  status_registers_bus(6)(23 downto 0)  <= readout_statistics(2);
-  status_registers_bus(7)(23 downto 0)  <= readout_statistics(3);
-  status_registers_bus(8)(23 downto 0)  <= readout_statistics(4);
-  status_registers_bus(9)(23 downto 0)  <= readout_statistics(5);
-  status_registers_bus(10)(23 downto 0) <= readout_statistics(6);
-  status_registers_bus(11)(23 downto 0) <= readout_statistics(7);
-  status_registers_bus(12)(23 downto 0) <= readout_statistics(8);
-  status_registers_bus(13)(23 downto 0) <= readout_statistics(9);
-  status_registers_bus(14)(23 downto 0) <= readout_statistics(10);
-  status_registers_bus(15)(23 downto 0) <= readout_statistics(11);
-  status_registers_bus(16)(23 downto 0) <= readout_statistics(12);
-  status_registers_bus(17)(23 downto 0) <= readout_statistics(13);
-  status_registers_bus(18)(23 downto 0) <= readout_statistics(14);
+  status_registers_bus(4)  <= x"00" & readout_statistics(0);
+  status_registers_bus(5)  <= x"00" & readout_statistics(1);
+  status_registers_bus(6)  <= x"00" & readout_statistics(2);
+  status_registers_bus(7)  <= x"00" & readout_statistics(3);
+  status_registers_bus(8)  <= x"00" & readout_statistics(4);
+  status_registers_bus(9)  <= x"00" & readout_statistics(5);
+  status_registers_bus(10) <= x"00" & readout_statistics(6);
+  status_registers_bus(11) <= x"00" & readout_statistics(7);
+  status_registers_bus(12) <= x"00" & readout_statistics(8);
+  status_registers_bus(13) <= x"00" & readout_statistics(9);
+  status_registers_bus(14) <= x"00" & readout_statistics(10);
+  status_registers_bus(15) <= x"00" & readout_statistics(11);
+  status_registers_bus(16) <= x"00" & readout_statistics(12);
+  status_registers_bus(17) <= x"00" & readout_statistics(13);
+  status_registers_bus(18) <= x"00" & readout_statistics(14);
 
 -- Channel debug
   TheChannelDebugBus : entity work.BusHandler_record