rfnoc: Update blocks to use autogenerated noc_shell

7 files changed, 66 insertions, 13 deletions

diff --git a/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml b/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml
new file mode 100644
index 000000000..2a2d74e2e
--- /dev/null
+++ b/host/include/uhd/rfnoc/blocks/axi_ram_fifo.yml
@@ -0,0 +1,52 @@
+schema: rfnoc_modtool_args
+module_name: axi_ram_fifo
+version: 1.0
+rfnoc_version: 1.0
+chdr_width: 64
+noc_id: 0xF1F00000
+
+parameters:
+  NUM_PORTS: 2
+  MEM_DATA_W: 64
+  MEM_ADDR_W: 30
+  FIFO_ADDR_BASE: "{30'h02000000, 30'h00000000}"
+  FIFO_ADDR_MASK: "{30'h01FFFFFF, 30'h01FFFFFF}"
+  MEM_CLK_RATE: "300e6"
+
+clocks:
+  - name: rfnoc_chdr
+    freq: "[]"
+  - name: rfnoc_ctrl
+    freq: "[]"
+  - name: mem
+    freq: "[]"
+
+control:
+  sw_iface: nocscript
+  fpga_iface: ctrlport
+  interface_direction: slave
+  fifo_depth: 32
+  clk_domain: mem
+  ctrlport:
+    byte_mode: False
+    timed: False
+    has_status: False
+
+data:
+  fpga_iface: axis_chdr
+  clk_domain: rfnoc_chdr
+  inputs:
+    in:
+      num_ports: NUM_PORTS
+  outputs:
+    out:
+      num_ports: NUM_PORTS
+
+io_ports:
+  axi_ram:
+    type: axi4_mm_2x64_4g
+    drive: master
+
+registers:
+
+properties:
diff --git a/host/include/uhd/rfnoc/blocks/ddc.yml b/host/include/uhd/rfnoc/blocks/ddc.yml
index 86b2ebe89..8699e9859 100644
--- a/host/include/uhd/rfnoc/blocks/ddc.yml
+++ b/host/include/uhd/rfnoc/blocks/ddc.yml
@@ -22,11 +22,11 @@ control:
   sw_iface: nocscript
   fpga_iface: ctrlport
   interface_direction: slave
-  fifo_depth: 32
+  fifo_depth: 64
   clk_domain: ce
   ctrlport:
     byte_mode: False
-    timed: False
+    timed: True
     has_status: False
 
 data:
diff --git a/host/include/uhd/rfnoc/blocks/duc.yml b/host/include/uhd/rfnoc/blocks/duc.yml
index e5cd712ea..608ce6a27 100644
--- a/host/include/uhd/rfnoc/blocks/duc.yml
+++ b/host/include/uhd/rfnoc/blocks/duc.yml
@@ -22,11 +22,11 @@ control:
   sw_iface: nocscript
   fpga_iface: ctrlport
   interface_direction: slave
-  fifo_depth: 32
+  fifo_depth: 64
   clk_domain: ce
   ctrlport:
     byte_mode: False
-    timed: False
+    timed: True
     has_status: False
 
 data:
diff --git a/host/include/uhd/rfnoc/blocks/fir_filter.yml b/host/include/uhd/rfnoc/blocks/fir_filter.yml
index 970f52e43..4e9281b68 100644
--- a/host/include/uhd/rfnoc/blocks/fir_filter.yml
+++ b/host/include/uhd/rfnoc/blocks/fir_filter.yml
@@ -9,7 +9,7 @@ parameters:
   NUM_PORTS: 1
   COEFF_WIDTH: 16
   NUM_COEFFS: 41
-  COEFFS_VEC: "{ {1'b0, {(COEFF_WIDTH-1){1'b1}} }, {(COEFF_WIDTH*(NUM_COEFFS-1)){1'b0}} }"
+  COEFFS_VEC: "{ 16'h7FFF, {640{1'b0}} }"
   RELOADABLE_COEFFS: 1
   SYMMETRIC_COEFFS: 0
   SKIP_ZERO_COEFFS: 0
diff --git a/host/include/uhd/rfnoc/blocks/radio.yml b/host/include/uhd/rfnoc/blocks/radio.yml
index 1da887c86..29fd15a88 100644
--- a/host/include/uhd/rfnoc/blocks/radio.yml
+++ b/host/include/uhd/rfnoc/blocks/radio.yml
@@ -8,6 +8,7 @@ noc_id: 0x12AD1000
 parameters:
   NUM_PORTS: 2
   NIPC: 1
+  ITEM_W: 32
 
 clocks:
   - name: rfnoc_chdr
@@ -20,8 +21,8 @@ clocks:
 control:
   sw_iface: nocscript
   fpga_iface: ctrlport
-  interface_direction: master_slave
-  fifo_depth: 32
+  interface_direction: remote_master_slave
+  fifo_depth: 512
   clk_domain: radio
   ctrlport:
     byte_mode: True
@@ -34,7 +35,7 @@ data:
   inputs:
     in:
       num_ports: NUM_PORTS
-      item_width: 32
+      item_width: ITEM_W
       nipc: NIPC
       info_fifo_depth: 32
       payload_fifo_depth: MTU
@@ -43,7 +44,7 @@ data:
   outputs:
     out:
       num_ports: NUM_PORTS
-      item_width: 32
+      item_width: ITEM_W
       nipc: NIPC
       info_fifo_depth: 32
       payload_fifo_depth: MTU
diff --git a/host/include/uhd/rfnoc/blocks/radio_1x64.yml b/host/include/uhd/rfnoc/blocks/radio_1x64.yml
index e5baf02d8..3aaf88326 100644
--- a/host/include/uhd/rfnoc/blocks/radio_1x64.yml
+++ b/host/include/uhd/rfnoc/blocks/radio_1x64.yml
@@ -19,8 +19,8 @@ clocks:
 control:
   sw_iface: nocscript
   fpga_iface: ctrlport
-  interface_direction: master_slave
-  fifo_depth: 32
+  interface_direction: remote_master_slave
+  fifo_depth: 512
   clk_domain: radio
   ctrlport:
     byte_mode: True
diff --git a/host/include/uhd/rfnoc/blocks/radio_2x64.yml b/host/include/uhd/rfnoc/blocks/radio_2x64.yml
index 0a3f6590d..8a89e44f9 100644
--- a/host/include/uhd/rfnoc/blocks/radio_2x64.yml
+++ b/host/include/uhd/rfnoc/blocks/radio_2x64.yml
@@ -19,8 +19,8 @@ clocks:
 control:
   sw_iface: nocscript
   fpga_iface: ctrlport
-  interface_direction: master_slave
-  fifo_depth: 32
+  interface_direction: remote_master_slave
+  fifo_depth: 512
   clk_domain: radio
   ctrlport:
     byte_mode: True