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

Merge branch 'L2SDP-333' into 'master' 

L2SDP-333, correct address_offset.

Closes L2SDP-333

See merge request desp/hdl!92
parents bc7c337e ea744a23
No related branches found
No related tags found
2 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!92L2SDP-333, correct address_offset.
Hide whitespace changes
Inline Side-by-side
applications/lofar2/libraries/sdp/sdp.peripheral.yaml
+ 176
− 188
View file @ 81ea2fc1
...@@ -175,50 +175,48 @@ peripherals: ...@@ -175,50 +175,48 @@ peripherals:
" "
fields: fields:
# eth field group # eth field group
- - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0x84 } - - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0xA0 }
- - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x7C } - - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x98 }
- - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x94 }
# ip field group # ip field group
- - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x90 }
- - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x70 } - - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x8C }
- - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x6C } - - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x88 }
- - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x68 } - - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x84 }
- - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x64 } - - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x80 }
- - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x60 } - - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x7C }
- - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x5C } - - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x78 }
- - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x58 } - - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x74 }
- - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x54 } - - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x70 }
- - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x50 } - - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x6C }
- - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x4C } - - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x68 }
- - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x48 } - - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x64 }
# udp field group # udp field group
- - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x44 } - - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x60 }
- - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x40 } - - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x5C }
- - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x3C } - - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x58 }
- - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x38 } - - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x54 }
# application field group # application field group
- - { field_name: marker, mm_width: 8, access_mode: RO, address_offset: 0x34 } - - { field_name: sdp_marker, mm_width: 8, access_mode: RO, address_offset: 0x50 }
- - { field_name: version_id, mm_width: 8, access_mode: RO, address_offset: 0x30 } - - { field_name: sdp_version_id, mm_width: 8, access_mode: RO, address_offset: 0x4C }
- - { field_name: observation_id, mm_width: 32, access_mode: RW, address_offset: 0x2C } - - { field_name: sdp_observation_id, mm_width: 32, access_mode: RW, address_offset: 0x48 }
- - { field_name: station_id, mm_width: 16, access_mode: RW, address_offset: 0x28 } - - { field_name: sdp_station_id, mm_width: 16, access_mode: RW, address_offset: 0x44 }
- - { field_name: source_info, mm_width: 16, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x40 }
- "source_info": - - { field_name: sdp_source_info_nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x3C }
- { field_name: antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x38 }
- { field_name: nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x34 }
- { field_name: f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x30 }
- { field_name: fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x2C }
- { field_name: payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_beamlet_width, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x28 }
- { field_name: repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 }
- { field_name: beamlet_width, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x24 }
- { field_name: gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_reserved, mm_width: 32, user_width: 40, radix: uint64, access_mode: RW, address_offset: 0x1C }
- - { field_name: sdp_beamlet_scale, mm_width: 16, access_mode: RW, address_offset: 0x18 }
- - { field_name: reserved, mm_width: 32, user_width: 40, radix: uint64, access_mode: RW, address_offset: 0x1C } - - { field_name: sdp_beamlet_index, mm_width: 16, access_mode: RW, address_offset: 0x14 }
- - { field_name: beamlet_scale, mm_width: 16, access_mode: RW, address_offset: 0x18 } - - { field_name: sdp_nof_blocks_per_packet, mm_width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: beamlet_index, mm_width: 16, access_mode: RW, address_offset: 0x14 } - - { field_name: sdp_nof_beamlets_per_block, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: nof_blocks_per_packet, mm_width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: sdp_block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: nof_beamlets_per_block, mm_width: 16, access_mode: RW, address_offset: 0xC } - - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, access_mode: RW, address_offset: 0x0 }
- - { field_name: block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, 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,57 +237,54 @@ peripherals: ...@@ -239,57 +237,54 @@ peripherals:
" "
fields: fields:
# eth field group # eth field group
- - { field_name: word_align, mm_width: 16, access_mode: RW, address_offset: 0x8C } - - { field_name: word_align, mm_width: 16, access_mode: RW, address_offset: 0xAC }
- - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0x84 } - - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0xA4 }
- - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x7C } - - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x9C }
- - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x98 }
# ip field group # ip field group
- - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x94 }
- - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x70 } - - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x90 }
- - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x6C } - - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x8C }
- - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x68 } - - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x88 }
- - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x64 } - - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x84 }
- - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x60 } - - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x80 }
- - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x5C } - - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x7C }
- - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x58 } - - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x78 }
- - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x54 } - - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x74 }
- - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x50 } - - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x70 }
- - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x4C } - - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x6C }
- - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x48 } - - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x68 }
# udp field group # udp field group
- - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x44 } - - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x64 }
- - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x40 } - - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x60 }
- - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x3C } - - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x5C }
- - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x38 } - - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x58 }
# application field group # application field group
- - { field_name: marker, mm_width: 8, access_mode: RO, address_offset: 0x34 } - - { field_name: sdp_marker, mm_width: 8, access_mode: RO, address_offset: 0x54 }
- - { field_name: version_id, mm_width: 8, access_mode: RO, address_offset: 0x30 } - - { field_name: sdp_version_id, mm_width: 8, access_mode: RO, address_offset: 0x50 }
- - { field_name: observation_id, mm_width: 32, access_mode: RW, address_offset: 0x2C } - - { field_name: sdp_observation_id, mm_width: 32, access_mode: RW, address_offset: 0x4C }
- - { field_name: station_id, mm_width: 16, access_mode: RW, address_offset: 0x28 } - - { field_name: sdp_station_id, mm_width: 16, access_mode: RW, address_offset: 0x48 }
- - { field_name: source_info, mm_width: 16, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x44 }
- "source_info": - - { field_name: sdp_source_info_nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x40 }
- { field_name: antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x3C }
- { field_name: nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x38 }
- { field_name: f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x34 }
- { field_name: fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_beam_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x30 }
- { field_name: payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_subband_calibrated_flag, mm_width: 1, bit_offset: 8, access_mode: RW, address_offset: 0x2C }
- { field_name: beam_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_reserved, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x28 }
- { field_name: subband_calibrated_flag, mm_width: 1, bit_offset: 8, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 }
- { field_name: reserved, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_reserved, mm_width: 8, access_mode: RW, address_offset: 0x20 }
- { field_name: gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_integration_interval, mm_width: 24, access_mode: RW, address_offset: 0x1C }
- - { field_name: sdp_data_id, mm_width: 32, access_mode: RW, address_offset: 0x18 }
- - { field_name: reserved, mm_width: 8, access_mode: RW, address_offset: 0x20 } - "sdp_data_id_sst":
- - { field_name: integration_interval, mm_width: 24, access_mode: RW, address_offset: 0x1C } - { field_name: reserved, mm_width: 24, bit_offset: 8, access_mode: RW, address_offset: 0x18 }
- - { field_name: data_id, mm_width: 32, access_mode: RW, address_offset: 0x18 } - { field_name: signal_input_index, mm_width: 8, bit_offset: 0, access_mode: RW, address_offset: 0x18 }
- "data_id_sst":
- { field_name: reserved, mm_width: 24, bit_offset: 8, access_mode: RW, address_offset: 0x18 } - - { field_name: sdp_nof_signal_inputs, mm_width: 8, access_mode: RW, address_offset: 0x14 }
- { field_name: signal_input_index, mm_width: 8, bit_offset: 0, access_mode: RW, address_offset: 0x18 } - - { field_name: sdp_nof_bytes_per_statistic, mm_width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: sdp_nof_statistics_per_packet, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: nof_signal_inputs, mm_width: 8, access_mode: RW, address_offset: 0x14 } - - { field_name: sdp_block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: nof_bytes_per_statistic, mm_width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, access_mode: RW, address_offset: 0x0 }
- - { field_name: nof_statistics_per_packet, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, 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
...@@ -310,57 +305,54 @@ peripherals: ...@@ -310,57 +305,54 @@ peripherals:
" "
fields: fields:
# eth field group # eth field group
- - { field_name: word_align, mm_width: 16, access_mode: RW, address_offset: 0x8C } - - { field_name: word_align, mm_width: 16, access_mode: RW, address_offset: 0xAC }
- - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0x84 } - - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0xA4 }
- - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x7C } - - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x9C }
- - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x98 }
# ip field group # ip field group
- - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x94 }
- - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x70 } - - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x90 }
- - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x6C } - - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x8C }
- - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x68 } - - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x88 }
- - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x64 } - - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x84 }
- - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x60 } - - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x80 }
- - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x5C } - - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x7C }
- - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x58 } - - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x78 }
- - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x54 } - - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x74 }
- - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x50 } - - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x70 }
- - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x4C } - - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x6C }
- - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x48 } - - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x68 }
# udp field group # udp field group
- - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x44 } - - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x64 }
- - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x40 } - - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x60 }
- - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x3C } - - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x5C }
- - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x38 } - - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x58 }
# application field group # application field group
- - { field_name: marker, mm_width: 8, access_mode: RO, address_offset: 0x34 } - - { field_name: sdp_marker, mm_width: 8, access_mode: RO, address_offset: 0x54 }
- - { field_name: version_id, mm_width: 8, access_mode: RO, address_offset: 0x30 } - - { field_name: sdp_version_id, mm_width: 8, access_mode: RO, address_offset: 0x50 }
- - { field_name: observation_id, mm_width: 32, access_mode: RW, address_offset: 0x2C } - - { field_name: sdp_observation_id, mm_width: 32, access_mode: RW, address_offset: 0x4C }
- - { field_name: station_id, mm_width: 16, access_mode: RW, address_offset: 0x28 } - - { field_name: sdp_station_id, mm_width: 16, access_mode: RW, address_offset: 0x48 }
- - { field_name: source_info, mm_width: 16, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x44 }
- "source_info": - - { field_name: sdp_source_info_nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x40 }
- { field_name: antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x3C }
- { field_name: nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x38 }
- { field_name: f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x34 }
- { field_name: fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_beam_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x30 }
- { field_name: payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_subband_calibrated_flag, mm_width: 1, bit_offset: 8, access_mode: RW, address_offset: 0x2C }
- { field_name: beam_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_reserved, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x28 }
- { field_name: subband_calibrated_flag, mm_width: 1, bit_offset: 8, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 }
- { field_name: reserved, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_reserved, mm_width: 8, access_mode: RW, address_offset: 0x20 }
- { field_name: gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_integration_interval, mm_width: 24, access_mode: RW, address_offset: 0x1C }
- - { field_name: sdp_data_id, mm_width: 32, access_mode: RW, address_offset: 0x18 }
- - { field_name: reserved, mm_width: 8, access_mode: RW, address_offset: 0x20 } - "sdp_data_id_bst":
- - { field_name: integration_interval, mm_width: 24, access_mode: RW, address_offset: 0x1C } - { field_name: reserved, mm_width: 16, bit_offset: 16, access_mode: RW, address_offset: 0x18 }
- - { field_name: data_id, mm_width: 32, access_mode: RW, address_offset: 0x18 } - { field_name: beamlet_index, mm_width: 16, bit_offset: 0, access_mode: RW, address_offset: 0x18 }
- "data_id_bst":
- { field_name: reserved, mm_width: 16, bit_offset: 16, access_mode: RW, address_offset: 0x18 } - - { field_name: nof_signal_inputs, mm_width: 8, access_mode: RW, address_offset: 0x14 }
- { field_name: beamlet_index, mm_width: 16, bit_offset: 0, access_mode: RW, address_offset: 0x18 } - - { field_name: nof_bytes_per_statistic, mm_width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: nof_statistics_per_packet, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: nof_signal_inputs, mm_width: 8, access_mode: RW, address_offset: 0x14 } - - { field_name: block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: nof_bytes_per_statistic, mm_width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, access_mode: RW, address_offset: 0x0 }
- - { field_name: nof_statistics_per_packet, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, 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
...@@ -382,57 +374,53 @@ peripherals: ...@@ -382,57 +374,53 @@ peripherals:
" "
fields: fields:
# eth field group # eth field group
- - { field_name: word_align, mm_width: 16, access_mode: RW, address_offset: 0x8C } - - { field_name: word_align, mm_width: 16, access_mode: RW, address_offset: 0xAC }
- - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0x84 } - - { field_name: eth_destination_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RW, address_offset: 0xA4 }
- - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x7C } - - { field_name: eth_source_mac, mm_width: 32, user_width: 48, radix: uint64, access_mode: RO, address_offset: 0x9C }
- - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x78 } - - { field_name: eth_type, mm_width: 16, access_mode: RO, address_offset: 0x98 }
# ip field group # ip field group
- - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x74 } - - { field_name: ip_version, mm_width: 4, access_mode: RW, address_offset: 0x94 }
- - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x70 } - - { field_name: ip_header_length, mm_width: 4, access_mode: RW, address_offset: 0x90 }
- - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x6C } - - { field_name: ip_services, mm_width: 8, access_mode: RW, address_offset: 0x8C }
- - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x68 } - - { field_name: ip_total_length, mm_width: 16, access_mode: RW, address_offset: 0x88 }
- - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x64 } - - { field_name: ip_identification, mm_width: 16, access_mode: RW, address_offset: 0x84 }
- - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x60 } - - { field_name: ip_flags, mm_width: 3, access_mode: RW, address_offset: 0x80 }
- - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x5C } - - { field_name: ip_fragment_offset, mm_width: 13, access_mode: RW, address_offset: 0x7C }
- - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x58 } - - { field_name: ip_time_to_live, mm_width: 8, access_mode: RW, address_offset: 0x78 }
- - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x54 } - - { field_name: ip_protocol, mm_width: 8, access_mode: RW, address_offset: 0x74 }
- - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x50 } - - { field_name: ip_header_checksum, mm_width: 16, access_mode: RW, address_offset: 0x70 }
- - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x4C } - - { field_name: ip_source_address, mm_width: 32, access_mode: RW, address_offset: 0x6C }
- - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x48 } - - { field_name: ip_destination_address, mm_width: 32, access_mode: RW, address_offset: 0x68 }
# udp field group # udp field group
- - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x44 } - - { field_name: udp_source_port, mm_width: 16, access_mode: RW, address_offset: 0x64 }
- - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x40 } - - { field_name: udp_destination_port, mm_width: 16, access_mode: RW, address_offset: 0x60 }
- - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x3C } - - { field_name: udp_length, mm_width: 16, access_mode: RW, address_offset: 0x5C }
- - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x38 } - - { field_name: udp_checksum, mm_width: 16, access_mode: RW, address_offset: 0x58 }
# application field group # application field group
- - { field_name: marker, mm_width: 8, access_mode: RO, address_offset: 0x34 } - - { field_name: sdp_marker, mm_width: 8, access_mode: RO, address_offset: 0x54 }
- - { field_name: version_id, mm_width: 8, access_mode: RO, address_offset: 0x30 } - - { field_name: sdp_version_id, mm_width: 8, access_mode: RO, address_offset: 0x50 }
- - { field_name: observation_id, mm_width: 32, access_mode: RW, address_offset: 0x2C } - - { field_name: sdp_observation_id, mm_width: 32, access_mode: RW, address_offset: 0x4C }
- - { field_name: station_id, mm_width: 16, access_mode: RW, address_offset: 0x28 } - - { field_name: sdp_station_id, mm_width: 16, access_mode: RW, address_offset: 0x48 }
- - { field_name: source_info, mm_width: 16, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x44 }
- "source_info": - - { field_name: sdp_source_info_nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x40 }
- { field_name: antenna_band_index, mm_width: 1, bit_offset: 15, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x3C }
- { field_name: nyquist_zone_index, mm_width: 2, bit_offset: 13, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x38 }
- { field_name: f_adc, mm_width: 1, bit_offset: 12, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x34 }
- { field_name: fsub_type, mm_width: 1, bit_offset: 11, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_beam_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x30 }
- { field_name: payload_error, mm_width: 1, bit_offset: 10, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_subband_calibrated_flag, mm_width: 1, bit_offset: 8, access_mode: RW, address_offset: 0x2C }
- { field_name: beam_repositioning_flag, mm_width: 1, bit_offset: 9, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_reserved, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x28 }
- { field_name: subband_calibrated_flag, mm_width: 1, bit_offset: 8, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_source_info_gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 }
- { field_name: reserved, mm_width: 3, bit_offset: 5, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_reserved, mm_width: 8, access_mode: RW, address_offset: 0x20 }
- { field_name: gn_index, mm_width: 5, bit_offset: 0, access_mode: RW, address_offset: 0x24 } - - { field_name: sdp_integration_interval, mm_width: 24, access_mode: RW, address_offset: 0x1C }
- - { field_name: sdp_data_id, mm_width: 32, access_mode: RW, address_offset: 0x18 }
- - { field_name: reserved, mm_width: 8, access_mode: RW, address_offset: 0x20 } - "sdp_data_id_xst":
- - { field_name: integration_interval, mm_width: 24, access_mode: RW, address_offset: 0x1C } - { field_name: reserved, mm_width: 7, bit_offset: 25, access_mode: RW, address_offset: 0x18 }
- - { field_name: data_id, mm_width: 32, access_mode: RW, address_offset: 0x18 } - { field_name: subband_index, mm_width: 9, bit_offset: 16, access_mode: RW, address_offset: 0x18 }
- "data_id_xst": - { field_name: signal_input_A_index, mm_width: 8, bit_offset: 8, access_mode: RW, address_offset: 0x18 }
- { field_name: reserved, mm_width: 7, bit_offset: 25, access_mode: RW, address_offset: 0x18 } - { field_name: signal_input_B_index, mm_width: 8, bit_offset: 0, access_mode: RW, address_offset: 0x18 }
- { field_name: subband_index, mm_width: 9, bit_offset: 16, access_mode: RW, address_offset: 0x18 }
- { field_name: signal_input_A_index, mm_width: 8, bit_offset: 8, access_mode: RW, address_offset: 0x18 } - - { field_name: nof_signal_inputs, mm_width: 8, access_mode: RW, address_offset: 0x14 }
- { field_name: signal_input_B_index, mm_width: 8, bit_offset: 0, access_mode: RW, address_offset: 0x18 } - - { field_name: nof_bytes_per_statistic, mm_width: 8, access_mode: RW, address_offset: 0x10 }
- - { field_name: nof_statistics_per_packet, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: nof_signal_inputs, mm_width: 8, access_mode: RW, address_offset: 0x14 } - - { field_name: block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: nof_bytes_per_statistic, mm_width: 8, access_mode: RW, address_offset: 0x10 } - - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, access_mode: RW, address_offset: 0x0 }
- - { field_name: nof_statistics_per_packet, mm_width: 16, access_mode: RW, address_offset: 0xC }
- - { field_name: block_period, mm_width: 16, access_mode: RW, address_offset: 0x8 }
- - { field_name: BSN, mm_width: 32, user_width: 64, radix: uint64, access_mode: RW, address_offset: 0x0 }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment