Skip to content
Snippets Groups Projects
Commit bbb46367 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Use user_width instead of radix_width.

parent 7d4ee065
No related branches found
No related tags found
2 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!76Resolve L2SDP-248
Expand all Show whitespace changes
Inline Side-by-side
applications/lofar2/libraries/sdp/sdp.peripheral.yaml
+ 19
− 16
View file @ bbb46367
...@@ -137,7 +137,7 @@ peripherals: ...@@ -137,7 +137,7 @@ peripherals:
address_offset: 0x0 address_offset: 0x0
number_of_fields: 1 number_of_fields: 1
radix: unsigned radix: unsigned
#radix_width: g_gain_w #user_width: g_gain_w # EK TODO check
radix_resolution: 0 - g_lsb_w radix_resolution: 0 - g_lsb_w
- - field_name: unused - - field_name: unused
field_description: "Not used." field_description: "Not used."
...@@ -161,12 +161,12 @@ peripherals: ...@@ -161,12 +161,12 @@ peripherals:
range (h downto 0) where the first header field (eth_destination_mac) is at index h. range (h downto 0) where the first header field (eth_destination_mac) is at index h.
. the RO fields are filled in by the logic, when the packet header is transmitted, however . the RO fields are filled in by the logic, when the packet header is transmitted, however
the read value does not still represents the MM write value, not the transmitted value. the read value does not still represents the MM write value, not the transmitted value.
. dp_bsn with radix_width = 64 is stored as: . dp_bsn with user_width = 64 is stored as:
word byte word byte
addr addr bits addr addr bits
0 0x0 [31:0] = dp_bsn[31:0] 0 0x0 [31:0] = dp_bsn[31:0]
1 0x4 [31:0] = dp_bsn[63:32] 1 0x4 [31:0] = dp_bsn[63:32]
. eth_dst_mac with radix_width = 48 is stored as: . eth_dst_mac with user_width = 48 is stored as:
word byte word byte
addr addr bits addr addr bits
21 0x84 [31:0] = eth_dst_mac[31:0] 21 0x84 [31:0] = eth_dst_mac[31:0]
...@@ -175,8 +175,8 @@ peripherals: ...@@ -175,8 +175,8 @@ peripherals:
mm_port_type: REG mm_port_type: REG
fields: fields:
# eth field group # eth field group
- - { field_name: eth_destination_mac, width: 32, access_mode: RW, address_offset: 0x84, radix_width: 48 } - - { field_name: eth_destination_mac, width: 32, user_width: 48, access_mode: RW, address_offset: 0x84 }
- - { field_name: eth_source_mac, width: 32, access_mode: RO, address_offset: 0x7C, radix_width: 48 } - - { field_name: eth_source_mac, width: 32, user_width: 48, access_mode: RO, address_offset: 0x7C }
- - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 }
# ip field group # ip field group
- - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 }
...@@ -212,13 +212,13 @@ peripherals: ...@@ -212,13 +212,13 @@ peripherals:
- { field_name: beamlet_width, width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x24 } - { field_name: beamlet_width, width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x24 }
- { field_name: gn_index, width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 } - { field_name: gn_index, width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 }
- - { field_name: reserved, width: 32, access_mode: RW, address_offset: 0x1C, radix_width: 40 } - - { field_name: reserved, width: 32, user_width: 40, access_mode: RW, address_offset: 0x1C }
- - { field_name: beamlet_scale, width: 16, access_mode: RW, address_offset: 0x18 } - - { field_name: beamlet_scale, width: 16, access_mode: RW, address_offset: 0x18 }
- - { field_name: beamlet_index, width: 16, access_mode: RW, address_offset: 0x14 } - - { field_name: beamlet_index, width: 16, access_mode: RW, address_offset: 0x14 }
- - { field_name: nof_blocks_per_packet, width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: nof_blocks_per_packet, width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: nof_beamlets_per_block, width: 16, access_mode: RW, address_offset: 0xC } - - { field_name: nof_beamlets_per_block, width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 } - - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, width: 32, access_mode: RW, address_offset: 0x0, radix_width: 64 } - - { field_name: BSN, width: 32, user_width: 64, access_mode: RW, address_offset: 0x0 }
- peripheral_name: sdp_statistics_offload_hdr_dat_sst # pi_dp_offload_tx_hdr_dat_lofar2_sdp_statistics_offload.py - peripheral_name: sdp_statistics_offload_hdr_dat_sst # pi_dp_offload_tx_hdr_dat_lofar2_sdp_statistics_offload.py
...@@ -239,8 +239,9 @@ peripherals: ...@@ -239,8 +239,9 @@ peripherals:
mm_port_type: REG mm_port_type: REG
fields: fields:
# eth field group # eth field group
- - { field_name: eth_destination_mac, width: 32, access_mode: RW, address_offset: 0x84, radix_width: 48 } - - { field_name: word_align, width: 16, access_mode: RW, address_offset: 0x8C }
- - { field_name: eth_source_mac, width: 32, access_mode: RO, address_offset: 0x7C, radix_width: 48 } - - { field_name: eth_destination_mac, width: 32, user_width: 48, access_mode: RW, address_offset: 0x84 }
- - { field_name: eth_source_mac, width: 32, user_width: 48, access_mode: RO, address_offset: 0x7C }
- - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 }
# ip field group # ip field group
- - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 }
...@@ -288,7 +289,7 @@ peripherals: ...@@ -288,7 +289,7 @@ peripherals:
- - { field_name: nof_bytes_per_statistic, width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: nof_bytes_per_statistic, width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: nof_statistics_per_packet, width: 16, access_mode: RW, address_offset: 0xC } - - { field_name: nof_statistics_per_packet, width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 } - - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, width: 32, access_mode: RW, address_offset: 0x0, radix_width: 64 } - - { field_name: BSN, width: 32, user_width: 64, access_mode: RW, address_offset: 0x0 }
- peripheral_name: sdp_statistics_offload_hdr_dat_bst # pi_dp_offload_tx_hdr_dat_lofar2_sdp_statistics_offload.py - peripheral_name: sdp_statistics_offload_hdr_dat_bst # pi_dp_offload_tx_hdr_dat_lofar2_sdp_statistics_offload.py
...@@ -309,8 +310,9 @@ peripherals: ...@@ -309,8 +310,9 @@ peripherals:
mm_port_type: REG mm_port_type: REG
fields: fields:
# eth field group # eth field group
- - { field_name: eth_destination_mac, width: 32, access_mode: RW, address_offset: 0x84, radix_width: 48 } - - { field_name: word_align, width: 16, access_mode: RW, address_offset: 0x8C }
- - { field_name: eth_source_mac, width: 32, access_mode: RO, address_offset: 0x7C, radix_width: 48 } - - { field_name: eth_destination_mac, width: 32, user_width: 48, access_mode: RW, address_offset: 0x84 }
- - { field_name: eth_source_mac, width: 32, user_width: 48, access_mode: RO, address_offset: 0x7C }
- - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 }
# ip field group # ip field group
- - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 }
...@@ -358,7 +360,7 @@ peripherals: ...@@ -358,7 +360,7 @@ peripherals:
- - { field_name: nof_bytes_per_statistic, width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: nof_bytes_per_statistic, width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: nof_statistics_per_packet, width: 16, access_mode: RW, address_offset: 0xC } - - { field_name: nof_statistics_per_packet, width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 } - - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, width: 32, access_mode: RW, address_offset: 0x0, radix_width: 64 } - - { field_name: BSN, width: 32, user_width: 64, access_mode: RW, address_offset: 0x0 }
- peripheral_name: sdp_statistics_offload_hdr_dat_xst # pi_dp_offload_tx_hdr_dat_lofar2_sdp_statistics_offload.py - peripheral_name: sdp_statistics_offload_hdr_dat_xst # pi_dp_offload_tx_hdr_dat_lofar2_sdp_statistics_offload.py
...@@ -380,8 +382,9 @@ peripherals: ...@@ -380,8 +382,9 @@ peripherals:
mm_port_type: REG mm_port_type: REG
fields: fields:
# eth field group # eth field group
- - { field_name: eth_destination_mac, width: 32, access_mode: RW, address_offset: 0x84, radix_width: 48 } - - { field_name: word_align, width: 16, access_mode: RW, address_offset: 0x8C }
- - { field_name: eth_source_mac, width: 32, access_mode: RO, address_offset: 0x7C, radix_width: 48 } - - { field_name: eth_destination_mac, width: 32, user_width: 48, access_mode: RW, address_offset: 0x84 }
- - { field_name: eth_source_mac, width: 32, user_width: 48, access_mode: RO, address_offset: 0x7C }
- - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, width: 16, access_mode: RO, address_offset: 0x78 }
# ip field group # ip field group
- - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, width: 4, access_mode: RW, address_offset: 0x74 }
...@@ -431,5 +434,5 @@ peripherals: ...@@ -431,5 +434,5 @@ peripherals:
- - { field_name: nof_bytes_per_statistic, width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: nof_bytes_per_statistic, width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: nof_statistics_per_packet, width: 16, access_mode: RW, address_offset: 0xC } - - { field_name: nof_statistics_per_packet, width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 } - - { field_name: block_period, width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, width: 32, access_mode: RW, address_offset: 0x0, radix_width: 64 } - - { field_name: BSN, width: 32, user_width: 64, access_mode: RW, address_offset: 0x0 }
boards/uniboard2b/libraries/unb2b_board/unb2b_board.peripheral.yaml
+ 2
− 2
View file @ bbb46367
...@@ -106,11 +106,11 @@ peripherals: ...@@ -106,11 +106,11 @@ peripherals:
address_offset: 0x4 address_offset: 0x4
- - field_name: design_name - - field_name: design_name
field_description: "FPGA FW design name string." field_description: "FPGA FW design name string."
user_width: 8
access_mode: RO access_mode: RO
address_offset: 0x8 address_offset: 0x8
number_of_fields: 13 number_of_fields: 13
radix: char radix: char
radix_width: 8
- - field_name: stamp_date - - field_name: stamp_date
field_description: "FPGA FW compile date string." field_description: "FPGA FW compile date string."
access_mode: RO access_mode: RO
...@@ -129,11 +129,11 @@ peripherals: ...@@ -129,11 +129,11 @@ peripherals:
radix: hexadecimal radix: hexadecimal
- - field_name: design_note - - field_name: design_note
field_description: "FPGA FW design note string." field_description: "FPGA FW design note string."
user_width: 8
access_mode: RO access_mode: RO
address_offset: 0x50 address_offset: 0x50
number_of_fields: 13 number_of_fields: 13
radix: char radix: char
radix_width: 8
- peripheral_name: wdi # pi_wdi.py - peripheral_name: wdi # pi_wdi.py
peripheral_description: "" peripheral_description: ""
......
libraries/base/dp/dp.peripheral.yaml
+ 6
− 6
View file @ bbb46367
...@@ -139,9 +139,9 @@ peripherals: ...@@ -139,9 +139,9 @@ peripherals:
# address_offset: 0xC # address_offset: 0xC
- - field_name: bsn - - field_name: bsn
field_description: "Initial BSN" field_description: "Initial BSN"
user_width: 64
access_mode: RW access_mode: RW
address_offset: 0x8 address_offset: 0x8
radix_width: 64
- peripheral_name: dp_bsn_source_v2 # pi_dp_bsn_source_v2.py - peripheral_name: dp_bsn_source_v2 # pi_dp_bsn_source_v2.py
...@@ -185,9 +185,9 @@ peripherals: ...@@ -185,9 +185,9 @@ peripherals:
# address_offset: 0xC # address_offset: 0xC
- - field_name: bsn_init - - field_name: bsn_init
field_description: "Initial BSN" field_description: "Initial BSN"
user_width: 64
access_mode: RW access_mode: RW
address_offset: 0x8 address_offset: 0x8
radix_width: 64
- - field_name: bsn_time_offset - - field_name: bsn_time_offset
field_description: "The BSN block time offset in number of clock cycles, with respect to the PPS." field_description: "The BSN block time offset in number of clock cycles, with respect to the PPS."
width: g_bsn_time_offset_w width: g_bsn_time_offset_w
...@@ -213,9 +213,9 @@ peripherals: ...@@ -213,9 +213,9 @@ peripherals:
# address_offset: 0x4 # address_offset: 0x4
- - field_name: scheduled_bsn - - field_name: scheduled_bsn
field_description: "Write scheduled BSN. First access lo, then hi." field_description: "Write scheduled BSN. First access lo, then hi."
user_width: 64
access_mode: RW access_mode: RW
address_offset: 0x0 address_offset: 0x0
radix_width: 64
- peripheral_name: dp_bsn_monitor # pi_dp_bsn_monitor.py - peripheral_name: dp_bsn_monitor # pi_dp_bsn_monitor.py
...@@ -258,9 +258,9 @@ peripherals: ...@@ -258,9 +258,9 @@ peripherals:
# address_offset: 0x8 # address_offset: 0x8
- - field_name: bsn_at_sync - - field_name: bsn_at_sync
field_description: "Data stream BSN at sync." field_description: "Data stream BSN at sync."
user_width: 64
access_mode: RO access_mode: RO
address_offset: 0x4 address_offset: 0x4
radix_width: 64
- - field_name: nof_sop - - field_name: nof_sop
field_description: "Number data blocks (sop = start of packet) during last sync interval." field_description: "Number data blocks (sop = start of packet) during last sync interval."
access_mode: RO access_mode: RO
...@@ -283,9 +283,9 @@ peripherals: ...@@ -283,9 +283,9 @@ peripherals:
# address_offset: 0x1C # address_offset: 0x1C
- - field_name: bsn_first - - field_name: bsn_first
field_description: "First data stream BSN ever." field_description: "First data stream BSN ever."
user_width: 64
access_mode: RO access_mode: RO
address_offset: 0x18 address_offset: 0x18
radix_width: 64
- - field_name: bsn_first_cycle_cnt - - field_name: bsn_first_cycle_cnt
field_description: "Arrival latency of first data stream BSN ever, relative to local sync." field_description: "Arrival latency of first data stream BSN ever, relative to local sync."
access_mode: RO access_mode: RO
...@@ -332,9 +332,9 @@ peripherals: ...@@ -332,9 +332,9 @@ peripherals:
# address_offset: 0x8 # address_offset: 0x8
- - field_name: bsn_at_sync - - field_name: bsn_at_sync
field_description: "Data stream BSN at sync." field_description: "Data stream BSN at sync."
user_width: 64
access_mode: RO access_mode: RO
address_offset: 0x4 address_offset: 0x4
radix_width: 64
- - field_name: nof_sop - - field_name: nof_sop
field_description: "Number data blocks (sop = start of packet) during last sync interval." field_description: "Number data blocks (sop = start of packet) during last sync interval."
access_mode: RO access_mode: RO
......
libraries/dsp/st/st.peripheral.yaml
+ 2
− 2
View file @ bbb46367
...@@ -64,9 +64,9 @@ peripherals: ...@@ -64,9 +64,9 @@ peripherals:
- - field_name: power - - field_name: power
field_description: "" field_description: ""
width: 32 width: 32
user_width: g_stat_data_w
address_offset: 0x0 address_offset: 0x0
number_of_fields: g_nof_stat * g_stat_data_sz number_of_fields: g_nof_stat * g_stat_data_sz
radix_width: g_stat_data_w
- peripheral_name: st_bst_for_sdp # pi_st_bst.py - peripheral_name: st_bst_for_sdp # pi_st_bst.py
...@@ -94,6 +94,6 @@ peripherals: ...@@ -94,6 +94,6 @@ peripherals:
- - field_name: power - - field_name: power
field_description: "" field_description: ""
width: 32 width: 32
user_width: g_stat_data_w
address_offset: 0x0 address_offset: 0x0
number_of_fields: g_nof_stat * g_stat_data_sz number_of_fields: g_nof_stat * g_stat_data_sz
radix_width: g_stat_data_w
libraries/io/nw_10GbE/nw_10GbE.peripheral.yaml
+ 113
− 113
View file @ bbb46367
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment