aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--host/include/uhd/rfnoc/blocks/radio.yml6
-rw-r--r--host/include/uhd/rfnoc/core/e310_bsp.yml12
-rw-r--r--host/include/uhd/rfnoc/core/e320_bsp.yml12
-rw-r--r--host/include/uhd/rfnoc/core/io_signatures.yml77
-rw-r--r--host/include/uhd/rfnoc/core/n300_bsp.yml10
-rw-r--r--host/include/uhd/rfnoc/core/n310_bsp.yml16
-rw-r--r--host/include/uhd/rfnoc/core/n320_bsp.yml16
-rw-r--r--host/include/uhd/rfnoc/core/x300_bsp.yml16
-rw-r--r--host/include/uhd/rfnoc/core/x310_bsp.yml18
-rw-r--r--host/include/uhd/rfnoc/core/x410_bsp.yml10
10 files changed, 62 insertions, 131 deletions
diff --git a/host/include/uhd/rfnoc/blocks/radio.yml b/host/include/uhd/rfnoc/blocks/radio.yml
index 8ec2b1566..0e290c187 100644
--- a/host/include/uhd/rfnoc/blocks/radio.yml
+++ b/host/include/uhd/rfnoc/blocks/radio.yml
@@ -53,16 +53,16 @@ data:
io_ports:
ctrlport:
- type: ctrl_port
+ type: ctrlport
drive: master
rename:
pattern: (.*)
repl: m_\1
time:
- type: time_keeper
+ type: timekeeper
drive: listener
radio:
- type: radio_8x32
+ type: radio
drive: slave
registers:
diff --git a/host/include/uhd/rfnoc/core/e310_bsp.yml b/host/include/uhd/rfnoc/core/e310_bsp.yml
index 3457198b5..0d6fd6c6a 100644
--- a/host/include/uhd/rfnoc/core/e310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/e310_bsp.yml
@@ -11,17 +11,17 @@ clocks:
- name: dram
io_ports:
- ctrlport_radio:
- type: ctrl_port
+ ctrlport:
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- x300_radio:
- type: x300_radio
+ radio:
+ type: radio
drive: master
dram:
type: axi4_mm
diff --git a/host/include/uhd/rfnoc/core/e320_bsp.yml b/host/include/uhd/rfnoc/core/e320_bsp.yml
index cb2b39e9b..642c6e5cd 100644
--- a/host/include/uhd/rfnoc/core/e320_bsp.yml
+++ b/host/include/uhd/rfnoc/core/e320_bsp.yml
@@ -14,17 +14,17 @@ clocks:
- name: dram
io_ports:
- ctrl_port:
- type: ctrl_port
+ ctrlport:
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- x300_radio:
- type: x300_radio
+ radio:
+ type: radio
drive: master
dram:
type: axi4_mm
diff --git a/host/include/uhd/rfnoc/core/io_signatures.yml b/host/include/uhd/rfnoc/core/io_signatures.yml
index 7099949df..83ef027bb 100644
--- a/host/include/uhd/rfnoc/core/io_signatures.yml
+++ b/host/include/uhd/rfnoc/core/io_signatures.yml
@@ -1,4 +1,4 @@
-ctrl_port:
+ctrlport:
type: master-slave
ports:
- name: ctrlport_req_wr
@@ -28,83 +28,14 @@ ctrl_port:
type: to-master
width: 32
-time_keeper:
+timekeeper:
type: broadcaster-listener
ports:
- name: radio_time
width: 64
-# Single channel radio interface
-radio_1x32:
- type: master-slave
- ports:
- - name: radio_rx_data
- type: from-master
- width: 32
- - name: radio_rx_stb
- type: from-master
- width: 1
- - name: radio_rx_running
- type: to-master
- width: 1
- - name: radio_tx_data
- type: to-master
- width: 32
- - name: radio_tx_stb
- type: from-master
- width: 1
- - name: radio_tx_running
- type: to-master
- width: 1
-
-# Two channel radio interface, or single channel with 2 SPC
-radio_2x32:
- type: master-slave
- ports:
- - name: radio_rx_data
- type: from-master
- width: 64
- - name: radio_rx_stb
- type: from-master
- width: 2
- - name: radio_rx_running
- type: to-master
- width: 2
- - name: radio_tx_data
- type: to-master
- width: 64
- - name: radio_tx_stb
- type: from-master
- width: 2
- - name: radio_tx_running
- type: to-master
- width: 2
-
-# Same as radio_2x32, but kept for backwards compatibility with the old name
-x300_radio:
- type: master-slave
- ports:
- - name: radio_rx_data
- type: from-master
- width: 64
- - name: radio_rx_stb
- type: from-master
- width: 2
- - name: radio_rx_running
- type: to-master
- width: 2
- - name: radio_tx_data
- type: to-master
- width: 64
- - name: radio_tx_stb
- type: from-master
- width: 2
- - name: radio_tx_running
- type: to-master
- width: 2
-
-# Eight channel radio interface, or two channels with 4 SPC
-radio_8x32:
+# Radio interface (up to eight channels or eight samples per clock)
+radio:
type: master-slave
ports:
- name: radio_rx_data
diff --git a/host/include/uhd/rfnoc/core/n300_bsp.yml b/host/include/uhd/rfnoc/core/n300_bsp.yml
index 80fb160d5..a3393eba7 100644
--- a/host/include/uhd/rfnoc/core/n300_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n300_bsp.yml
@@ -18,16 +18,16 @@ clocks:
io_ports:
ctrlport_radio0:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio0_\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- x300_radio0:
- type: x300_radio
+ radio0:
+ type: radio
drive: master
rename:
pattern: (.*)
diff --git a/host/include/uhd/rfnoc/core/n310_bsp.yml b/host/include/uhd/rfnoc/core/n310_bsp.yml
index 516834382..cb8485c52 100644
--- a/host/include/uhd/rfnoc/core/n310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n310_bsp.yml
@@ -18,28 +18,28 @@ clocks:
io_ports:
ctrlport_radio0:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio0_\2
ctrlport_radio1:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio1_\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- x300_radio0:
- type: x300_radio
+ radio0:
+ type: radio
drive: master
rename:
pattern: (.*)
repl: \1_radio0
- x300_radio1:
- type: x300_radio
+ radio1:
+ type: radio
drive: master
rename:
pattern: (.*)
diff --git a/host/include/uhd/rfnoc/core/n320_bsp.yml b/host/include/uhd/rfnoc/core/n320_bsp.yml
index 56ad6131f..d7c271892 100644
--- a/host/include/uhd/rfnoc/core/n320_bsp.yml
+++ b/host/include/uhd/rfnoc/core/n320_bsp.yml
@@ -18,28 +18,28 @@ clocks:
io_ports:
ctrlport_radio0:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio0_\2
ctrlport_radio1:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio1_\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- radio_ch0:
- type: radio_1x32
+ radio0:
+ type: radio
drive: master
rename:
pattern: (.*)
repl: \1_radio0
- radio_ch1:
- type: radio_1x32
+ radio1:
+ type: radio
drive: master
rename:
pattern: (.*)
diff --git a/host/include/uhd/rfnoc/core/x300_bsp.yml b/host/include/uhd/rfnoc/core/x300_bsp.yml
index 4ea835ac7..58016047f 100644
--- a/host/include/uhd/rfnoc/core/x300_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x300_bsp.yml
@@ -19,28 +19,28 @@ clocks:
io_ports:
ctrlport_radio0:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio0_\2
ctrlport_radio1:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio1_\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- x300_radio0:
- type: x300_radio
+ radio0:
+ type: radio
drive: master
rename:
pattern: (.*)
repl: \1_radio0
- x300_radio1:
- type: x300_radio
+ radio1:
+ type: radio
drive: master
rename:
pattern: (.*)
diff --git a/host/include/uhd/rfnoc/core/x310_bsp.yml b/host/include/uhd/rfnoc/core/x310_bsp.yml
index 4ea835ac7..0b1134379 100644
--- a/host/include/uhd/rfnoc/core/x310_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x310_bsp.yml
@@ -1,4 +1,4 @@
-type: x300
+type: x310
type_id: A300
family: 7SERIES
transports:
@@ -19,28 +19,28 @@ clocks:
io_ports:
ctrlport_radio0:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio0_\2
ctrlport_radio1:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio1_\2
- time_keeper:
- type: time_keeper
+ time:
+ type: timekeeper
drive: broadcaster
- x300_radio0:
- type: x300_radio
+ radio0:
+ type: radio
drive: master
rename:
pattern: (.*)
repl: \1_radio0
- x300_radio1:
- type: x300_radio
+ radio1:
+ type: radio
drive: master
rename:
pattern: (.*)
diff --git a/host/include/uhd/rfnoc/core/x410_bsp.yml b/host/include/uhd/rfnoc/core/x410_bsp.yml
index 5f759faae..eb51d7208 100644
--- a/host/include/uhd/rfnoc/core/x410_bsp.yml
+++ b/host/include/uhd/rfnoc/core/x410_bsp.yml
@@ -30,28 +30,28 @@ clocks:
io_ports:
ctrlport_radio0:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio0_\2
ctrlport_radio1:
- type: ctrl_port
+ type: ctrlport
drive: slave
rename:
pattern: (ctrlport_)(.*)
repl: m_\1radio1_\2
time:
- type: time_keeper
+ type: timekeeper
drive: broadcaster
radio0:
- type: radio_8x32
+ type: radio
drive: master
rename:
pattern: (.*)
repl: \1_radio0
radio1:
- type: radio_8x32
+ type: radio
drive: master
rename:
pattern: (.*)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 21:22:01 +0000