From 178b35569b1a25180a80a23b945b10b04c9f10f5 Mon Sep 17 00:00:00 2001
From: Sugandha Gupta <sugandha.gupta@ettus.com>
Date: Fri, 25 Jan 2019 11:34:47 -0800
Subject: e310/e320: Move E310 to MPM architecture and refactor

- Turns the E310 into an MPM device (like N3xx, E320)
- Factor out common code between E320 and E310, maximize sharing between
  the two devices
- Remove all pre-MPM E310 code that is no longer needed
- Modify MPM to remove all existing overlays before applying new ones
  (this is necessary to enable idle image mode for E310)

Co-authored-by: Virendra Kakade <virendra.kakade@ni.com>
Signed-off-by: Virendra Kakade <virendra.kakade@ni.com>
---
 host/include/uhd/rfnoc/blocks/radio_e31x.xml | 59 ++++++++++++++++++++++++++++
 host/include/uhd/rfnoc/blocks/radio_e320.xml | 53 +++++++++++++++++++++++++
 host/include/uhd/rfnoc/blocks/radio_e3xx.xml | 59 ----------------------------
 host/include/uhd/rfnoc/blocks/radio_neon.xml | 53 -------------------------
 4 files changed, 112 insertions(+), 112 deletions(-)
 create mode 100644 host/include/uhd/rfnoc/blocks/radio_e31x.xml
 create mode 100644 host/include/uhd/rfnoc/blocks/radio_e320.xml
 delete mode 100644 host/include/uhd/rfnoc/blocks/radio_e3xx.xml
 delete mode 100644 host/include/uhd/rfnoc/blocks/radio_neon.xml

(limited to 'host/include')

diff --git a/host/include/uhd/rfnoc/blocks/radio_e31x.xml b/host/include/uhd/rfnoc/blocks/radio_e31x.xml
new file mode 100644
index 000000000..0635e397c
--- /dev/null
+++ b/host/include/uhd/rfnoc/blocks/radio_e31x.xml
@@ -0,0 +1,59 @@
+<!--This defines one NoC-Block.-->
+<nocblock>
+  <name>Radio (E31X)</name>
+  <blockname>Radio</blockname>
+  <key>E31XRadio</key>
+  <!--There can be several of these:-->
+  <ids>
+    <id revision="0">12AD100000003310</id>
+  </ids>
+  <!-- Registers -->
+  <registers>
+    <!--<setreg>-->
+      <!--<name>FFT_RESET</name>-->
+      <!--<address>131</address>-->
+    <!--</setreg>-->
+    <!--<readback>-->
+      <!--<name>RB_MAGNITUDE_OUT</name>-->
+      <!--<address>1</address>-->
+    <!--</readback>-->
+  </registers>
+  <!-- Args -->
+  <args>
+    <arg>
+      <name>spp</name>
+      <type>int</type>
+      <value>508</value>
+      <!--<value>256</value>-->
+      <!--<check>GE($spp, 16) AND LE($spp, 4096) AND IS_PWR_OF_2($spp)</check>-->
+      <!--<check_message>FFT size must be in [16, 4096] and a power of two.</check_message>-->
+      <!--<action>SR_WRITE("FFT_SIZE_LOG2", LOG2($spp)) AND SR_WRITE("AXIS_CONFIG_BUS", ADD(873472, LOG2($spp)))</action>-->
+    </arg>
+  </args>
+  <ports>
+    <sink>
+      <name>in0</name>
+      <type>sc16</type>
+      <!--<vlen>$spp</vlen>-->
+      <!--<pkt_size>%vlen</pkt_size>-->
+    </sink>
+    <sink>
+      <name>in1</name>
+      <type>sc16</type>
+      <!--<vlen>$spp</vlen>-->
+      <!--<pkt_size>%vlen</pkt_size>-->
+    </sink>
+    <source>
+      <name>out0</name>
+      <type>sc16</type>
+      <!--<vlen>$spp</vlen>-->
+      <!--<pkt_size>%vlen</pkt_size>-->
+    </source>
+    <source>
+      <name>out1</name>
+      <type>sc16</type>
+      <!--<vlen>$spp</vlen>-->
+      <!--<pkt_size>%vlen</pkt_size>-->
+    </source>
+  </ports>
+</nocblock>
diff --git a/host/include/uhd/rfnoc/blocks/radio_e320.xml b/host/include/uhd/rfnoc/blocks/radio_e320.xml
new file mode 100644
index 000000000..01f286324
--- /dev/null
+++ b/host/include/uhd/rfnoc/blocks/radio_e320.xml
@@ -0,0 +1,53 @@
+<!--This defines one NoC-Block.-->
+<nocblock>
+  <name>Radio (Neon)</name>
+  <blockname>Radio</blockname>
+  <key>NeonRadio</key>
+  <!--There can be several of these:-->
+  <ids>
+    <id revision="0">12AD100000003320</id>
+  </ids>
+  <!-- Registers -->
+  <registers>
+    <!--<setreg>-->
+      <!--<name>FFT_RESET</name>-->
+      <!--<address>131</address>-->
+    <!--</setreg>-->
+    <!--<readback>-->
+      <!--<name>RB_MAGNITUDE_OUT</name>-->
+      <!--<address>1</address>-->
+    <!--</readback>-->
+  </registers>
+  <!-- Args -->
+  <args>
+    <arg>
+      <name>spp</name>
+      <type>int</type>
+      <value>364</value>
+    </arg>
+    <arg>
+      <name>gain_mode</name>
+      <type>string</type>
+      <value>auto</value>
+    </arg>
+  </args>
+  <ports>
+    <sink>
+      <name>in0</name>
+      <type>sc16</type>
+    </sink>
+    <source>
+      <name>out0</name>
+      <type>sc16</type>
+    </source>
+    <sink>
+      <name>in1</name>
+      <type>sc16</type>
+    </sink>
+    <source>
+      <name>out1</name>
+      <type>sc16</type>
+    </source>
+  </ports>
+</nocblock>
+
diff --git a/host/include/uhd/rfnoc/blocks/radio_e3xx.xml b/host/include/uhd/rfnoc/blocks/radio_e3xx.xml
deleted file mode 100644
index aece593a5..000000000
--- a/host/include/uhd/rfnoc/blocks/radio_e3xx.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--This defines one NoC-Block.-->
-<nocblock>
-  <name>Radio (E3XX)</name>
-  <blockname>Radio</blockname>
-  <key>E3XXRadio</key>
-  <!--There can be several of these:-->
-  <ids>
-    <id revision="0">12AD100000000000</id>
-  </ids>
-  <!-- Registers -->
-  <registers>
-    <!--<setreg>-->
-      <!--<name>FFT_RESET</name>-->
-      <!--<address>131</address>-->
-    <!--</setreg>-->
-    <!--<readback>-->
-      <!--<name>RB_MAGNITUDE_OUT</name>-->
-      <!--<address>1</address>-->
-    <!--</readback>-->
-  </registers>
-  <!-- Args -->
-  <args>
-    <arg>
-      <name>spp</name>
-      <type>int</type>
-      <value>508</value>
-      <!--<value>256</value>-->
-      <!--<check>GE($spp, 16) AND LE($spp, 4096) AND IS_PWR_OF_2($spp)</check>-->
-      <!--<check_message>FFT size must be in [16, 4096] and a power of two.</check_message>-->
-      <!--<action>SR_WRITE("FFT_SIZE_LOG2", LOG2($spp)) AND SR_WRITE("AXIS_CONFIG_BUS", ADD(873472, LOG2($spp)))</action>-->
-    </arg>
-  </args>
-  <ports>
-    <sink>
-      <name>in0</name>
-      <type>sc16</type>
-      <!--<vlen>$spp</vlen>-->
-      <!--<pkt_size>%vlen</pkt_size>-->
-    </sink>
-    <sink>
-      <name>in1</name>
-      <type>sc16</type>
-      <!--<vlen>$spp</vlen>-->
-      <!--<pkt_size>%vlen</pkt_size>-->
-    </sink>
-    <source>
-      <name>out0</name>
-      <type>sc16</type>
-      <!--<vlen>$spp</vlen>-->
-      <!--<pkt_size>%vlen</pkt_size>-->
-    </source>
-    <source>
-      <name>out1</name>
-      <type>sc16</type>
-      <!--<vlen>$spp</vlen>-->
-      <!--<pkt_size>%vlen</pkt_size>-->
-    </source>
-  </ports>
-</nocblock>
diff --git a/host/include/uhd/rfnoc/blocks/radio_neon.xml b/host/include/uhd/rfnoc/blocks/radio_neon.xml
deleted file mode 100644
index 01f286324..000000000
--- a/host/include/uhd/rfnoc/blocks/radio_neon.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--This defines one NoC-Block.-->
-<nocblock>
-  <name>Radio (Neon)</name>
-  <blockname>Radio</blockname>
-  <key>NeonRadio</key>
-  <!--There can be several of these:-->
-  <ids>
-    <id revision="0">12AD100000003320</id>
-  </ids>
-  <!-- Registers -->
-  <registers>
-    <!--<setreg>-->
-      <!--<name>FFT_RESET</name>-->
-      <!--<address>131</address>-->
-    <!--</setreg>-->
-    <!--<readback>-->
-      <!--<name>RB_MAGNITUDE_OUT</name>-->
-      <!--<address>1</address>-->
-    <!--</readback>-->
-  </registers>
-  <!-- Args -->
-  <args>
-    <arg>
-      <name>spp</name>
-      <type>int</type>
-      <value>364</value>
-    </arg>
-    <arg>
-      <name>gain_mode</name>
-      <type>string</type>
-      <value>auto</value>
-    </arg>
-  </args>
-  <ports>
-    <sink>
-      <name>in0</name>
-      <type>sc16</type>
-    </sink>
-    <source>
-      <name>out0</name>
-      <type>sc16</type>
-    </source>
-    <sink>
-      <name>in1</name>
-      <type>sc16</type>
-    </sink>
-    <source>
-      <name>out1</name>
-      <type>sc16</type>
-    </source>
-  </ports>
-</nocblock>
-
-- 
cgit v1.2.3