From c521be46fe19fc83faa09b0d8cf2a89cfd7e8986 Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Sun, 30 Jun 2013 15:48:14 +0200 Subject: [PATCH] Started thinking of TrbNetTopology, a "smart" TrbNet setup file --- xml-db/database/TrbNetCommon.xsd | 224 +++++++++++++++++++++ xml-db/database/TrbNetEntity.xsd | 254 +++--------------------- xml-db/database/TrbNetTopology.xsd | 5 + xml-db/database/jtag_registers_SPEC.xml | 44 ++-- xml-db/database/testing.xml | 3 +- 5 files changed, 278 insertions(+), 252 deletions(-) create mode 100644 xml-db/database/TrbNetCommon.xsd create mode 100644 xml-db/database/TrbNetTopology.xsd diff --git a/xml-db/database/TrbNetCommon.xsd b/xml-db/database/TrbNetCommon.xsd new file mode 100644 index 0000000..72bdc94 --- /dev/null +++ b/xml-db/database/TrbNetCommon.xsd @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml-db/database/TrbNetEntity.xsd b/xml-db/database/TrbNetEntity.xsd index 12c07ec..ab15483 100644 --- a/xml-db/database/TrbNetEntity.xsd +++ b/xml-db/database/TrbNetEntity.xsd @@ -1,108 +1,9 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -122,9 +23,10 @@ + + to redundant naming schemes, its makes minor modifications to + entities very easy to specify (which is desirable in setup files) --> @@ -133,6 +35,11 @@ + + + + + @@ -143,133 +50,24 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/xml-db/database/TrbNetTopology.xsd b/xml-db/database/TrbNetTopology.xsd new file mode 100644 index 0000000..ffcac39 --- /dev/null +++ b/xml-db/database/TrbNetTopology.xsd @@ -0,0 +1,5 @@ + + + + + diff --git a/xml-db/database/jtag_registers_SPEC.xml b/xml-db/database/jtag_registers_SPEC.xml index bbd649f..a7f6862 100644 --- a/xml-db/database/jtag_registers_SPEC.xml +++ b/xml-db/database/jtag_registers_SPEC.xml @@ -14,7 +14,7 @@ address="0007" mode="rw" purpose ="config" > Wait time between write sequence and start signal. + start="0" size="20" mode="rw" purpose="config" format="integer"> The number of MAPS clock cycles to wait after last write before sending the start signal. @@ -22,7 +22,7 @@ address="000c" mode="w" purpose ="trigger" > Trigger the init sequence. + start="0" size="5" mode="w" purpose="trigger" format="bitmask"> A bitmask to trigger the init sequence on individual JTAG chains. @@ -30,7 +30,7 @@ address="000d" mode="w" purpose ="trigger" > Trigger the init sequence. + start="0" size="5" mode="w" purpose="trigger" format="bitmask"> A bitmask to trigger sending a reset pulse on individual JTAG chains @@ -38,7 +38,7 @@ address="000e" mode="w" purpose ="trigger" > Trigger sending a start pulse. + start="0" size="5" mode="w" purpose="trigger" format="bitmask"> A bitmask to trigger sending a start pulse on individual JTAG chains @@ -46,7 +46,7 @@ address="000f" mode="w" purpose ="trigger" > Trigger running JTAG write. + start="0" size="5" mode="w" purpose="trigger" format="bitmask"> A bitmask to trigger writing the JTAG registers three times on individual JTAG chains @@ -54,7 +54,7 @@ address="0010" mode="rw" purpose="config" > Generate a reset before doing init sequence + start="0" size="1" mode="rw" purpose="config" format="boolean"> Enable to send a reset pulse before starting init sequence @@ -62,7 +62,7 @@ address="0011" mode="rw" purpose="config" > Generate a reset after first register write sequence + start="0" size="1" mode="rw" purpose="config" format="boolean"> Enable to send a reset pulse after the first writing of JTAG registers @@ -70,7 +70,7 @@ address="0014" mode="w" purpose ="trigger" > Trigger writing all JTAG registers once + start="0" size="5" mode="w" purpose="trigger" format="bitmask"> Trigger writing all JTAG registers once on individual JTAG chains @@ -81,59 +81,59 @@ 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"> Invert TDO input signal + start="2" size="1" mode="rw" purpose="config" format="boolean"> Invert TDI output signal + start="4" size="1" mode="rw" purpose="config" format="boolean"> Invert TMS output signal + start="6" size="1" mode="rw" purpose="config" format="boolean"> Invert TCK output signal + start="8" size="1" mode="rw" purpose="config" format="boolean"> Invert Start output signal + start="10" size="1" mode="rw" purpose="config" format="boolean"> Invert Reset output signal + start="12" size="1" mode="rw" purpose="config" format="boolean"> Invert Clock output signal + start="1" size="1" mode="rw" purpose="config" format="boolean"> Enable TDO input signal + start="3" size="1" mode="rw" purpose="config" format="boolean"> Enable TDI output signal + start="5" size="1" mode="rw" purpose="config" format="boolean"> Enable TMS output signal + start="7" size="1" mode="rw" purpose="config" format="boolean"> Enable TCK output signal + start="9" size="1" mode="rw" purpose="config" format="boolean"> Enable Start output signal + start="11" size="1" mode="rw" purpose="config" format="boolean"> Enable Reset output signal + start="13" size="1" mode="rw" purpose="config" format="boolean"> Enable Clock output signal diff --git a/xml-db/database/testing.xml b/xml-db/database/testing.xml index 081321c..27550a2 100644 --- a/xml-db/database/testing.xml +++ b/xml-db/database/testing.xml @@ -23,8 +23,7 @@ + size="20"> The number of MAPS clock cycles to wait after last write before sending the start signal. -- 2.43.0