Skip to content

Commit

Permalink
Merge pull request #110 from DUNE-DAQ/prep-release/fddaq-v4.4.0
Browse files Browse the repository at this point in the history 
Prep release/fddaq v4.4.0
  • Loading branch information
@jcfreeman2
jcfreeman2 committed Apr 23, 2024
2 parents 8104dde + 03f8f3d commit cff0f27
Show file tree
Hide file tree
Showing 10 changed files with 146 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.12)
project(timing VERSION 7.7.0)
project(timing VERSION 7.7.3)

find_package(daq-cmake REQUIRED)

Expand Down
11 changes: 11 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_echo_mon.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<node id="pdts_echo_mon" description="Echo command monitor" fwinfo="endpoint" class="EchoMonitorNode">
<node id="csr" address="0x0" fwinfo="endpoint;width=1">
<node id="ctrl" address="0x0">
<node id="go" mask="0x1"/>
</node>
<node id="stat" address="0x1">
<node id="rx_done" mask="0x1"/>
<node id="deltat" mask="0xffff0000"/>
</node>
</node>
</node>
26 changes: 26 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_ep_mon.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<node id="ep_core" description="PDTS endpoint core wrapper" fwinfo="endpoint" class="EndpointNode">
<node id="csr" address="0x0" fwinfo="endpoint;width=1">
<node id="ctrl" address="0x0">
<node id="ep_en" mask="0x1"/>
<node id="ctr_rst" mask="0x2"/>
<node id="addr" mask="0xffff0000"/>
</node>
<node id="stat" address="0x1">
<node id="ep_stat" mask="0x0f"/>
<node id="ep_rdy" mask="0x10"/>
<node id="ep_txen" mask="0x20"/>
<node id="ctrs_rdy" mask="0x40"/>
</node>
</node>
<node id="tstamp" address="0x2" mode="block" size="0x2" fwinfo="endpoint;width=1"/>
<node id="cmd_ctrs" address="0x4" fwinfo="endpoint;width=1">
<node id="addr" address="0x0"/>
<node id="data" address="0x1" size="0x100" mode="port"/>
</node>
<node id="cmd_log" address="0x8" fwinfo="endpoint;width=2">
<node id="tstamp_l" address="0x0"/>
<node id="tstamp_h" address="0x1"/>
<node id="cmd" address="0x2"/>
</node>
<node id="dcmd_ctrs" address="0x10" mode="block" size="0x8" fwinfo="endpoint;width=3"/>
</node>
21 changes: 21 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_global.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<node id="pdts_global" description="PDTS master global registers" fwinfo="endpoint" class="MasterGlobalNode">
<node id="version" address="0x0" fwinfo="endpoint;width=0"/>
<node id="config" address="0x1" fwinfo="endpoint;width=0">
<node id="n_chan" mask="0xf0"/>
</node>
<node id="csr" address="0x2" fwinfo="endpoint;width=1">
<node id="ctrl" address="0x0">
<node id="resync" mask="0x1"/>
<node id="clr_ctrs" mask="0x2"/>
<node id="ts_en" mask="0x4"/>
<node id="resync_cdr" mask="0x8"/>
</node>
<node id="stat" address="0x1">
<node id="tx_err" mask="0x1"/>
<node id="rx_rdy" mask="0x2"/>
<node id="ctrs_rdy" mask="0x4"/>
<node id="ts_err" mask="0x8"/>
<node id="cdr_locked" mask="0x10"/>
</node>
</node>
</node>
24 changes: 24 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_master.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<node id="pdts_master" description="PDTS master block" fwinfo="endpoint" class="MasterNode">
<node id="global" address="0x0" module="file://pdts_global.xml"/>
<node id="acmd_buf" address="0x4" fwinfo="endpoint;width=2">
<node id="stat" address="0x0" permission="r">
<node id="ready" mask="0x1"/>
<node id="timeout" mask="0x2"/>
</node>
<node id="txbuf" address="0x2" mode="port" size="0x20" permission="w"/>
<node id="rxbuf" address="0x3" mode="port" size="0x20" permission="r"/>
</node>
<node id="cmd_log" address="0x8" fwinfo="endpoint;width=2">
<node id="tstamp_l" address="0x0"/>
<node id="tstamp_h" address="0x1"/>
<node id="cmd" address="0x2"/>
</node>
<node id="cmd_ctrs" address="0xc" fwinfo="endpoint;width=1">
<node id="addr" address="0x0"/>
<node id="data" address="0x1" size="0x100" mode="port"/>
</node>
<node id="echo_mon" address="0xe" module="file://pdts_echo_mon.xml"/>
<node id="tstamp" address="0x10" module="file://pdts_ts_source.xml"/>
<node id="scmd_gen" address="0x40" module="file://pdts_scmd_gen.xml"/>
</node>

17 changes: 17 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_scmd_gen.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<node id="scmd_gen" description="internal trigger generator" fwinfo="endpoint" class="FLCmdGeneratorNode">
<node id="ctrl" address="0x0" fwinfo="endpoint;width=0">
<node id="clr" mask="0x1"/>
<node id="force" mask="0x2"/>
</node>
<node id="sel" address="0x1" fwinfo="endpoint;width=0"/>
<node id="chan_ctrl" address="0x2" fwinfo="endpoint;width=0">
<node id="en" mask="0x1"/>
<node id="patt" mask="0x2"/>
<node id="type" mask="0xff00"/>
<node id="rate_div_p" mask="0xff0000"/>
<node id="rate_div_d" mask="0xf000000"/>
</node>
<node id="actrs" address="0x10" mode="block" size="0x10" fwinfo="endpoint;width=4"/>
<node id="rctrs" address="0x20" mode="block" size="0x10" fwinfo="endpoint;width=4"/>
</node>

19 changes: 19 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_sim_io.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<node id="io" description="SIM IO" fwinfo="endpoint" class="SIMIONode">
<node id="csr" address="0x0" description="ctrl/stat register" fwinfo="endpoint;width=1">
<node id="ctrl" address="0x0">
<node id="soft_rst" mask="0x1"/>
<node id="nuke" mask="0x2"/>
<node id="rst" mask="0x4"/>
</node>
<node id="stat" address="0x1">
<node id="locked" mask="0x10"/>
</node>
</node>
<node id="config" address="0x2" description="board/firmware config" fwinfo="endpoint;width=1">
<node id="no_cdr" mask="0xff000000"/>
<node id="board_type" mask="0xff0000"/>
<node id="carrier_type" mask="0xff00"/>
<node id="design_type" mask="0xff"/>
<node id="clock_frequency" address="0x1" mask="0xffffffff"/>
</node>
</node>
18 changes: 18 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/pdts_ts_source.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- https://dunescience.slack.com/archives/G01CH2K070X/p1684404277486259 -->

<node id="pdts_ts_source" description="Timestamp generator" fwinfo="endpoint" class="TimestampGeneratorNode">
<node id="csr" address="0x0" fwinfo="endpoint;width=1">
<node id="ctrl" address="0x0">
<node id="src" mask="0x1"/>
<node id="irigb_rst" mask="0x2"/>
</node>
<node id="stat" address="0x1">
<node id="irigb_lock" mask="0x1"/>
</node>
</node>
<node id="ctr" address="0x4" fwinfo="endpoint;width=2">
<node id="set" address="0x0" mode="block" size="0x2"/>
<node id="val" address="0x2" mode="block" size="0x2"/>
</node>
</node>

8 changes: 8 additions & 0 deletions config/etc/addrtab/v7xx/ouroboros_sim/top_sim.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<node id="TOP" class="OuroborosDesign">
<node id="io" address="0x0" module="file://pdts_sim_io.xml"/>
<node id="master" address="0x400" module="file://pdts_master.xml"/>
<node id="endpoint0" address="0x1000" module="file://pdts_ep_mon.xml"/>
<node id="endpoint1" address="0x1100" module="file://pdts_ep_mon.xml"/>
<node id="endpoint2" address="0x1200" module="file://pdts_ep_mon.xml"/>
<node id="endpoint3" address="0x1300" module="file://pdts_ep_mon.xml"/>
</node>
2 changes: 1 addition & 1 deletion include/timing/MasterNode.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class MasterNode : public MasterNodeInterface
uint32_t get_required_patch_firmware_version() const override { return required_patch_firmware_version; }

const static uint32_t required_major_firmware_version = 7;
const static uint32_t required_minor_firmware_version = 2;
const static uint32_t required_minor_firmware_version = 3;
const static uint32_t required_patch_firmware_version = 0;
private:
/**
Expand Down

0 comments on commit cff0f27

Please sign in to comment.