From: hadeshyp <hadeshyp>
Date: Fri, 28 Sep 2012 09:40:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a1c0581bc502d3caa272be7cdbff0def88169997;p=trb3.git

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

diff --git a/tdc_releases/tdc_v0.5/trb3_periph.vhd b/tdc_releases/tdc_v0.5/trb3_periph.vhd
index afc3b47..bca6314 100644
--- a/tdc_releases/tdc_v0.5/trb3_periph.vhd
+++ b/tdc_releases/tdc_v0.5/trb3_periph.vhd
@@ -580,11 +580,7 @@ begin
 
   THE_TDC : TDC
     generic map (
-<<<<<<< trb3_periph.vhd
       CHANNEL_NUMBER => 17,              -- Number of TDC channels
-=======
-      CHANNEL_NUMBER => 65,              -- Number of TDC channels
->>>>>>> 1.3
       STATUS_REG_NR  => REGIO_NUM_STAT_REGS,
       CONTROL_REG_NR => REGIO_NUM_CTRL_REGS)
     port map (
@@ -592,11 +588,7 @@ begin
       CLK_TDC               => CLK_PCLK_LEFT,  -- Clock used for the time measurement
       CLK_READOUT           => clk_100_i,   -- Clock for the readout
       REFERENCE_TIME        => timing_trg_received_i,   -- Reference time input
-<<<<<<< trb3_periph.vhd
       HIT_IN                => hit_in_i(16 downto 1),  -- Channel start signals
-=======
-      HIT_IN                => hit_in_i(64 downto 1),  -- Channel start signals
->>>>>>> 1.3
       TRG_WIN_PRE           => ctrl_reg(42 downto 32),  -- Pre-Trigger window width
       TRG_WIN_POST          => ctrl_reg(58 downto 48),  -- Post-Trigger window width
       --
diff --git a/tdc_test/compile_periph_frankfurt.pl b/tdc_test/compile_periph_frankfurt.pl
index 73b7418..33d8046 100755
--- a/tdc_test/compile_periph_frankfurt.pl
+++ b/tdc_test/compile_periph_frankfurt.pl
@@ -108,12 +108,8 @@ execute($c);
 my $tpmap = $TOPNAME . "_map" ;
 system("mv $TOPNAME.ncd guidefile.ncd");
 
-<<<<<<< compile_periph_frankfurt.pl
 #-g guidefile.ncd
 $c=qq|$lattice_path/ispfpga/bin/lin/map -retime -split_node -a $FAMILYNAME -p $DEVICENAME -t $PACKAGE -s $SPEEDGRADE "$TOPNAME.ngd" -o "$tpmap.ncd"  -mp "$TOPNAME.mrp" "$TOPNAME.lpf"|;
-=======
-$c=qq|$lattice_path/ispfpga/bin/lin/map -retime -split_node -a $FAMILYNAME -p $DEVICENAME -t $PACKAGE -s $SPEEDGRADE "$TOPNAME.ngd" -o "$tpmap.ncd"  -mp "$TOPNAME.mrp" "$TOPNAME.lpf"|;
->>>>>>> 1.2
 execute($c);