few updates to xml pages regarding I2C

diff --git a/web/htdocs/addons/mimosis.pl b/web/htdocs/addons/mimosis.pl
index a8dfe14b295044b2cd0434d7b493b0e12f2ee762..0b71c7456ff978e45f4efe8919bd98cbe3e0cda2 100755 (executable)
--- a/web/htdocs/addons/mimosis.pl
+++ b/web/htdocs/addons/mimosis.pl
@@ -46,6 +46,13 @@ push(@setup,({name      => "I2C",
               period    => 1000,
               rates     => 1,
               address   => 1}));   
+
+
+push(@setup,({name      => "ADC", 
+              cmd       => "I2C-0xa000-I2C",
+              period    => 1000,
+              rates     => 1,
+              address   => 1}));               
               
 xmlpage::initPage(\@setup,$page);
  

diff --git a/xml-db/database/ADC_Controller.xml b/xml-db/database/ADC_Controller.xml
index 839a6cb89d0b6c606cf356c5a59440d30d9a521c..5bf1a8ba2fbd0c4f2e67d659d8885c883a4fb79c 100644 (file)
--- a/xml-db/database/ADC_Controller.xml
+++ b/xml-db/database/ADC_Controller.xml
@@ -5,7 +5,7 @@
               address="d480"
               >
   <description>Registers for the onboard ADC for Trb3sc++</description>
-  <group name="ADC" address="0000" size="16" continuous="false">
+  <group name="ADC" address="0000" size="16" continuous="false"  mode="rw">
   <group name="Control" address="0000"  size="10"  purpose="config" mode="rw" continuous="false">
 
     <register name="Commands" address="0000" repeat="4" continuous="true">

diff --git a/xml-db/database/I2C.xml b/xml-db/database/I2C.xml
new file mode 100644 (file)
index 0000000..abdec1c
--- /dev/null
+++ b/xml-db/database/I2C.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"  encoding="utf-8" ?>
+<TrbNetEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../schema/TrbNetEntity.xsd"
+              name="I2C"
+              address="d680"
+              >
+  <description>Registers for I2C</description>
+
+  
+  <group name="I2C" address="0000"  size="6"  purpose="status" mode="rw" continuous="true">
+    <register name="MimosisI2C0" address="0000" >
+      <description>First I2C register</description>
+      <field name="Speed" start="0" bits="6" format="unsigned"  noflag="true" >
+        <description>Multiples of 8 System clock cycles for 1/2 I2C clock</description>
+      </field>    
+    </register>
+    
+    <register name="I2C1" address="0001" >
+      <description>Second I2C register</description>
+      <field name="WordByte" start="0" bits="1" format="bitmask" noflag="true" >
+        <description>Select to send one byte (0) or one word (1)</description>
+      </field>    
+      <field name="SkipCommand" start="4" bits="1" format="bitmask" noflag="true" >
+        <description>Skip command, send only address plus data</description>
+      </field> 
+      <field name="ReadWrite" start="8" bits="1" format="bitmask" noflag="true" >
+        <description>Select to write (0) or read (1)</description>
+      </field>    
+    </register>
+    
+    <register name="I2C2" address="0002" >
+      <description>Third I2C register / Command and data</description>
+      <field name="I2CExecute" start="7" bits="1" format="bitmask">
+      <description>Trigger I2C action</description>
+      </field>
+      <field name="I2CAddress" start="0" bits="7" format="hex" noflag="true" >
+        <description>I2C address byte, r/w bit is ignored</description>
+      </field>    
+      <field name="I2CCommand" start="8" bits="8" format="hex" noflag="true" >
+        <description>Command byte, sent after address</description>
+      </field>    
+      <field name="I2CData" start="16" bits="16" format="hex" noflag="true" >
+        <description>Data word, sent after command</description>
+      </field>    
+    </register>    
+    
+    <!-- <register name="MimosisI2CTrigger" address="0002" > -->
+    <!--   <description>Trigger I2C action</description> -->
+    <!--     <field name="I2CExecute" start="0" bits="1" format="bitmask"  /> -->
+    <!-- </register>   -->
+
+    <register name="I2C4" address="0004" mode="r">
+      <description>Fourth I2C register / Status and read-back</description>
+      <field name="I2CDataRead" start="0" bits="16" format="hex" noflag="true" >
+        <description>Data word read back</description>
+      </field> 
+      <field name="I2CStatus" start="16" bits="8" format="hex" noflag="true" >
+        <description>Status flags of I2C master</description>
+      </field>    
+      <field name="I2CFsmState" start="24" bits="5" format="hex" noflag="true" >
+        <description>Status of I2C state machine</description>
+      </field>        
+      <field name="I2CDone" start="29" bits="1" format="boolean"  >
+        <description>Operation finished</description>
+      </field>    
+      <field name="I2CBusy" start="30" bits="1" format="boolean"  errorflag="true">
+        <description>I2C master busy</description>
+      </field>    
+      <field name="I2CValid" start="31" bits="1" format="boolean"  >
+        <description>Data valid</description>
+      </field>    
+    </register>    
+
+
+    
+  </group>
+  
+</TrbNetEntity>  

diff --git a/xml-db/database/Mimosis.xml b/xml-db/database/Mimosis.xml
index eee4ff221e08a2c0896233e8928bfd0622b2b5d8..71dfc1899463178270bc0d0da0f8e3af29b5f5c3 100644 (file)
--- a/xml-db/database/Mimosis.xml
+++ b/xml-db/database/Mimosis.xml
@@ -90,7 +90,7 @@
     </register>
 
     <register name="FrameLength" address="0002" >
-      <description>16bit words in last frame</description>
+      <description>32bit words in last frame</description>
       <field name="FrameLength" start="0" bits="16" format="unsigned"  noflag="true" />
     </register>
 
@@ -146,6 +146,9 @@
       <field name="WordByte" start="0" bits="1" format="bitmask" noflag="true" >
         <description>Select to send one byte (0) or one word (1)</description>
       </field>    
+      <field name="SkipCommand" start="4" bits="1" format="bitmask" noflag="true" >
+        <description>Skip command, send only address plus data</description>
+      </field>  
       <field name="ReadWrite" start="8" bits="1" format="bitmask" noflag="true" >
         <description>Select to write (0) or read (1)</description>
       </field>    
@@ -153,8 +156,8 @@
     
     <register name="MimosisI2C2" address="0002" >
       <description>Third I2C register / Command and data</description>
-      <field name="I2CAddress" start="0" bits="8" format="hex" noflag="true" >
-        <description>I2C address byte, r/w bit is ignored</description>
+      <field name="I2CAddress" start="1" bits="7" format="hex" noflag="true" >
+        <description>I2C address byte</description>
       </field>    
       <field name="I2CCommand" start="8" bits="8" format="hex" noflag="true" >
         <description>Command byte, sent after address</description>