From f8359f5e6f7b715e0b233bfa8eb573663002c60f Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Sat, 29 Jun 2013 16:30:59 +0200 Subject: [PATCH] Better name for attribute "type" or "function" is probably "purpose" --- xml-db/database/TDC.xml | 98 +++++++++++------------ xml-db/database/TrbNetEntity.xsd | 11 ++- xml-db/database/jtag_registers_SPEC.xml | 100 ++++++++++++------------ xml-db/database/testing.xml | 5 +- 4 files changed, 106 insertions(+), 108 deletions(-) diff --git a/xml-db/database/TDC.xml b/xml-db/database/TDC.xml index 50d1cf7..52f3aec 100644 --- a/xml-db/database/TDC.xml +++ b/xml-db/database/TDC.xml @@ -8,133 +8,133 @@ - + Basic controls + start="0" size="20" mode="rw" purpose="config" format="enum" defaultValue="0" > Debug word of the TDC readout FSM bla + address="0001" mode="w" purpose ="trigger" repeat="2"> Trig + start="0" size="32" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > Empty signals (hits?) of channels + address="000d" mode="w" purpose ="trigger" > Trigger the init sequence. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger sending a reset pulse on individual JTAG chains + address="000e" mode="w" purpose ="trigger" > Trigger sending a start pulse. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger sending a start pulse on individual JTAG chains + address="000f" mode="w" purpose ="trigger" > Trigger running JTAG write. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger writing the JTAG registers three times on individual JTAG chains + address="0010" mode="rw" purpose="config" > Generate a reset before doing init sequence + start="0" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable to send a reset pulse before starting init sequence + address="0011" mode="rw" purpose="config" > Generate a reset after first register write sequence + start="0" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable to send a reset pulse after the first writing of JTAG registers + address="0014" mode="w" purpose ="trigger" > Trigger writing all JTAG registers once + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > Trigger writing all JTAG registers once on individual JTAG chains + address="0020" size="5" purpose="config" mode="rw" continuous="true"> Sets fixed values for all outputs for JTAG and sensor control and inverts the outputs if needed. One register for each JTAG chain. + address="0020" repeat="5" purpose="config" mode="rw" > Sets fixed values for all outputs for JTAG and sensor control and inverts the outputs if needed. One register for each JTAG chain. + start="0" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TDO input signal + start="2" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TDI output signal + start="4" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TMS output signal + start="6" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TCK output signal + start="8" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert Start output signal + start="10" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert Reset output signal + start="12" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert Clock output signal + start="1" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TDO input signal + start="3" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TDI output signal + start="5" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TMS output signal + start="7" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TCK output signal + start="9" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable Start output signal + start="11" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable Reset output signal + start="13" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable Clock output signal @@ -144,62 +144,62 @@ + address="1800" size="40" purpose="status" mode="r" continuous="true"> + address="0000" size="8" repeat="5" purpose="status" mode="r" continuous="true"> + address="0002" purpose="status" mode="r" > + start="0" size="16" mode="r" purpose="status" format="integer" > Number of read errors during "read id" operation + start="16" size="16" mode="r" purpose="status" format="integer" > Number of read errors during write operation + address="0003" purpose="status" mode="r" > + start="0" size="16" mode="r" purpose="status" format="integer" > Number of times data read back from the sensor was not identical to the data written to the sensor. + start="16" size="16" mode="r" purpose="status" format="integer" > Number of sampling errors of TDI signal. The signal from the sensor is sampled three times for each bit, all occurrences must be equal. + address="0004" purpose="status" mode="r" > + start="0" size="32" mode="r" purpose="status" format="integer" > Number of times the JTAG controller run a full sequence + address="0005" purpose="status" mode="r" > + start="0" size="1" mode="r" purpose="status" format="boolean" > JTAG has been started + start="4" size="1" mode="r" purpose="status" format="boolean" > Last JTAG run was successful + start="8" size="1" mode="r" purpose="status" format="boolean" > Data in the sensor was corrupted at last JTAG run + start="12" size="1" mode="r" purpose="status" format="boolean" > Last run had a JTAG write error + start="16" size="1" mode="r" purpose="status" format="boolean" > Last run had a JTAG read error + start="20" size="1" mode="r" purpose="status" format="boolean" > Last run had a JTAG CRC error diff --git a/xml-db/database/TrbNetEntity.xsd b/xml-db/database/TrbNetEntity.xsd index e5c36bb..76658ff 100644 --- a/xml-db/database/TrbNetEntity.xsd +++ b/xml-db/database/TrbNetEntity.xsd @@ -31,7 +31,7 @@ - + + address="1000" size="37" purpose="config" mode="rw" continuous="true"> + address="0007" mode="rw" purpose ="config" > Wait time between write sequence and start signal. + start="0" size="20" mode="rw" purpose="config" format="integer" defaultValue="0" > The number of MAPS clock cycles to wait after last write before sending the start signal. + address="000c" mode="w" purpose ="trigger" > Trigger the init sequence. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger the init sequence on individual JTAG chains. + address="000d" mode="w" purpose ="trigger" > Trigger the init sequence. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger sending a reset pulse on individual JTAG chains + address="000e" mode="w" purpose ="trigger" > Trigger sending a start pulse. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger sending a start pulse on individual JTAG chains + address="000f" mode="w" purpose ="trigger" > Trigger running JTAG write. + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > A bitmask to trigger writing the JTAG registers three times on individual JTAG chains + address="0010" mode="rw" purpose="config" > Generate a reset before doing init sequence + start="0" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable to send a reset pulse before starting init sequence + address="0011" mode="rw" purpose="config" > Generate a reset after first register write sequence + start="0" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable to send a reset pulse after the first writing of JTAG registers + address="0014" mode="w" purpose ="trigger" > Trigger writing all JTAG registers once + start="0" size="5" mode="w" purpose="trigger" format="bitmask" defaultValue="0" > Trigger writing all JTAG registers once on individual JTAG chains + address="0020" size="5" purpose="config" mode="rw" continuous="true"> Sets fixed values for all outputs for JTAG and sensor control and inverts the outputs if needed. One register for each JTAG chain. + address="0020" repeat="5" purpose="config" mode="rw" > Sets fixed values for all outputs for JTAG and sensor control and inverts the outputs if needed. One register for each JTAG chain. + start="0" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TDO input signal + start="2" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TDI output signal + start="4" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TMS output signal + start="6" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert TCK output signal + start="8" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert Start output signal + start="10" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert Reset output signal + start="12" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Invert Clock output signal + start="1" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TDO input signal + start="3" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TDI output signal + start="5" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TMS output signal + start="7" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable TCK output signal + start="9" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable Start output signal + start="11" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable Reset output signal + start="13" size="1" mode="rw" purpose="config" format="boolean" defaultValue="0" > Enable Clock output signal @@ -143,62 +143,62 @@ + address="1800" size="40" purpose="status" mode="r" continuous="true"> + address="0000" size="8" repeat="5" purpose="status" mode="r" continuous="true"> + address="0002" purpose="status" mode="r" > + start="0" size="16" mode="r" purpose="status" format="integer" > Number of read errors during "read id" operation + start="16" size="16" mode="r" purpose="status" format="integer" > Number of read errors during write operation + address="0003" purpose="status" mode="r" > + start="0" size="16" mode="r" purpose="status" format="integer" > Number of times data read back from the sensor was not identical to the data written to the sensor. + start="16" size="16" mode="r" purpose="status" format="integer" > Number of sampling errors of TDI signal. The signal from the sensor is sampled three times for each bit, all occurrences must be equal. + address="0004" purpose="status" mode="r" > + start="0" size="32" mode="r" purpose="status" format="integer" > Number of times the JTAG controller run a full sequence + address="0005" purpose="status" mode="r" > + start="0" size="1" mode="r" purpose="status" format="boolean" > JTAG has been started + start="4" size="1" mode="r" purpose="status" format="boolean" > Last JTAG run was successful + start="8" size="1" mode="r" purpose="status" format="boolean" > Data in the sensor was corrupted at last JTAG run + start="12" size="1" mode="r" purpose="status" format="boolean" > Last run had a JTAG write error + start="16" size="1" mode="r" purpose="status" format="boolean" > Last run had a JTAG read error + start="20" size="1" mode="r" purpose="status" format="boolean" > Last run had a JTAG CRC error diff --git a/xml-db/database/testing.xml b/xml-db/database/testing.xml index 03fda0d..081321c 100644 --- a/xml-db/database/testing.xml +++ b/xml-db/database/testing.xml @@ -9,7 +9,7 @@ name="JtagCommonControl" address="0000" size="21" - function="config" + purpose="config" continuous="true" > @@ -17,11 +17,10 @@ name="WaitBeforeStart" address="0007" mode="rw" - function ="config" + purpose ="config" > Wait time between write sequence and start signal.