Remove utc registers. Add trigger address, gain and offset calibration registers.

git-svn-id: http://svn.ohwr.org/fmc-adc-100m14b4cha/trunk@92 ddd67a1a-c8ad-4635-afe9-0b8a11d8f8e4

Remove utc registers. Add trigger address, gain and offset calibration registers.
git-svn-id: http://svn.ohwr.org/fmc-adc-100m14b4cha/trunk@92 ddd67a1a-c8ad-4635-afe9-0b8a11d8f8e4
e7e2f3c9 · mcattin · 9f574761 · e7e2f3c9 · e7e2f3c9 · e7e2f3c9
Commit e7e2f3c9 authored Nov 23, 2011 by mcattin
4 changed files
--- a/hdl/adc/rtl/fmc_adc_100Ms_csr.vhd
+++ b/hdl/adc/rtl/fmc_adc_100Ms_csr.vhd
--- a/hdl/adc/wb_gen/fmc_adc_100Ms_csr.h
+++ b/hdl/adc/wb_gen/fmc_adc_100Ms_csr.h
--- a/hdl/adc/wb_gen/fmc_adc_100Ms_csr.htm
+++ b/hdl/adc/wb_gen/fmc_adc_100Ms_csr.htm
--- a/hdl/adc/wb_gen/fmc_adc_100Ms_csr.wb
+++ b/hdl/adc/wb_gen/fmc_adc_100Ms_csr.wb
@@ -68,6 +68,16 @@ peripheral {
      access_bus = READ_WRITE;
      access_dev = READ_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 24;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
@@ -100,6 +110,16 @@ peripheral {
      access_bus = READ_ONLY;
      access_dev = WRITE_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 27;
+      access_bus = READ_ONLY;
+      access_dev = WRITE_ONLY;
+    };
  };
  reg {
@@ -158,9 +178,9 @@ peripheral {
    };
    field {
-      name = "Dummy";
+      name = "Reserved";
      description = "Ignore on read, write with 0's";
-      prefix = "dummy";
+      prefix = "reserved";
      type = SLV;
      size = 10;
      access_bus = READ_WRITE;
@@ -219,15 +239,25 @@ peripheral {
      access_bus = READ_WRITE;
      access_dev = READ_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 16;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
-    name = "Trigger UTC tag (LSBs)";
+    name = "Trigger address register";
-    prefix = "trig_utc_l";
+    prefix = "trig_pos";
    field {
-      name = "Trigger UTC tag (LSBs)";
+      name = "Trigger address";
-      description = "UTC time tag (LSBs) of the last trigger, inlcuding the trigger delay";
+      description = "Trigger address in DDR memory.\nOnly used in single-shot mode";
      type = SLV;
      size = 32;
      access_bus = READ_ONLY;
@@ -236,40 +266,40 @@ peripheral {
  };
  reg {
-    name = "Trigger UTC tag (MSBs)";
+    name = "Gain calibration register";
-    prefix = "trig_utc_h";
+    prefix = "gain_cal";
    field {
-      name = "Trigger UTC tag (MSBs)";
+      name = "Gain calibration";
-      description = "UTC time tag (MSBs) of the last trigger, inlcuding the trigger delay";
+      description = "Gain applied to all data coming from the ADC.";
      type = SLV;
      size = 32;
-      access_bus = READ_ONLY;
+      access_bus = READ_WRITE;
-      access_dev = WRITE_ONLY;
+      access_dev = READ_ONLY;
    };
  };
  reg {
-    name = "Start UTC tag (LSBs)";
+    name = "Offset calibration register";
-    prefix = "start_utc_l";
+    prefix = "offset_cal";
    field {
-      name = "Start UTC tag (LSBs)";
+      name = "Offset calibration";
-      description = "UTC time tag (LSBs) of the last start";
+      description = "Offset applied to all data coming from the ADC.";
      type = SLV;
      size = 32;
-      access_bus = READ_ONLY;
+      access_bus = READ_WRITE;
-      access_dev = WRITE_ONLY;
+      access_dev = READ_ONLY;
    };
  };
  reg {
-    name = "Start UTC tag (MSBs)";
+    name = "Reserved register";
-    prefix = "start_utc_h";
+    prefix = "reserved_0";
    field {
-      name = "Start UTC tag (MSBs)";
+      name = "Reserved";
-      description = "UTC time tag (MSBs) of the last start";
+      description = "Ignore on read, write with 0's";
      type = SLV;
      size = 32;
      access_bus = READ_ONLY;
@@ -278,12 +308,12 @@ peripheral {
  };
  reg {
-    name = "Stop UTC tag (LSBs)";
+    name = "Reserved register";
-    prefix = "stop_utc_l";
+    prefix = "reserved_1";
    field {
-      name = "Stop UTC tag (LSBs)";
+      name = "Reserved";
-      description = "UTC time tag (LSBs) of the last stop";
+      description = "Ignore on read, write with 0's";
      type = SLV;
      size = 32;
      access_bus = READ_ONLY;
@@ -292,12 +322,12 @@ peripheral {
  };
  reg {
-    name = "Stop UTC tag (MSBs)";
+    name = "Reserved register";
-    prefix = "stop_utc_h";
+    prefix = "reserved_2";
    field {
-      name = "Stop UTC tag (MSBs)";
+      name = "Reserved";
-      description = "UTC time tag (MSBs) of the last stop";
+      description = "Ignore on read, write with 0's";
      type = SLV;
      size = 32;
      access_bus = READ_ONLY;
@@ -319,6 +349,16 @@ peripheral {
      access_dev = READ_ONLY;
      clock = "fs_clk_i";
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 16;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
@@ -365,118 +405,206 @@ peripheral {
  reg {
    name = "Solid state relays control for channel 1";
-    prefix = "ch1_ssr";
+    prefix = "ch1";
    field {
      name = "Solid state relays control for channel 1";
      description = "Controls input voltage range, termination and DC offset error calibration";
+      prefix = "ssr";
      type = SLV;
      size = 7;
      access_bus = READ_WRITE;
      access_dev = READ_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 25;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
    name = "Channel 1 current value";
-    prefix = "ch1_val";
+    prefix = "ch1";
    field {
      name = "Channel 1 current value";
      description = "Current ADC raw value";
+      prefix = "val";
      type = SLV;
      size = 16;
      access_bus = READ_ONLY;
      access_dev = WRITE_ONLY;
      clock = "fs_clk_i";
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 16;
+      access_bus = READ_ONLY;
+      access_dev = WRITE_ONLY;
+    };
  };
  reg {
    name = "Solid state relays control for channel 2";
-    prefix = "ch2_ssr";
+    prefix = "ch2";
    field {
      name = "Solid state relays control for channel 2";
      description = "Controls input voltage range, termination and DC offset error calibration";
+      prefix = "ssr";
      type = SLV;
      size = 7;
      access_bus = READ_WRITE;
      access_dev = READ_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 25;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
    name = "Channel 2 current value";
-    prefix = "ch2_val";
+    prefix = "ch2";
    field {
      name = "Channel 2 current value";
      description = "Current ADC raw value";
+      prefix = "val";
      type = SLV;
      size = 16;
      access_bus = READ_ONLY;
      access_dev = WRITE_ONLY;
      clock = "fs_clk_i";
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 16;
+      access_bus = READ_ONLY;
+      access_dev = WRITE_ONLY;
+    };
  };
  reg {
    name = "Solid state relays control for channel 3";
-    prefix = "ch3_ssr";
+    prefix = "ch3";
    field {
      name = "Solid state relays control for channel 3";
      description = "Controls input voltage range, termination and DC offset error calibration";
+      prefix = "ssr";
      type = SLV;
      size = 7;
      access_bus = READ_WRITE;
      access_dev = READ_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 25;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
    name = "Channel 3 current value";
-    prefix = "ch3_val";
+    prefix = "ch3";
    field {
      name = "Channel 3 current value";
      description = "Current ADC raw value";
+      prefix = "val";
      type = SLV;
      size = 16;
      access_bus = READ_ONLY;
      access_dev = WRITE_ONLY;
      clock = "fs_clk_i";
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 16;
+      access_bus = READ_ONLY;
+      access_dev = WRITE_ONLY;
+    };
  };
  reg {
    name = "Solid state relays control for channel 4";
-    prefix = "ch4_ssr";
+    prefix = "ch4";
    field {
      name = "Solid state relays control for channel 4";
      description = "Controls input voltage range, termination and DC offset error calibration";
+      prefix = "ssr";
      type = SLV;
      size = 7;
      access_bus = READ_WRITE;
      access_dev = READ_ONLY;
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 25;
+      access_bus = READ_WRITE;
+      access_dev = READ_ONLY;
+    };
  };
  reg {
    name = "Channel 4 current value";
-    prefix = "ch4_val";
+    prefix = "ch4";
    field {
      name = "Channel 4 current value";
      description = "Current ADC raw value";
+      prefix = "val";
      type = SLV;
      size = 16;
      access_bus = READ_ONLY;
      access_dev = WRITE_ONLY;
      clock = "fs_clk_i";
    };
+    field {
+      name = "Reserved";
+      description = "Ignore on read, write with 0's";
+      prefix = "reserved";
+      type = SLV;
+      size = 16;
+      access_bus = READ_ONLY;
+      access_dev = WRITE_ONLY;
+    };
  };
 };