diff --git a/bam/templates/BAM.dmap b/bam/templates/BAM.dmap
index b154357609efcba922c6bbfedde096ad7430aa0f..023923a723257d2a1e47942a1664ef99fbbc1142 100644
--- a/bam/templates/BAM.dmap
+++ b/bam/templates/BAM.dmap
@@ -29,7 +29,7 @@ TIMER_RAW (doocs?facility=${getFacilityPrefix()}.SDIAG&device=TIMER&location
VERSION (logicalNameMap?map=versions.xlmap&target=BAM_DEVICE&targetMotor=${getMotorForStation(STATION)})
SDM_RAW (doocs?facility=${ACCELERATOR}.SDIAG&device=BAM.SDM_CONTROLLER&location=${STATION}&cacheFile=sdm.cache&updateCache=0)
SDM (logicalNameMap?map=sdm.xlmap)
-TMCB_RAW (subdevice?type=area&device=BAM_DEVICE&area=BOX.0.TMCB_SDIAG&map=sdiag_tmcb2_${tmcb_fw}.mapp)
+TMCB_RAW (subdevice?type=area&device=BAM_DEVICE&area=BOX.TMCB_SDIAG&map=sdiag_tmcb2_${tmcb_fw}.mapp)
%for i in range(1,4):
BCM_FT${i} (doocs?facility=${getFacilityPrefix()}.FEEDBACK&device=FT${i}.LONGITUDINAL&location=${BCM_LOCATION[STATION]}&cacheFile=bcm.cache&updateCache=0)
diff --git a/bam/templates/bambox.xlmap b/bam/templates/bambox.xlmap
index 9c9f9721701de13796d22d29bea65f5506a43397..b8de6178bb40cc2057786600a6b27f91a1090a0a 100644
--- a/bam/templates/bambox.xlmap
+++ b/bam/templates/bambox.xlmap
@@ -4,46 +4,46 @@
<module name="BamBox">
<redirectedRegister name="switchEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_PMF_ENA</targetRegister>
+ <targetRegister>APP.WORD_PMF_ENA</targetRegister>
</redirectedRegister>
<redirectedRegister name="switchDelay">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_TIMING_TRG_DEL</targetRegister>
+ <targetRegister>APP/WORD_TIMING_TRG_DEL</targetRegister>
<targetStartIndex>3</targetStartIndex>
<numberOfElements>3</numberOfElements>
</redirectedRegister>
<redirectedRegister name="switchPosition">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_PMF_SWITCH</targetRegister>
+ <targetRegister>APP.WORD_PMF_SWITCH</targetRegister>
</redirectedRegister>
</module>
<module name="Backplane">
<module name="Trigger">
<redirectedRegister name="count">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_MLVDS_TRG_CNT</targetRegister>
+ <targetRegister>APP/WORD_MLVDS_TRG_CNT</targetRegister>
</redirectedRegister>
</module>
</module>
<module name="Timing">
<redirectedRegister name="macropulse">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BEAM_MACROPULSE</targetRegister>
+ <targetRegister>APP/WORD_BEAM_MACROPULSE</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="delay">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BEAM_BUNCH_DELAY</targetRegister>
+ <targetRegister>APP/WORD_BEAM_BUNCH_DELAY</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="bunchCount">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BEAM_BUNCH_COUNT</targetRegister>
+ <targetRegister>APP/WORD_BEAM_BUNCH_COUNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="bunchPeriod">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BEAM_BUNCH_SPACING</targetRegister>
+ <targetRegister>APP/WORD_BEAM_BUNCH_SPACING</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
</module>
@@ -51,80 +51,80 @@
<module name="Health">
<redirectedRegister name="clkFreq">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_CLK_FREQ</targetRegister>
+ <targetRegister>APP/WORD_CLK_FREQ</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="clkInstabCnt">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_CLK_INSTAB_CNT</targetRegister>
+ <targetRegister>APP/WORD_CLK_INSTAB_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="trgAlignCnt">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_TRG_ALIGN_CNT</targetRegister>
+ <targetRegister>APP/WORD_BAM_TRG_ALIGN_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="macropulseCnt">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_MACROPULSE_CNT</targetRegister>
+ <targetRegister>APP/WORD_BAM_MACROPULSE_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="fmcPowerState">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0/WORD_POWER_STATE</targetRegister>
+ <targetRegister>BAM/WORD_POWER_STATE</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="bcmCrcErrCnt">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BCM_CRC_ERR_CNT</targetRegister>
+ <targetRegister>APP/WORD_BCM_CRC_ERR_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="bcmPacketCnt">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BCM_PACKET_CNT</targetRegister>
+ <targetRegister>APP/WORD_BCM_PACKET_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="bcmMissedCnt">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BCM_MISSED_CNT</targetRegister>
+ <targetRegister>APP/WORD_BCM_MISSED_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
</module>
<module name="Settings">
<redirectedRegister name="attenuators">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0/WORD_ATTENUATORS</targetRegister>
+ <targetRegister>BAM/WORD_ATTENUATORS</targetRegister>
</redirectedRegister>
<redirectedRegister name="nUnmodulatedAvg">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_UNM_AVG_NUM</targetRegister>
+ <targetRegister>APP/WORD_BAM_UNM_AVG_NUM</targetRegister>
</redirectedRegister>
<redirectedRegister name="unmodulatedAvgOffset">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_UNM_AVG_OFFSET</targetRegister>
+ <targetRegister>APP/WORD_BAM_UNM_AVG_OFFSET</targetRegister>
</redirectedRegister>
<redirectedRegister name="backplaneTriggerChannel">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_MLVDS_TRG_SEL</targetRegister>
+ <targetRegister>APP/WORD_MLVDS_TRG_SEL</targetRegister>
<plugin name="typeHintModifier">
<parameter name="type">integer</parameter>
</plugin>
</redirectedRegister>
<redirectedRegister name="firmwareRevision">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_REVISION</targetRegister>
+ <targetRegister>APP/WORD_REVISION</targetRegister>
</redirectedRegister>
<redirectedRegister name="lllInvalid">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_LLL_INVALID</targetRegister>
+ <targetRegister>APP/WORD_BAM_LLL_INVALID</targetRegister>
</redirectedRegister>
<redirectedRegister name="bcmLatency">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BCM_LATENCY</targetRegister>
+ <targetRegister>APP/WORD_BCM_LATENCY</targetRegister>
</redirectedRegister>
<redirectedRegister name="feedbackChannel">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_LLL_TX_CH_SEL</targetRegister>
+ <targetRegister>APP/WORD_BAM_LLL_TX_CH_SEL</targetRegister>
<plugin name="typeHintModifier">
<parameter name="type">integer</parameter>
</plugin>
@@ -136,7 +136,7 @@
<module name="Modulated">
<redirectedChannel name="base">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>0</targetChannel>
</redirectedChannel>
</module>
@@ -144,33 +144,33 @@
<module name="Unmodulated">
<redirectedChannel name="base">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>3</targetChannel>
</redirectedChannel>
<redirectedChannel name="peak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>4</targetChannel>
</redirectedChannel>
<redirectedChannel name="pulse">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>5</targetChannel>
</redirectedChannel>
</module>
<redirectedChannel name="arrivalTime">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>6</targetChannel>
</redirectedChannel>
<redirectedChannel name="bunchCounter">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>7</targetChannel>
</redirectedChannel>
<redirectedChannel name="patternFlags">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>15</targetChannel>
</redirectedChannel>
</module>
@@ -180,17 +180,17 @@
<module name="Modulated">
<redirectedChannel name="base">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>8</targetChannel>
</redirectedChannel>
<redirectedChannel name="peak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>9</targetChannel>
</redirectedChannel>
<redirectedChannel name="relativePulse">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>10</targetChannel>
</redirectedChannel>
</module>
@@ -198,28 +198,28 @@
<module name="Unmodulated">
<redirectedChannel name="base">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>11</targetChannel>
</redirectedChannel>
<redirectedChannel name="peak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>12</targetChannel>
</redirectedChannel>
<redirectedChannel name="relativePulse">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>13</targetChannel>
</redirectedChannel>
</module>
<redirectedChannel name="arrivalTime">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>14</targetChannel>
</redirectedChannel>
<redirectedChannel name="bunchCounter">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/DAQ0_BAM</targetRegister>
+ <targetRegister>DAQ/DAQ0_BAM</targetRegister>
<targetChannel>15</targetChannel>
</redirectedChannel>
</module>
@@ -227,15 +227,15 @@
<module name="Delays">
<redirectedRegister name="channels">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_TRG_DELAY</targetRegister>
+ <targetRegister>APP/WORD_BAM_TRG_DELAY</targetRegister>
</redirectedRegister>
<redirectedRegister name="macroPulse">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_BAM_MACROPULSE_DEL</targetRegister>
+ <targetRegister>APP/WORD_BAM_MACROPULSE_DEL</targetRegister>
</redirectedRegister>
<redirectedRegister name="triggers">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/WORD_TIMING_TRG_DEL</targetRegister>
+ <targetRegister>APP/WORD_TIMING_TRG_DEL</targetRegister>
<targetStartIndex>0</targetStartIndex>
<numberOfElements>3</numberOfElements>
</redirectedRegister>
@@ -273,44 +273,44 @@
<module name="LowCharge">
<redirectedChannel name="peak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/RAW_ADC</targetRegister>
+ <targetRegister>DAQ/RAW_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc0Peak</ref></targetChannel>
</redirectedChannel>
<redirectedChannel name="base">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/RAW_ADC</targetRegister>
+ <targetRegister>DAQ/RAW_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc0Base</ref></targetChannel>
</redirectedChannel>
<redirectedChannel name="prePeak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/PRE_ADC</targetRegister>
+ <targetRegister>DAQ/PRE_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc0Peak</ref></targetChannel>
</redirectedChannel>
<redirectedChannel name="preBase">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/PRE_ADC</targetRegister>
+ <targetRegister>DAQ/PRE_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc0Base</ref></targetChannel>
</redirectedChannel>
</module> <!-- module LowCharge -->
<module name="HighCharge">
<redirectedChannel name="peak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/RAW_ADC</targetRegister>
+ <targetRegister>DAQ/RAW_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc2Peak</ref></targetChannel>
</redirectedChannel>
<redirectedChannel name="base">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/RAW_ADC</targetRegister>
+ <targetRegister>DAQ/RAW_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc2Base</ref></targetChannel>
</redirectedChannel>
<redirectedChannel name="prePeak">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/PRE_ADC</targetRegister>
+ <targetRegister>DAQ/PRE_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc2Peak</ref></targetChannel>
</redirectedChannel>
<redirectedChannel name="preBase">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/PRE_ADC</targetRegister>
+ <targetRegister>DAQ/PRE_ADC</targetRegister>
<targetChannel><ref>/Adc/Raw/Offsets/adc2Base</ref></targetChannel>
</redirectedChannel>
</module> <!-- module HighCharge -->
diff --git a/bam/templates/dsbam.xlmap b/bam/templates/dsbam.xlmap
index e020745a656c2418a1e95a4d14b2a82a675caf23..bc6eb7b89947862f51bc703d79f028ace0b712cc 100644
--- a/bam/templates/dsbam.xlmap
+++ b/bam/templates/dsbam.xlmap
@@ -4,33 +4,33 @@
<module name="DAQDel">
<redirectedRegister name="enableChannels">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>DAQ.0.WORD_ENABLE</targetRegister>
+ <targetRegister>DAQ.WORD_ENABLE</targetRegister>
</redirectedRegister>
</module>
<module name="BAMDel">
<redirectedRegister name="rampEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_RAMP_ENA</targetRegister>
+ <targetRegister>BAM.WORD_RAMP_ENA</targetRegister>
</redirectedRegister>
<redirectedRegister name="patternEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_PATTERN_ENA</targetRegister>
+ <targetRegister>BAM.WORD_PATTERN_ENA</targetRegister>
</redirectedRegister>
<redirectedRegister name="triggerPhaseCount">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_TRG_PHASE_CNT</targetRegister>
+ <targetRegister>BAM.WORD_TRG_PHASE_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
</module>
<module name="BAMTrg">
<redirectedRegister name="triggerPhaseCount">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_TRG_PHASE_CNT</targetRegister>
+ <targetRegister>BAM.WORD_TRG_PHASE_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="triggerEdgeSelect">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_TRG_EDGE_SEL</targetRegister>
+ <targetRegister>BAM.WORD_TRG_EDGE_SEL</targetRegister>
<plugin name="typeHintModifier">
<parameter name="type">integer</parameter>
</plugin>
@@ -39,12 +39,12 @@
<module name="BAMSync">
<redirectedRegister name="triggerPhaseCount">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_TRG_PHASE_CNT</targetRegister>
+ <targetRegister>BAM.WORD_TRG_PHASE_CNT</targetRegister>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="triggerEdgeSelect">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_TRG_EDGE_SEL</targetRegister>
+ <targetRegister>BAM.WORD_TRG_EDGE_SEL</targetRegister>
<plugin name="typeHintModifier">
<parameter name="type">integer</parameter>
</plugin>
@@ -58,7 +58,7 @@
<module name="TimingSync">
<redirectedRegister name="softwareTrigger">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_TIMING_INT_SW_TRG</targetRegister>
+ <targetRegister>APP.WORD_TIMING_INT_SW_TRG</targetRegister>
<plugin name="monostableTrigger">
<parameter name="milliseconds">10</parameter>
</plugin>
@@ -67,62 +67,62 @@
<module name="TimingDel">
<redirectedRegister name="softwareTrigger">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_TIMING_INT_SW_TRG</targetRegister>
+ <targetRegister>APP.WORD_TIMING_INT_SW_TRG</targetRegister>
<plugin name="monostableTrigger">
<parameter name="milliseconds">10</parameter>
</plugin>
</redirectedRegister>
<redirectedRegister name="softwareTriggerValue">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_TIMING_INT_SW_TRG</targetRegister>
+ <targetRegister>APP.WORD_TIMING_INT_SW_TRG</targetRegister>
</redirectedRegister>
<redirectedRegister name="internalPeriod">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_TIMING_INT_PERIOD</targetRegister>
+ <targetRegister>APP.WORD_TIMING_INT_PERIOD</targetRegister>
</redirectedRegister>
<redirectedRegister name="internalTriggerEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_TIMING_INT_ENA</targetRegister>
+ <targetRegister>APP.WORD_TIMING_INT_ENA</targetRegister>
</redirectedRegister>
<redirectedRegister name="triggerEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_TIMING_TRG_ENA</targetRegister>
+ <targetRegister>APP.WORD_TIMING_TRG_ENA</targetRegister>
</redirectedRegister>
</module>
<module name="AppDel">
<redirectedRegister name="reset">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_RESET_N</targetRegister>
+ <targetRegister>APP.WORD_RESET_N</targetRegister>
</redirectedRegister>
</module>
<module name="AppTrg">
<redirectedRegister name="reset">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_RESET_N</targetRegister>
+ <targetRegister>APP.WORD_RESET_N</targetRegister>
</redirectedRegister>
</module>
<module name="AppSync">
<redirectedRegister name="reset">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0.WORD_RESET_N</targetRegister>
+ <targetRegister>APP.WORD_RESET_N</targetRegister>
</redirectedRegister>
</module>
<module name="SpiDel">
<redirectedRegister name="deviceSelect">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_SPI_SEL</targetRegister>
+ <targetRegister>BAM.WORD_SPI_SEL</targetRegister>
</redirectedRegister>
<module name="PllControl">
<redirectedRegister name="syncEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_PLL_SYNC_ENA</targetRegister>
+ <targetRegister>BAM.WORD_PLL_SYNC_ENA</targetRegister>
<plugin name="monostableTrigger">
<parameter name="milliseconds">500</parameter>
</plugin>
</redirectedRegister>
<redirectedRegister name="updateAllRegisters">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x232 -->
<targetStartIndex>562</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -132,19 +132,19 @@
<module name="SpiTrg">
<redirectedRegister name="deviceSelect">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_SPI_SEL</targetRegister>
+ <targetRegister>BAM.WORD_SPI_SEL</targetRegister>
</redirectedRegister>
<module name="PllControl">
<redirectedRegister name="syncEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_PLL_SYNC_ENA</targetRegister>
+ <targetRegister>BAM.WORD_PLL_SYNC_ENA</targetRegister>
<plugin name="monostableTrigger">
<parameter name="milliseconds">500</parameter>
</plugin>
</redirectedRegister>
<redirectedRegister name="updateAllRegisters">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x232 -->
<targetStartIndex>562</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -154,19 +154,19 @@
<module name="SpiSync">
<redirectedRegister name="deviceSelect">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_SPI_SEL</targetRegister>
+ <targetRegister>BAM.WORD_SPI_SEL</targetRegister>
</redirectedRegister>
<module name="PllControl">
<redirectedRegister name="syncEnable">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.WORD_PLL_SYNC_ENA</targetRegister>
+ <targetRegister>BAM.WORD_PLL_SYNC_ENA</targetRegister>
<plugin name="monostableTrigger">
<parameter name="milliseconds">500</parameter>
</plugin>
</redirectedRegister>
<redirectedRegister name="updateAllRegisters">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x232 -->
<targetStartIndex>562</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -176,27 +176,27 @@
<module name="ConfigDel">
<redirectedRegister name="chipPortConfig">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<targetStartIndex>0</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="deviceUpdate">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0xFF -->
<targetStartIndex>255</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="outputMode">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x14 -->
<targetStartIndex>20</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="outputPhase">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x16 -->
<targetStartIndex>22</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -205,14 +205,14 @@
<module name="ConfigReadbackDel">
<redirectedRegister name="chipPortConfig">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<targetStartIndex>0</targetStartIndex>
<numberOfElements>1</numberOfElements>
<plugin name="forceReadOnly" />
</redirectedRegister>
<redirectedRegister name="deviceUpdate">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0xFF -->
<targetStartIndex>255</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -220,7 +220,7 @@
</redirectedRegister>
<redirectedRegister name="outputMode">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x14 -->
<targetStartIndex>20</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -228,7 +228,7 @@
</redirectedRegister>
<redirectedRegister name="outputPhase">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x16 -->
<targetStartIndex>22</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -238,21 +238,21 @@
<module name="PllDel">
<redirectedRegister name="phaseOffsetDivider4">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x19f -->
<targetStartIndex>415</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="out8DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0a8 -->
<targetStartIndex>168</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="out9DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0ab -->
<targetStartIndex>171</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -261,21 +261,21 @@
<module name="PllTrg">
<redirectedRegister name="phaseOffsetDivider4">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x19f -->
<targetStartIndex>415</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="out8DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0a8 -->
<targetStartIndex>168</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="out9DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0ab -->
<targetStartIndex>171</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -284,21 +284,21 @@
<module name="PllSync">
<redirectedRegister name="phaseOffsetDivider4">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x19f -->
<targetStartIndex>415</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="out8DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0a8 -->
<targetStartIndex>168</targetStartIndex>
<numberOfElements>1</numberOfElements>
</redirectedRegister>
<redirectedRegister name="out9DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0ab -->
<targetStartIndex>171</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -307,7 +307,7 @@
<module name="PllReadBackDel">
<redirectedRegister name="phaseOffsetDivider4">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x19f -->
<targetStartIndex>415</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -315,7 +315,7 @@
</redirectedRegister>
<redirectedRegister name="out8DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0a8 -->
<targetStartIndex>168</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -323,7 +323,7 @@
</redirectedRegister>
<redirectedRegister name="out9DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0ab -->
<targetStartIndex>171</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -333,7 +333,7 @@
<module name="PllReadBackTrg">
<redirectedRegister name="phaseOffsetDivider4">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x19f -->
<targetStartIndex>415</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -341,7 +341,7 @@
</redirectedRegister>
<redirectedRegister name="out8DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0a8 -->
<targetStartIndex>168</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -349,7 +349,7 @@
</redirectedRegister>
<redirectedRegister name="out9DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0ab -->
<targetStartIndex>171</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -359,7 +359,7 @@
<module name="PllReadBackSync">
<redirectedRegister name="phaseOffsetDivider4">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x19f -->
<targetStartIndex>415</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -367,7 +367,7 @@
</redirectedRegister>
<redirectedRegister name="out8DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0a8 -->
<targetStartIndex>168</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -375,7 +375,7 @@
</redirectedRegister>
<redirectedRegister name="out9DelayFraction">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>BAM.0.AREA_SPI</targetRegister>
+ <targetRegister>BAM.AREA_SPI</targetRegister>
<!-- offset 0x0ab -->
<targetStartIndex>171</targetStartIndex>
<numberOfElements>1</numberOfElements>
@@ -386,13 +386,13 @@
<module name="Pre">
<redirectedChannel name="0">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/PRE_ADC</targetRegister>
+ <targetRegister>DAQ/PRE_ADC</targetRegister>
<targetChannel>0</targetChannel>
<plugin name="forceReadOnly" />
</redirectedChannel>
<redirectedChannel name="1">
<targetDevice>BAM_DEVICE</targetDevice>
- <targetRegister>APP.0/PRE_ADC</targetRegister>
+ <targetRegister>DAQ/PRE_ADC</targetRegister>
<targetChannel>1</targetChannel>
<plugin name="forceReadOnly" />
</redirectedChannel>
diff --git a/bam/templates/sdiag_bam_fmc25_default_1.4.0-4-g1a808152.mapp b/bam/templates/sdiag_bam_fmc25_default_1.4.0-4-g1a808152.mapp
new file mode 100644
index 0000000000000000000000000000000000000000..7e696c08f111e9808442a18ea5bcf4e77b70066e
--- /dev/null
+++ b/bam/templates/sdiag_bam_fmc25_default_1.4.0-4-g1a808152.mapp
@@ -0,0 +1,187 @@
+@MAPFILE_REVISION 1.4.0-4-g1a808152
+BSP.WORD_ID 1 0x00000000 4 0 32 0 0 RO
+ch0_top.BSP 524288 0x00000000 2097152 0 32 0 0 RW
+BSP.WORD_VERSION 1 0x00000004 4 0 32 0 0 RO
+BSP.WORD_PRJ_ID 1 0x00000008 4 0 32 0 0 RO
+BSP.WORD_PRJ_VERSION 1 0x0000000C 4 0 32 0 0 RO
+BSP.WORD_PRJ_SHASUM 1 0x00000010 4 0 32 0 0 RO
+BSP.WORD_PRJ_TIMESTAMP 1 0x00000014 4 0 32 0 0 RO
+BSP.WORD_USER 1 0x00000018 4 0 32 0 0 RW
+BSP.WORD_STATUS 1 0x0000001C 4 0 32 0 0 RO
+BSP.WORD_CLK_FREQ 10 0x00000020 40 0 32 0 0 RW
+BSP.WORD_LLL_STATUS 12 0x000000C0 48 0 32 0 0 RO
+BSP.WORD_LLL_LOOPBACK 12 0x00000100 48 0 3 0 0 RW
+BSP.BIT_RTM_MGT_CLK_ENA 1 0x00000150 4 0 1 0 0 RW
+BSP.WORD_BOOT_STATUS 1 0x00000180 4 0 1 0 0 RW
+BSP.WORD_RESET_N 1 0x00000200 4 0 1 0 0 RW
+BSP.WORD_RESET_GTP 1 0x00000204 4 0 13 0 0 RW
+BSP.WORD_RESET_S6 1 0x00000208 4 0 1 0 0 RW
+BSP.FCM 2073 0x00010000 8292 0 32 0 0 RW
+FCM.AREA_WRITE 1024 0x00010000 4096 0 8 0 0 RW
+FCM.AREA_READ 1024 0x00011000 4096 0 8 0 0 RW
+FCM.WORD_SPI_DIVIDER 1 0x00012000 4 0 16 0 0 RW
+FCM.WORD_BYTES_TO_WRITE 1 0x0001200C 4 0 16 0 0 RW
+FCM.WORD_BYTES_TO_READ 1 0x00012010 4 0 16 0 0 RW
+FCM.WORD_CONTROL 1 0x00012014 4 0 8 0 0 RW
+FCM.WORD_TCK 1 0x00012018 4 0 1 0 0 RW
+FCM.WORD_TMS 1 0x0001201C 4 0 1 0 0 RW
+FCM.WORD_TDI 1 0x00012020 4 0 1 0 0 RW
+FCM.WORD_TDO 1 0x00012024 4 0 1 0 0 RO
+FCM.WORD_MAGIC 1 0x00012038 4 0 32 0 0 RO
+FCM.WORD_REV_SWITCH 1 0x0001203C 4 0 32 0 0 RW
+FCM.WORD_REV_SEL 1 0x00012040 4 0 2 0 0 RW
+FCM.WORD_CRC_ERROR 1 0x00012044 4 0 1 0 0 RO
+FCM.WORD_CRC_ERROR_CNT 1 0x00012048 4 0 32 0 0 RO
+FCM.WORD_ECC_ERROR_CNT 1 0x0001204C 4 0 32 0 0 RO
+FCM.WORD_ECC_SYNDROME 1 0x00012060 4 0 13 0 0 RO
+BSP.BSP_FMC25_S6 262144 0x00100000 1048576 0 32 0 0 RW
+APP.WORD_FIRMWARE 1 0x00000000 4 1 32 0 0 RO
+ch1_top.APP 524288 0x00000000 2097152 1 32 0 0 RW
+APP.WORD_REVISION 1 0x00000004 4 1 32 0 0 RO
+APP.WORD_TIMESTAMP 1 0x00000008 4 1 32 0 0 RO
+APP.WORD_RESET_N 1 0x0000000C 4 1 1 0 0 RW
+APP.WORD_CLK_FREQ 3 0x00000040 12 1 32 0 0 RO
+APP.WORD_CLK_INSTAB_CNT 1 0x00000060 4 1 32 0 0 RO
+APP.WORD_MLVDS_TRG_SEL 1 0x00000080 4 1 1 0 0 RW
+APP.WORD_MLVDS_TRG_CNT 1 0x00000084 4 1 32 0 0 RO
+APP.WORD_TIMING_INT_ENA 1 0x0000008C 4 1 1 0 0 RW
+APP.WORD_TIMING_INT_PERIOD 1 0x00000090 4 1 32 0 0 RW
+APP.WORD_TIMING_INT_SW_TRG 1 0x00000094 4 1 1 0 0 RW
+APP.WORD_TIMING_TRG_ENA 1 0x00000098 4 1 6 0 0 RW
+APP.WORD_TIMING_TRG_DEL 6 0x000000A0 24 1 32 0 0 RW
+APP.WORD_TIMING_CNT 6 0x000000C0 24 1 32 0 0 RO
+APP.WORD_DAQ_DATA_RDY 1 0x000000E4 4 1 1 0 0 RO
+APP.WORD_DAQ_DATA_RDY_CLR 1 0x000000E8 4 1 1 0 0 RW
+APP.WORD_BAM_TRG_DELAY 2 0x00000100 8 1 2 0 0 RW
+APP.WORD_BAM_TRG_ALIGN 2 0x00000108 8 1 2 0 0 RO
+APP.WORD_BAM_TRG_ALIGN_CNT 1 0x00000110 4 1 32 0 0 RO
+APP.WORD_BAM_TRG_ERR_CNT 1 0x00000114 4 1 32 0 0 RO
+APP.WORD_BAM_MACROPULSE_DEL 1 0x00000118 4 1 32 0 0 RW
+APP.WORD_BAM_MACROPULSE_CNT 1 0x0000011C 4 1 32 0 0 RO
+APP.WORD_BAM_FLT_ENA 1 0x00000120 4 1 4 0 0 RW
+APP.WORD_BAM_FLT_DEL 4 0x00000124 16 1 16 0 0 RW
+APP.WORD_BAM_FLT_CNT 4 0x00000134 16 1 32 0 0 RO
+APP.WORD_BAM_FLT_BUNCH_NUM 4 0x00000144 16 1 16 0 0 RW
+APP.WORD_BAM_FLT_BUNCH_PERIOD 4 0x00000154 16 1 16 0 0 RW
+APP.WORD_BAM_UNM_AVG_NUM 1 0x00000164 4 1 5 0 0 RW
+APP.WORD_BAM_UNM_AVG_OFFSET 1 0x00000168 4 1 5 0 0 RW
+APP.WORD_BAM_BUNCH_CNT 1 0x0000016C 4 1 16 0 0 RO
+APP.WORD_BAM_LLL_TX_CH_SEL 1 0x00000170 4 1 32 0 0 RW
+APP.WORD_BAM_LLL_INVALID 1 0x00000180 4 1 3 0 0 RW
+APP.WORD_BAM_LLL_PAT_ENA 1 0x00000184 4 1 2 0 0 RW
+APP.WORD_BAM_LLL_RAMP_ENA 1 0x00000188 4 1 1 0 0 RW
+APP.WORD_BCM_LATENCY 1 0x0000018C 4 1 8 0 0 RW
+APP.WORD_BCM_CRC_ERR_CNT 1 0x00000190 4 1 32 0 0 RO
+APP.WORD_BCM_PACKET_CNT 1 0x00000194 4 1 32 0 0 RO
+APP.WORD_BCM_MISSED_CNT 1 0x00000198 4 1 32 0 0 RO
+APP.WORD_BCM_CHECK_CONF 1 0x0000019C 4 1 5 0 0 RW
+APP.WORD_BCM_HEADER_ERR_CNT 1 0x000001A0 4 1 32 0 0 RO
+APP.WORD_BCM_PATTERN_ERR_CNT 1 0x000001A4 4 1 32 0 0 RO
+APP.WORD_PMF_ENA 1 0x000001A8 4 1 3 0 0 RW
+APP.WORD_PMF_SWITCH 1 0x000001AC 4 1 3 0 0 RW
+APP.WORD_BEAM_MACROPULSE 2 0x00000200 8 1 32 0 0 RO
+APP.WORD_BEAM_BUNCH_DELAY 16 0x00000208 64 1 13 0 0 RO
+APP.WORD_BEAM_BUNCH_COUNT 16 0x00000248 64 1 13 0 0 RO
+APP.WORD_BEAM_BUNCH_SPACING 16 0x00000288 64 1 8 0 0 RO
+APP.DAQ 5120 0x00008000 20480 1 32 0 0 RW
+DAQ.WORD_ID 1 0x00008000 4 1 32 0 0 RO
+DAQ.WORD_VERSION 1 0x00008004 4 1 32 0 0 RO
+DAQ.WORD_ENABLE 1 0x00008008 4 1 3 0 0 RW
+DAQ.WORD_MUX_SEL 3 0x00008010 12 1 8 0 0 RW
+DAQ.WORD_STROBE_DIV 3 0x0000801C 12 1 32 0 0 RW
+DAQ.WORD_STROBE_COUNT 3 0x00008028 12 1 32 0 0 RO
+DAQ.WORD_SAMPLES 3 0x00008034 12 1 32 0 0 RW
+DAQ.WORD_DUB_BUF_ENA 3 0x00008040 12 1 1 0 0 RW
+DAQ.WORD_DUB_BUF_CURR 3 0x0000804C 12 1 1 0 0 RO
+DAQ.WORD_DUB_BUF_PNUM 3 0x00008058 12 1 32 0 0 RO
+DAQ.WORD_FIFO_STATUS 3 0x00008064 12 1 32 0 0 RO
+DAQ.WORD_SENT_BURST_CNT 3 0x00008070 12 1 32 0 0 RO
+DAQ.WORD_TRG_DELAY_VAL 3 0x0000807C 12 1 32 0 0 RW
+DAQ.WORD_TRG_DELAY_ENA 3 0x00008088 12 1 1 0 0 RW
+DAQ.WORD_TRG_CNT_BUF0 3 0x00008094 12 1 16 0 0 RO
+DAQ.WORD_TRG_CNT_BUF1 3 0x000080A0 12 1 16 0 0 RO
+DAQ.WORD_TIMESTAMP_RST 3 0x000080AC 12 1 1 0 0 RW
+DAQ.AREA_DAQ_TIMES_0 1024 0x00009000 4096 1 32 0 0 RO
+DAQ.AREA_DAQ_TIMES_1 1024 0x0000A000 4096 1 32 0 0 RO
+DAQ.AREA_DAQ_TIMES_2 1024 0x0000C000 4096 1 32 0 0 RO
+APP.BAM 5120 0x00010000 20480 1 32 0 0 RW
+BAM.WORD_FIRMWARE 1 0x00010000 4 1 32 0 0 RO
+BAM.WORD_REVISION 1 0x00010004 4 1 32 0 0 RO
+BAM.WORD_SPI_SEL 1 0x00010080 4 1 3 0 0 RW
+BAM.WORD_SPI_BUSY 1 0x00010084 4 1 1 0 0 RO
+BAM.WORD_PLL_RESET 1 0x00010088 4 1 1 0 0 RW
+BAM.WORD_PLL_SYNC_ENA 1 0x0001008C 4 1 1 0 0 RW
+BAM.WORD_PLL_IODELAY 1 0x00010090 4 1 6 0 0 RW
+BAM.WORD_PLL_STATUS 1 0x00010094 4 1 4 0 0 RO
+BAM.WORD_PLL_STATUS_CLR 1 0x00010098 4 1 1 0 0 RW
+BAM.WORD_TRG_EDGE_SEL 2 0x000100C0 8 1 1 0 0 RW
+BAM.WORD_TRG_PHASE 2 0x000100C8 8 1 1 0 0 RO
+BAM.WORD_TRG_PHASE_CNT 4 0x000100D0 16 1 32 0 0 RO
+BAM.WORD_DATA_IODELAY 1 0x000100E0 4 1 6 0 0 RW
+BAM.WORD_PN23_CHK_ENA 1 0x000100E4 4 1 4 0 0 RW
+BAM.WORD_PN23_ERR_CNT 4 0x000100E8 16 1 32 0 0 RO
+BAM.WORD_RAMP_ENA 1 0x000100F8 4 1 4 0 0 RW
+BAM.WORD_PATTERN_ENA 1 0x000100FC 4 1 2 0 0 RW
+BAM.WORD_PATTERN_TRG 1 0x00010100 4 1 1 0 0 RW
+BAM.WORD_SFP_DISABLE 1 0x00010104 4 1 2 0 0 RW
+BAM.WORD_SFP_STATE 2 0x00010108 8 1 3 0 0 RO
+BAM.WORD_POWER_DOWN 1 0x00010140 4 1 1 0 0 RW
+BAM.WORD_POWER_STATE 1 0x00010144 4 1 2 0 0 RO
+BAM.WORD_LED 1 0x00010148 4 1 2 0 0 RW
+BAM.WORD_ATTENUATORS 2 0x0001014C 8 1 3 0 0 RW
+BAM.WORD_FMC_REV 1 0x00010154 4 1 1 0 0 RW
+BAM.AREA_SPI 1024 0x00011000 4096 1 8 0 0 RW
+BAM.AREA_PATTERN_CH0 1024 0x00012000 4096 1 32 0 0 RW
+BAM.AREA_PATTERN_CH1 1024 0x00013000 4096 1 32 0 0 RW
+BAM.AREA_PATTERN_FLAGS 1024 0x00014000 4096 1 6 0 0 RW
+APP.X2TSDR 16384 0x00020000 65536 1 32 0 0 RW
+X2TSDR.WORD_ID 1 0x00020000 4 1 32 0 0 RO
+X2TSDR.WORD_VERSION 1 0x00020004 4 1 32 0 0 RO
+X2TSDR.WORD_ERROR_COUNT 1 0x00020008 4 1 32 0 0 RW
+X2TSDR.WORD_MACROPULSE_L 1 0x00020020 4 1 32 0 0 RO
+X2TSDR.WORD_MACROPULSE_H 1 0x00020024 4 1 32 0 0 RO
+X2TSDR.WORD_TIMESTAMP_L 1 0x00020028 4 1 32 0 0 RO
+X2TSDR.WORD_TIMESTAMP_H 1 0x0002002C 4 1 32 0 0 RO
+X2TSDR.WORD_BUNCH_DEST_MASK 1 0x00020030 4 1 16 0 0 RW
+X2TSDR.DEBUG_TABLE_ENA 1 0x00020034 4 1 1 0 0 RW
+X2TSDR.DEBUG_TABLE 8192 0x00028000 32768 1 32 0 0 RO
+APP.BOX 262144 0x00100000 1048576 1 32 0 0 RW
+BOX.WORD_FIRMWARE 1 0x00100000 4 1 32 0 0 RO
+BOX.WORD_VERSION 1 0x00100004 4 1 32 0 0 RO
+BOX.TMCB_SDIAG 131072 0x00180000 524288 1 32 0 0 RW
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM 131072 0x00000000 524288 13 32 0 0 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch0 1 0x00000000 4 13 32 0 1 RO
+ch13_top.DAQ 272384 0x00000000 1089536 13 32 0 0 RW
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch1 1 0x00000004 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch2 1 0x00000008 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch3 1 0x0000000C 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch4 1 0x00000010 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch5 1 0x00000014 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch6 1 0x00000018 4 13 32 24 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch7 1 0x0000001C 4 13 32 0 0 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch8 1 0x00000020 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch9 1 0x00000024 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch10 1 0x00000028 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch11 1 0x0000002C 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch12 1 0x00000030 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch13 1 0x00000034 4 13 32 0 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch14 1 0x00000038 4 13 32 24 1 RO
+DAQ.MEM_MULTIPLEXED_DAQ0_BAM.ch15 1 0x0000003C 4 13 32 0 0 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC 4096 0x00100000 16384 13 32 0 0 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch0 1 0x00100000 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch1 1 0x00100002 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch2 1 0x00100004 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch3 1 0x00100006 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch4 1 0x00100008 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch5 1 0x0010000A 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch6 1 0x0010000C 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_RAW_ADC.ch7 1 0x0010000E 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC 2048 0x00108000 8192 13 32 0 0 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch0 1 0x00108000 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch1 1 0x00108002 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch2 1 0x00108004 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch3 1 0x00108006 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch4 1 0x00108008 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch5 1 0x0010800A 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch6 1 0x0010800C 2 13 16 0 1 RO
+DAQ.MEM_MULTIPLEXED_PRE_ADC.ch7 1 0x0010800E 2 13 16 0 1 RO
diff --git a/bam/templates/versions.xlmap b/bam/templates/versions.xlmap
index a5eef130486bb167d06ca5b80a4c38dd280cc0ee..0f575fc03cdf80548a69c192faf03adcf0bda222 100644
--- a/bam/templates/versions.xlmap
+++ b/bam/templates/versions.xlmap
@@ -6,7 +6,7 @@
<module name="Bam">
<redirectedRegister name="FW_BOARD_VER_MAJOR">
<targetDevice><par>target</par></targetDevice>
- <targetRegister>BOARD.0.WORD_PRJ_VERSION</targetRegister>
+ <targetRegister>BSP.WORD_PRJ_VERSION</targetRegister>
<plugin name="math">
<parameter name="formula">floor(x / 2^24) % 256</parameter>
</plugin>
@@ -15,7 +15,7 @@
<redirectedRegister name="FW_BOARD_VER_MINOR">
<targetDevice><par>target</par></targetDevice>
- <targetRegister>BOARD.0.WORD_PRJ_VERSION</targetRegister>
+ <targetRegister>BSP.WORD_PRJ_VERSION</targetRegister>
<plugin name="math">
<parameter name="formula">floor(x / 2^16) % 256</parameter>
</plugin>
@@ -24,7 +24,7 @@
<redirectedRegister name="FW_BOARD_VER_PATCH">
<targetDevice><par>target</par></targetDevice>
- <targetRegister>BOARD.0.WORD_PRJ_VERSION</targetRegister>
+ <targetRegister>BSP.WORD_PRJ_VERSION</targetRegister>
<plugin name="math">
<parameter name="formula">floor(x / 2^8) % 256</parameter>
</plugin>
@@ -33,7 +33,7 @@
<redirectedRegister name="FW_BOARD_VER_COMMIT">
<targetDevice><par>target</par></targetDevice>
- <targetRegister>BOARD.0.WORD_PRJ_VERSION</targetRegister>
+ <targetRegister>BSP.WORD_PRJ_VERSION</targetRegister>
<plugin name="math">
<parameter name="formula">x % 256</parameter>
</plugin>