From 7d19fdbd6684699725e3b3bf08aad75d46ad6dfb Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Tue, 15 Mar 2022 10:58:21 +0100
Subject: [PATCH] updated mmap gold files

---
 .../lofar2_unb2b_sdp_station.mmap.gold        | 635 +++++++------
 .../lofar2_unb2b_sdp_station.mmap.qsys.gold   | 691 ++++++--------
 .../lofar2_unb2c_sdp_station.mmap.gold        | 844 +++++++-----------
 .../lofar2_unb2c_sdp_station.mmap.qsys.gold   | 706 ++++++---------
 4 files changed, 1273 insertions(+), 1603 deletions(-)

diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.gold b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.gold
index 9856e5ebb9..000138c5c1 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.gold
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.gold
@@ -283,9 +283,9 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x00128029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x0012802a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x0012802b       1     RW       uint32     b[15:0]           -  -      -    
-  REG_BSN_ALIGN_V2                          1     9     REG    enable                                    0x00130000       1     RW       uint32      b[0:0]           -  -      2    
+  REG_BSN_ALIGN_V2_XSUB                     1     9     REG    enable                                    0x00130000       1     RW       uint32      b[0:0]           -  -      2    
   -                                         -     -     -      replaced_pkt_cnt                          0x00130001       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_INPUT     1     9     REG    xon_stable                                0x00138000       1     RO       uint32      b[0:0]           -  -      8    
+  REG_BSN_MONITOR_V2_RX_ALIGN_XSUB          1     9     REG    xon_stable                                0x00138000       1     RO       uint32      b[0:0]           -  -      8    
   -                                         -     -     -      ready_stable                              0x00138000       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00138000       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00138001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -294,7 +294,7 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00138004       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00138005       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00138008       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT    1     1     REG    xon_stable                                0x00140000       1     RO       uint32      b[0:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_XSUB           1     1     REG    xon_stable                                0x00140000       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      ready_stable                              0x00140000       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00140000       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00140001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -520,294 +520,341 @@ number_of_columns = 13
   -                                         -     -     -      xgmii_link_status                         0x00180000       1     RO       uint32      b[3:2]           -  -      -    
   RAM_SS_SS_WIDE                            2     6     RAM    data                                      0x00188000     976     RW       uint32      b[9:0]           -  8192   1024 
   RAM_BF_WEIGHTS                            2     12    RAM    data                                      0x00190000     976     RW    cint16_ir     b[31:0]           -  16384  1024 
-  REG_BF_SCALE                              2     1     REG    scale                                     0x00198000       1     RW       uint32     b[15:0]           -  2      2    
-  -                                         -     -     -      unused                                    0x00198001       1     RW       uint32     b[31:0]           -  -      -    
-  REG_HDR_DAT                               2     1     REG    bsn                                       0x001a0000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x001a0001       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      sdp_block_period                          0x001a0002       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_beamlets_per_block                0x001a0003       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x001a0004       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_index                         0x001a0005       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_scale                         0x001a0006       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x001a0007       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001a0008       -      -            -      b[7:0]    b[39:32]  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x001a0009       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_beamlet_width             0x001a000a       1     RW       uint32      b[7:5]           -  -      -    
-  -                                         -     -     -      sdp_source_info_repositioning_flag        0x001a000b       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x001a000c       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x001a000d       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x001a000e       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x001a000f       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x001a0010       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x001a0011       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x001a0012       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x001a0013       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x001a0014       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x001a0015       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x001a0016       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x001a0017       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x001a0018       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x001a0019       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x001a001a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x001a001b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x001a001c       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x001a001d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x001a001e       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x001a001f       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x001a0020       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x001a0021       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x001a0022       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x001a0023       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x001a0024       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x001a0025       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x001a0026       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001a0027       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x001a0028       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001a0029       -      -            -     b[15:0]    b[47:32]  -      -    
-  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x001a8000       1     RW       uint32      b[0:0]           -  2      2    
-  RAM_ST_BST                                2     1     RAM    data                                      0x001b0000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
-  -                                         -     -     -      -                                         0x001b0001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x001b8000       1     RW       uint32      b[0:0]           -  2      2    
-  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x001c0000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x001c0001       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_period                              0x001c0002       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_statistics_per_packet                 0x001c0003       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_bytes_per_statistic                   0x001c0004       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      nof_signal_inputs                         0x001c0005       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id                               0x001c0006       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x001c0006       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_reserved                  0x001c0006       1     RW       uint32    b[31:16]           -  -      -    
-  -                                         -     -     -      sdp_integration_interval                  0x001c0007       1     RW       uint32     b[23:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x001c0008       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x001c0009       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_reserved                  0x001c000a       1     RW       uint32      b[7:5]           -  -      -    
-  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x001c000b       1     RW       uint32      b[8:8]           -  -      -    
-  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x001c000c       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x001c000d       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x001c000e       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x001c000f       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x001c0010       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x001c0011       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x001c0012       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x001c0013       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x001c0014       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x001c0015       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x001c0016       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x001c0017       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x001c0018       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x001c0019       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x001c001a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x001c001b       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x001c001c       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x001c001d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x001c001e       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x001c001f       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x001c0020       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x001c0021       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x001c0022       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x001c0023       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x001c0024       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x001c0025       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x001c0026       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x001c0027       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001c0028       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x001c0029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001c002a       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      word_align                                0x001c002b       1     RW       uint32     b[15:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x001c8000       1     RO       uint32      b[0:0]           -  1      8    
-  -                                         -     -     -      ready_stable                              0x001c8000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x001c8000       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x001c8001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001c8002       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x001c8003       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x001c8004       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x001c8005       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x001c8008       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x001d0000       1     RO       uint32      b[0:0]           -  1      8    
-  -                                         -     -     -      ready_stable                              0x001d0000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x001d0000       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x001d0001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001d0002       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x001d0003       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x001d0004       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x001d0005       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x001d0008       1     RO       uint32     b[31:0]           -  -      -    
-  REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x001d8000       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_transfer_status                        0x001d8001       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_transfer_control                       0x001d8002       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_padcrc_control                         0x001d8040       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      rx_crccheck_control                       0x001d8080       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      rx_pktovrflow_error                       0x001d80c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d80c1       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_pktovrflow_etherstatsdropevents        0x001d80c2       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d80c3       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_lane_decoder_preamble_control          0x001d8100       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_preamble_inserter_control              0x001d8140       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_frame_control                          0x001d8800       1     RW       uint32     b[19:0]           -  -      -    
-  -                                         -     -     -      rx_frame_maxlength                        0x001d8801       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_addr0                            0x001d8802       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_addr1                            0x001d8803       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr0_0                        0x001d8804       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr0_1                        0x001d8805       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr1_0                        0x001d8806       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr1_1                        0x001d8807       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr2_0                        0x001d8808       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr2_1                        0x001d8809       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr3_0                        0x001d880a       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr3_1                        0x001d880b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_pfc_control                            0x001d8818       1     RW       uint32     b[16:0]           -  -      -    
-  -                                         -     -     -      rx_stats_clr                              0x001d8c00       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_stats_framesok                         0x001d8c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c03       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_frameserr                        0x001d8c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c05       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_framescrcerr                     0x001d8c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c07       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_octetsok                         0x001d8c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c09       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_pausemacctrl_frames              0x001d8c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c0b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_iferrors                         0x001d8c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c0d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicast_framesok                 0x001d8c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c0f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicast_frameserr                0x001d8c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c11       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicastframesok                0x001d8c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c13       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicast_frameserr              0x001d8c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c15       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcastframesok                0x001d8c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c17       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcast_frameserr              0x001d8c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c19       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatsoctets                 0x001d8c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c1b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatspkts                   0x001d8c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c1d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_undersizepkts         0x001d8c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c1f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_oversizepkts          0x001d8c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c21       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts64octets          0x001d8c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c23       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts65to127octets     0x001d8c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c25       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts128to255octets    0x001d8c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c27       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts256to511octets    0x001d8c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c29       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts512to1023octets   0x001d8c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c2b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstat_pkts1024to1518octets   0x001d8c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c2d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts1519toxoctets     0x001d8c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c2f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_fragments             0x001d8c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c31       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_jabbers               0x001d8c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c33       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatscrcerr                 0x001d8c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c35       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicastmacctrlframes             0x001d8c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c37       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicastmac_ctrlframes          0x001d8c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c39       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcastmac_ctrlframes          0x001d8c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c3b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_pfcmacctrlframes                 0x001d8c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_transfer_status                        0x001d9001       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_padins_control                         0x001d9040       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_crcins_control                         0x001d9080       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      tx_pktunderflow_error                     0x001d90c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d90c1       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_preamble_control                       0x001d9100       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_control                     0x001d9140       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_quanta                      0x001d9141       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_enable                      0x001d9142       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_0                        0x001d9180       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_1                        0x001d9181       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_2                        0x001d9182       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_3                        0x001d9183       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_4                        0x001d9184       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_5                        0x001d9185       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_6                        0x001d9186       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_7                        0x001d9187       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_0                      0x001d9190       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_1                      0x001d9191       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_2                      0x001d9192       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_3                      0x001d9193       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_4                      0x001d9194       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_5                      0x001d9195       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_6                      0x001d9196       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_7                      0x001d9197       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      tx_pfc_priority_enable                    0x001d91a0       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_control                        0x001d9200       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_macaddr0                       0x001d9201       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_macaddr1                       0x001d9202       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_frame_maxlength                        0x001d9801       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_stats_clr                              0x001d9c00       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_stats_framesok                         0x001d9c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c03       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_frameserr                        0x001d9c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c05       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_framescrcerr                     0x001d9c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c07       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_octetsok                         0x001d9c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c09       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_pausemacctrl_frames              0x001d9c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c0b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_iferrors                         0x001d9c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c0d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicast_framesok                 0x001d9c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c0f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicast_frameserr                0x001d9c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c11       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicastframesok                0x001d9c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c13       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicast_frameserr              0x001d9c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c15       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcastframesok                0x001d9c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c17       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcast_frameserr              0x001d9c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c19       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatsoctets                 0x001d9c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c1b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatspkts                   0x001d9c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c1d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_undersizepkts         0x001d9c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c1f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_oversizepkts          0x001d9c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c21       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts64octets          0x001d9c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c23       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts65to127octets     0x001d9c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c25       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts128to255octets    0x001d9c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c27       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts256to511octets    0x001d9c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c29       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts512to1023octets   0x001d9c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c2b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstat_pkts1024to1518octets   0x001d9c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c2d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts1519toxoctets     0x001d9c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c2f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_fragments             0x001d9c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c31       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_jabbers               0x001d9c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c33       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatscrcerr                 0x001d9c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c35       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicastmacctrlframes             0x001d9c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c37       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicastmac_ctrlframes          0x001d9c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c39       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcastmac_ctrlframes          0x001d9c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c3b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x001d9c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x001e0000       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x001e0000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x001e0000       1     RO       uint32      b[3:2]           -  -      -    
\ No newline at end of file
+  REG_BSN_ALIGN_V2_BF                       2     2     REG    enable                                    0x00198000       1     RW       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      replaced_pkt_cnt                          0x00198001       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RX_ALIGN_BF            2     2     REG    xon_stable                                0x001a0000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001a0000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001a0000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001a0001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001a0002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001a0003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001a0004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001a0005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001a0008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_BF             2     1     REG    xon_stable                                0x001a8000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001a8000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001a8000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001a8001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001a8002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001a8003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001a8004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001a8005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001a8008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_RING_LANE_INFO_BF                     2     1     REG    lane_direction                            0x001b0000       1     RO       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      transport_nof_hops                        0x001b0001       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_RX_BF             2     16    REG    xon_stable                                0x001b8000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001b8000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001b8000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001b8001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001b8002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001b8003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001b8004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001b8005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001b8008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_TX_BF             2     16    REG    xon_stable                                0x001c0000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001c0000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001c0000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001c0001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001c0002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001c0003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001c0004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001c0005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001c0008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_ERR_BF              2     1     REG    err_count_index                           0x001c8000       8     RO       uint32     b[31:0]           -  1      16   
+  -                                         -     -     -      total_discarded_blocks                    0x001c8008       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_block_count                         0x001c8009       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x001c800a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_BF      2     1     REG    nof_sync_discarded                        0x001d0000       1     RO       uint32     b[31:0]           -  1      4    
+  -                                         -     -     -      nof_sync                                  0x001d0001       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x001d0002       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BF_SCALE                              2     1     REG    scale                                     0x001d8000       1     RW       uint32     b[15:0]           -  2      2    
+  -                                         -     -     -      unused                                    0x001d8001       1     RW       uint32     b[31:0]           -  -      -    
+  REG_HDR_DAT                               2     1     REG    bsn                                       0x001e0000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x001e0001       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      sdp_block_period                          0x001e0002       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_beamlets_per_block                0x001e0003       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x001e0004       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_index                         0x001e0005       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_scale                         0x001e0006       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x001e0007       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001e0008       -      -            -      b[7:0]    b[39:32]  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x001e0009       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beamlet_width             0x001e000a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_repositioning_flag        0x001e000b       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x001e000c       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x001e000d       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x001e000e       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x001e000f       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x001e0010       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x001e0011       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x001e0012       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x001e0013       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x001e0014       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x001e0015       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x001e0016       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x001e0017       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x001e0018       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x001e0019       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x001e001a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x001e001b       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x001e001c       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x001e001d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x001e001e       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x001e001f       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x001e0020       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x001e0021       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x001e0022       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x001e0023       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x001e0024       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x001e0025       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x001e0026       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001e0027       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x001e0028       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001e0029       -      -            -     b[15:0]    b[47:32]  -      -    
+  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x001e8000       1     RW       uint32      b[0:0]           -  2      2    
+  RAM_ST_BST                                2     1     RAM    data                                      0x001f0000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
+  -                                         -     -     -      -                                         0x001f0001       -      -            -     b[21:0]    b[53:32]  -      -    
+  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x001f8000       1     RW       uint32      b[0:0]           -  2      2    
+  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x00200000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x00200001       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      block_period                              0x00200002       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_statistics_per_packet                 0x00200003       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_bytes_per_statistic                   0x00200004       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      nof_signal_inputs                         0x00200005       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id                               0x00200006       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x00200006       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_reserved                  0x00200006       1     RW       uint32    b[31:16]           -  -      -    
+  -                                         -     -     -      sdp_integration_interval                  0x00200007       1     RW       uint32     b[23:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x00200008       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x00200009       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_reserved                  0x0020000a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x0020000b       1     RW       uint32      b[8:8]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x0020000c       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x0020000d       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x0020000e       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x0020000f       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x00200010       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00200011       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x00200012       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x00200013       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x00200014       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x00200015       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x00200016       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x00200017       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x00200018       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x00200019       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x0020001a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x0020001b       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x0020001c       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x0020001d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x0020001e       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x0020001f       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x00200020       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x00200021       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x00200022       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x00200023       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x00200024       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x00200025       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x00200026       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x00200027       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00200028       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x00200029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x0020002a       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      word_align                                0x0020002b       1     RW       uint32     b[15:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x00208000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00208000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00208000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00208001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00208002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00208003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00208004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00208005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00208008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x00210000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00210000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00210000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00210001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00210002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00210003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00210004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00210005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00210008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x00218000       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_transfer_status                        0x00218001       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_transfer_control                       0x00218002       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_padcrc_control                         0x00218040       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      rx_crccheck_control                       0x00218080       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      rx_pktovrflow_error                       0x002180c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x002180c1       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_pktovrflow_etherstatsdropevents        0x002180c2       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x002180c3       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_lane_decoder_preamble_control          0x00218100       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_preamble_inserter_control              0x00218140       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_frame_control                          0x00218800       1     RW       uint32     b[19:0]           -  -      -    
+  -                                         -     -     -      rx_frame_maxlength                        0x00218801       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_addr0                            0x00218802       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_addr1                            0x00218803       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr0_0                        0x00218804       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr0_1                        0x00218805       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr1_0                        0x00218806       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr1_1                        0x00218807       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr2_0                        0x00218808       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr2_1                        0x00218809       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr3_0                        0x0021880a       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr3_1                        0x0021880b       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_pfc_control                            0x00218818       1     RW       uint32     b[16:0]           -  -      -    
+  -                                         -     -     -      rx_stats_clr                              0x00218c00       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_stats_framesok                         0x00218c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c03       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_frameserr                        0x00218c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c05       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_framescrcerr                     0x00218c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c07       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_octetsok                         0x00218c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c09       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_pausemacctrl_frames              0x00218c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c0b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_iferrors                         0x00218c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c0d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_unicast_framesok                 0x00218c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c0f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_unicast_frameserr                0x00218c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c11       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_multicastframesok                0x00218c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c13       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_multicast_frameserr              0x00218c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c15       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_broadcastframesok                0x00218c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c17       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_broadcast_frameserr              0x00218c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c19       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstatsoctets                 0x00218c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c1b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstatspkts                   0x00218c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c1d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_undersizepkts         0x00218c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c1f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_oversizepkts          0x00218c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c21       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts64octets          0x00218c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c23       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts65to127octets     0x00218c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c25       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts128to255octets    0x00218c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c27       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts256to511octets    0x00218c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c29       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts512to1023octets   0x00218c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c2b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstat_pkts1024to1518octets   0x00218c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c2d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts1519toxoctets     0x00218c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c2f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_fragments             0x00218c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c31       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_jabbers               0x00218c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c33       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstatscrcerr                 0x00218c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c35       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_unicastmacctrlframes             0x00218c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c37       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_multicastmac_ctrlframes          0x00218c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c39       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_broadcastmac_ctrlframes          0x00218c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c3b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_pfcmacctrlframes                 0x00218c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c3d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_transfer_status                        0x00219001       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_padins_control                         0x00219040       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_crcins_control                         0x00219080       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      tx_pktunderflow_error                     0x002190c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x002190c1       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_preamble_control                       0x00219100       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_pauseframe_control                     0x00219140       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      tx_pauseframe_quanta                      0x00219141       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      tx_pauseframe_enable                      0x00219142       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_0                        0x00219180       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_1                        0x00219181       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_2                        0x00219182       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_3                        0x00219183       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_4                        0x00219184       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_5                        0x00219185       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_6                        0x00219186       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_7                        0x00219187       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_0                      0x00219190       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_1                      0x00219191       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_2                      0x00219192       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_3                      0x00219193       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_4                      0x00219194       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_5                      0x00219195       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_6                      0x00219196       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_7                      0x00219197       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      tx_pfc_priority_enable                    0x002191a0       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      tx_addrins_control                        0x00219200       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_addrins_macaddr0                       0x00219201       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      tx_addrins_macaddr1                       0x00219202       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      tx_frame_maxlength                        0x00219801       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      tx_stats_clr                              0x00219c00       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_stats_framesok                         0x00219c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c03       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_frameserr                        0x00219c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c05       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_framescrcerr                     0x00219c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c07       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_octetsok                         0x00219c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c09       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_pausemacctrl_frames              0x00219c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c0b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_iferrors                         0x00219c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c0d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_unicast_framesok                 0x00219c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c0f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_unicast_frameserr                0x00219c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c11       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_multicastframesok                0x00219c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c13       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_multicast_frameserr              0x00219c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c15       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_broadcastframesok                0x00219c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c17       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_broadcast_frameserr              0x00219c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c19       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstatsoctets                 0x00219c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c1b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstatspkts                   0x00219c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c1d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_undersizepkts         0x00219c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c1f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_oversizepkts          0x00219c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c21       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts64octets          0x00219c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c23       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts65to127octets     0x00219c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c25       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts128to255octets    0x00219c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c27       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts256to511octets    0x00219c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c29       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts512to1023octets   0x00219c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c2b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstat_pkts1024to1518octets   0x00219c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c2d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts1519toxoctets     0x00219c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c2f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_fragments             0x00219c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c31       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_jabbers               0x00219c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c33       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstatscrcerr                 0x00219c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c35       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_unicastmacctrlframes             0x00219c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c37       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_multicastmac_ctrlframes          0x00219c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c39       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_broadcastmac_ctrlframes          0x00219c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c3b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x00219c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c3d       -      -            -     b[31:0]     b[31:0]  -      -    
+  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x00220000       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      xgmii_tx_ready                            0x00220000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      xgmii_link_status                         0x00220000       1     RO       uint32      b[3:2]           -  -      -    
\ No newline at end of file
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.qsys.gold b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.qsys.gold
index 3253fb922b..bfc94ce876 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.qsys.gold
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.mmap.qsys.gold
@@ -36,98 +36,51 @@ number_of_columns = 13
   -                                         -     -     -      stamp_commit                              0x00000011       3     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      design_note                               0x00000014      52     RO        char8     b[31:0]      b[7:0]  -      -    
   REG_WDI                                   1     1     REG    wdi_override                              0x00000c00       1     WO       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  REG_FPGA_TEMP_SENS                        1     1     REG    temp                                      0x00043238       1     RO       uint32     b[31:0]           -  -      -    
-  REG_FPGA_VOLTAGE_SENS                     1     1     REG    voltages                                  0x00043200       6     RO       uint32     b[31:0]           -  -      -    
-=======
-  REG_FPGA_TEMP_SENS                        1     1     REG    temp                                      0x00043210       1     RO       uint32     b[31:0]           -  -      -    
-  REG_FPGA_VOLTAGE_SENS                     1     1     REG    voltages                                  0x000431e0       6     RO       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_FPGA_TEMP_SENS                        1     1     REG    temp                                      0x00043498       1     RO       uint32     b[31:0]           -  -      -    
+  REG_FPGA_VOLTAGE_SENS                     1     1     REG    voltages                                  0x00043450       6     RO       uint32     b[31:0]           -  -      -    
   RAM_SCRAP                                 1     1     RAM    data                                      0x00000200     512     RW       uint32     b[31:0]           -  -      -    
   AVS_ETH_0_TSE                             1     1     REG    status                                    0x00000400    1024     RO       uint32     b[31:0]           -  -      -    
-  AVS_ETH_0_REG                             1     1     REG    status                                    0x000431b0      12     RO       uint32     b[31:0]           -  -      -    
+  AVS_ETH_0_REG                             1     1     REG    status                                    0x000433e0      12     RO       uint32     b[31:0]           -  -      -    
   AVS_ETH_0_RAM                             1     1     RAM    data                                      0x00000800    1024     RW       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  PIO_PPS                                   1     1     REG    capture_cnt                               0x00043264       1     RO       uint32     b[29:0]           -  -      -    
-  -                                         -     -     -      stable                                    0x00043264       1     RO       uint32    b[30:30]           -  -      -    
-  -                                         -     -     -      toggle                                    0x00043264       1     RO       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      expected_cnt                              0x00043265       1     RW       uint32     b[27:0]           -  -      -    
-  -                                         -     -     -      edge                                      0x00043265       1     RW       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      offset_cnt                                0x00043266       1     RO       uint32     b[27:0]           -  -      -    
-  REG_EPCS                                  1     1     REG    addr                                      0x00043240       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      rden                                      0x00043241       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      read_bit                                  0x00043242       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_bit                                 0x00043243       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      sector_erase                              0x00043244       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x00043245       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      unprotect                                 0x00043246       1     WO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_CTRL                             1     1     REG    rd_usedw                                  0x0004327e       1     RO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_DATA                             1     1     FIFO   data                                      0x0004327c       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_CTRL                             1     1     REG    wr_usedw                                  0x0004327a       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      wr_availw                                 0x0004327b       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_DATA                             1     1     FIFO   data                                      0x00043278       1     WO       uint32     b[31:0]           -  -      -    
-  REG_REMU                                  1     1     REG    reconfigure                               0x00043248       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      param                                     0x00043249       1     WO       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      read_param                                0x0004324a       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_param                               0x0004324b       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      data_out                                  0x0004324c       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      data_in                                   0x0004324d       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x0004324e       1     RO       uint32      b[0:0]           -  -      -    
-  REG_SDP_INFO                              1     1     REG    block_period                              0x000431f0       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      beam_repositioning_flag                   0x000431f1       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      fsub_type                                 0x000431f2       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      f_adc                                     0x000431f3       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      nyquist_zone_index                        0x000431f4       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      observation_id                            0x000431f5       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      antenna_band_index                        0x000431f6       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      station_id                                0x000431f7       1     RW       uint32     b[15:0]           -  -      -    
-  REG_RING_INFO                             1     1     REG    use_cable_to_previous_rn                  0x00043250       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      use_cable_to_next_rn                      0x00043251       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      n_rn                                      0x00043252       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      o_rn                                      0x00043253       1     RW       uint32      b[7:0]           -  -      -    
-  PIO_JESD_CTRL                             1     1     REG    enable                                    0x0004326e       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      reset                                     0x0004326e       1     RW       uint32    b[31:31]           -  -      -    
-=======
-  PIO_PPS                                   1     1     REG    capture_cnt                               0x0004323c       1     RO       uint32     b[29:0]           -  -      -    
-  -                                         -     -     -      stable                                    0x0004323c       1     RO       uint32    b[30:30]           -  -      -    
-  -                                         -     -     -      toggle                                    0x0004323c       1     RO       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      expected_cnt                              0x0004323d       1     RW       uint32     b[27:0]           -  -      -    
-  -                                         -     -     -      edge                                      0x0004323d       1     RW       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      offset_cnt                                0x0004323e       1     RO       uint32     b[27:0]           -  -      -    
-  REG_EPCS                                  1     1     REG    addr                                      0x00043218       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      rden                                      0x00043219       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      read_bit                                  0x0004321a       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_bit                                 0x0004321b       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      sector_erase                              0x0004321c       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x0004321d       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      unprotect                                 0x0004321e       1     WO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_CTRL                             1     1     REG    rd_usedw                                  0x00043256       1     RO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_DATA                             1     1     FIFO   data                                      0x00043254       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_CTRL                             1     1     REG    wr_usedw                                  0x00043252       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      wr_availw                                 0x00043253       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_DATA                             1     1     FIFO   data                                      0x00043250       1     WO       uint32     b[31:0]           -  -      -    
-  REG_REMU                                  1     1     REG    reconfigure                               0x00043220       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      param                                     0x00043221       1     WO       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      read_param                                0x00043222       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_param                               0x00043223       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      data_out                                  0x00043224       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      data_in                                   0x00043225       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x00043226       1     RO       uint32      b[0:0]           -  -      -    
-  REG_SDP_INFO                              1     1     REG    block_period                              0x000431d0       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      beam_repositioning_flag                   0x000431d1       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      fsub_type                                 0x000431d2       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      f_adc                                     0x000431d3       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      nyquist_zone_index                        0x000431d4       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      observation_id                            0x000431d5       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      antenna_band_index                        0x000431d6       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      station_id                                0x000431d7       1     RW       uint32     b[15:0]           -  -      -    
-  REG_RING_INFO                             1     1     REG    use_cable_to_previous_rn                  0x00043228       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      use_cable_to_next_rn                      0x00043229       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      n_rn                                      0x0004322a       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      o_rn                                      0x0004322b       1     RW       uint32      b[7:0]           -  -      -    
-  PIO_JESD_CTRL                             1     1     REG    enable                                    0x00043246       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      reset                                     0x00043246       1     RW       uint32    b[31:31]           -  -      -    
->>>>>>> master
+  PIO_PPS                                   1     1     REG    capture_cnt                               0x000434c8       1     RO       uint32     b[29:0]           -  -      -    
+  -                                         -     -     -      stable                                    0x000434c8       1     RO       uint32    b[30:30]           -  -      -    
+  -                                         -     -     -      toggle                                    0x000434c8       1     RO       uint32    b[31:31]           -  -      -    
+  -                                         -     -     -      expected_cnt                              0x000434c9       1     RW       uint32     b[27:0]           -  -      -    
+  -                                         -     -     -      edge                                      0x000434c9       1     RW       uint32    b[31:31]           -  -      -    
+  -                                         -     -     -      offset_cnt                                0x000434ca       1     RO       uint32     b[27:0]           -  -      -    
+  REG_EPCS                                  1     1     REG    addr                                      0x000434a0       1     WO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      rden                                      0x000434a1       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      read_bit                                  0x000434a2       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      write_bit                                 0x000434a3       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      sector_erase                              0x000434a4       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      busy                                      0x000434a5       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      unprotect                                 0x000434a6       1     WO       uint32     b[31:0]           -  -      -    
+  REG_DPMM_CTRL                             1     1     REG    rd_usedw                                  0x000434e2       1     RO       uint32     b[31:0]           -  -      -    
+  REG_DPMM_DATA                             1     1     FIFO   data                                      0x000434e0       1     RO       uint32     b[31:0]           -  -      -    
+  REG_MMDP_CTRL                             1     1     REG    wr_usedw                                  0x000434de       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      wr_availw                                 0x000434df       1     RO       uint32     b[31:0]           -  -      -    
+  REG_MMDP_DATA                             1     1     FIFO   data                                      0x000434dc       1     WO       uint32     b[31:0]           -  -      -    
+  REG_REMU                                  1     1     REG    reconfigure                               0x000434a8       1     WO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      param                                     0x000434a9       1     WO       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      read_param                                0x000434aa       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      write_param                               0x000434ab       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      data_out                                  0x000434ac       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      data_in                                   0x000434ad       1     WO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      busy                                      0x000434ae       1     RO       uint32      b[0:0]           -  -      -    
+  REG_SDP_INFO                              1     1     REG    block_period                              0x00043440       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      beam_repositioning_flag                   0x00043441       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      fsub_type                                 0x00043442       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      f_adc                                     0x00043443       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      nyquist_zone_index                        0x00043444       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      observation_id                            0x00043445       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      antenna_band_index                        0x00043446       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      station_id                                0x00043447       1     RW       uint32     b[15:0]           -  -      -    
+  REG_RING_INFO                             1     1     REG    use_cable_to_previous_rn                  0x000434b4       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      use_cable_to_next_rn                      0x000434b5       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      n_rn                                      0x000434b6       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      o_rn                                      0x000434b7       1     RW       uint32      b[7:0]           -  -      -    
+  PIO_JESD_CTRL                             1     1     REG    enable                                    0x000434d2       1     RW       uint32     b[30:0]           -  -      -    
+  -                                         -     -     -      reset                                     0x000434d2       1     RW       uint32    b[31:31]           -  -      -    
   JESD204B                                  1     12    REG    rx_lane_ctrl_common                       0x00042000       1     RW       uint32      b[2:0]           -  -      256  
   -                                         -     -     -      rx_lane_ctrl_0                            0x00042001       1     RW       uint32      b[2:0]           -  -      -    
   -                                         -     -     -      rx_lane_ctrl_1                            0x00042002       1     RW       uint32      b[2:0]           -  -      -    
@@ -165,68 +118,47 @@ number_of_columns = 13
   -                                         -     -     -      rx_status5                                0x0004203d       1     RW       uint32     b[15:0]           -  -      -    
   -                                         -     -     -      rx_status6                                0x0004203e       1     RW       uint32     b[23:0]           -  -      -    
   -                                         -     -     -      rx_status7                                0x0004203f       1     RO       uint32     b[31:0]           -  -      -    
-  REG_DP_SHIFTRAM                           1     12    REG    shift                                     0x00043180       1     RW       uint32     b[11:0]           -  -      2    
-<<<<<<< HEAD
-  REG_BSN_SOURCE_V2                         1     1     REG    dp_on                                     0x00043230       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      dp_on_pps                                 0x00043230       1     RW       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      nof_clk_per_sync                          0x00043231       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      bsn_init                                  0x00043232       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043233       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      bsn_time_offset                           0x00043234       1     RW       uint32      b[9:0]           -  -      -    
-  REG_BSN_SCHEDULER                         1     1     REG    scheduled_bsn                             0x00043274       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043275       -      -            -     b[31:0]    b[63:32]  -      -    
-=======
-  REG_BSN_SOURCE_V2                         1     1     REG    dp_on                                     0x00043208       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      dp_on_pps                                 0x00043208       1     RW       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      nof_clk_per_sync                          0x00043209       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      bsn_init                                  0x0004320a       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004320b       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      bsn_time_offset                           0x0004320c       1     RW       uint32      b[9:0]           -  -      -    
-  REG_BSN_SCHEDULER                         1     1     REG    scheduled_bsn                             0x0004324c       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004324d       -      -            -     b[31:0]    b[63:32]  -      -    
->>>>>>> master
-  REG_BSN_MONITOR_INPUT                     1     1     REG    xon_stable                                0x00000100       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00000100       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00000100       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00000101       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000102       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00000103       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00000104       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00000105       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      bsn_first                                 0x00000106       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000107       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      bsn_first_cycle_cnt                       0x00000108       1     RO       uint32     b[31:0]           -  -      -    
-  REG_WG                                    1     12    REG    mode                                      0x00043080       1     RW       uint32      b[7:0]           -  -      4    
-  -                                         -     -     -      nof_samples                               0x00043080       1     RW       uint32    b[31:16]           -  -      -    
-  -                                         -     -     -      phase                                     0x00043081       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      freq                                      0x00043082       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ampl                                      0x00043083       1     RW       uint32     b[16:0]           -  -      -    
+  REG_DP_SHIFTRAM                           1     12    REG    shift                                     0x000433c0       1     RW       uint32     b[11:0]           -  -      2    
+  REG_BSN_SOURCE_V2                         1     1     REG    dp_on                                     0x00043490       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      dp_on_pps                                 0x00043490       1     RW       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      nof_clk_per_sync                          0x00043491       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      bsn_init                                  0x00043492       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043493       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      bsn_time_offset                           0x00043494       1     RW       uint32      b[9:0]           -  -      -    
+  REG_BSN_SCHEDULER                         1     1     REG    scheduled_bsn                             0x000434d8       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000434d9       -      -            -     b[31:0]    b[63:32]  -      -    
+  REG_BSN_MONITOR_INPUT                     1     1     REG    xon_stable                                0x00043000       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      bsn_first                                 0x00043006       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043007       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      bsn_first_cycle_cnt                       0x00043008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_WG                                    1     12    REG    mode                                      0x00043280       1     RW       uint32      b[7:0]           -  -      4    
+  -                                         -     -     -      nof_samples                               0x00043280       1     RW       uint32    b[31:16]           -  -      -    
+  -                                         -     -     -      phase                                     0x00043281       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      freq                                      0x00043282       1     RW       uint32     b[30:0]           -  -      -    
+  -                                         -     -     -      ampl                                      0x00043283       1     RW       uint32     b[16:0]           -  -      -    
   RAM_WG                                    1     12    RAM    data                                      0x00034000    1024     RW       uint32     b[17:0]           -  -      1024 
   RAM_ST_HISTOGRAM                          1     12    RAM    data                                      0x00002000     512     RW       uint32     b[31:0]     b[27:0]  -      512  
-  REG_ADUH_MONITOR                          1     12    REG    mean_sum                                  0x000430c0       1     RO        int64     b[31:0]     b[31:0]  -      4    
-  -                                         -     -     -      -                                         0x000430c1       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      power_sum                                 0x000430c2       1     RO        int64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000430c3       -      -            -     b[31:0]    b[63:32]  -      -    
-  REG_DIAG_DATA_BUFFER_BSN                  1     12    REG    sync_cnt                                  0x00000c20       1     RO       uint32     b[31:0]           -  -      2    
-  -                                         -     -     -      word_cnt                                  0x00000c21       1     RO       uint32     b[31:0]           -  -      -    
+  REG_ADUH_MONITOR                          1     12    REG    mean_sum                                  0x000432c0       1     RO        int64     b[31:0]     b[31:0]  -      4    
+  -                                         -     -     -      -                                         0x000432c1       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      power_sum                                 0x000432c2       1     RO        int64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000432c3       -      -            -     b[31:0]    b[63:32]  -      -    
+  REG_DIAG_DATA_BUFFER_BSN                  1     12    REG    sync_cnt                                  0x000433a0       1     RO       uint32     b[31:0]           -  -      2    
+  -                                         -     -     -      word_cnt                                  0x000433a1       1     RO       uint32     b[31:0]           -  -      -    
   RAM_DIAG_DATA_BUFFER_BSN                  1     12    RAM    data                                      0x00200000    1024     RW       uint32     b[31:0]     b[15:0]  -      1024 
-<<<<<<< HEAD
-  REG_SI                                    1     1     REG    enable                                    0x00043276       1     RW       uint32      b[0:0]           -  -      -    
-  RAM_FIL_COEFS                             1     16    RAM    data                                      0x00038000    1024     RW       uint32     b[15:0]           -  -      1024 
-  RAM_EQUALIZER_GAINS                       1     6     RAM    data                                      0x00040000    1024     RW    cint16_ir     b[31:0]           -  -      1024 
-  REG_DP_SELECTOR                           1     1     REG    input_select                              0x00043272       1     RW       uint32      b[0:0]           -  -      -    
-  RAM_ST_SST                                1     6     RAM    data                                      0x0003c000    1024     RW       uint64     b[31:0]     b[31:0]  -      2048 
-  -                                         -     -     -      -                                         0x0003c001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_SST                       1     1     REG    enable                                    0x0004326c       1     RW       uint32      b[0:0]           -  -      -    
-=======
-  REG_SI                                    1     1     REG    enable                                    0x0004324e       1     RW       uint32      b[0:0]           -  -      -    
+  REG_SI                                    1     1     REG    enable                                    0x000434da       1     RW       uint32      b[0:0]           -  -      -    
   RAM_FIL_COEFS                             1     16    RAM    data                                      0x00038000    1024     RW       uint32     b[15:0]           -  -      1024 
   RAM_EQUALIZER_GAINS                       1     6     RAM    data                                      0x00040000    1024     RW    cint16_ir     b[31:0]           -  -      1024 
-  REG_DP_SELECTOR                           1     1     REG    input_select                              0x0004324a       1     RW       uint32      b[0:0]           -  -      -    
+  REG_DP_SELECTOR                           1     1     REG    input_select                              0x000434d6       1     RW       uint32      b[0:0]           -  -      -    
   RAM_ST_SST                                1     6     RAM    data                                      0x0003c000    1024     RW       uint64     b[31:0]     b[31:0]  -      2048 
   -                                         -     -     -      -                                         0x0003c001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_SST                       1     1     REG    enable                                    0x00043244       1     RW       uint32      b[0:0]           -  -      -    
->>>>>>> master
+  REG_STAT_ENABLE_SST                       1     1     REG    enable                                    0x000434d0       1     RW       uint32      b[0:0]           -  -      -    
   REG_STAT_HDR_DAT_SST                      1     1     REG    bsn                                       0x00000c40       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x00000c41       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      sdp_block_period                          0x00000c42       1     RW       uint32     b[15:0]           -  -      -    
@@ -273,59 +205,36 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x00000c69       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x00000c6a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x00000c6b       1     RW       uint32     b[15:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_SST_OFFLOAD            1     1     REG    xon_stable                                0x00000c08       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00000c08       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00000c08       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00000c09       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000c0a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00000c0b       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00000c0c       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00000c0d       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00000c10       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x000431d0       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ctrl_interval_size                        0x000431d1       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ctrl_start_bsn                            0x000431d2       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431d3       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_current_input_bsn                     0x000431d4       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431d5       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_input_bsn_at_sync                     0x000431d6       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431d7       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_output_enable                         0x000431d8       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      mon_output_sync_bsn                       0x000431d9       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431da       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_size                                0x000431db       1     RO       uint32     b[31:0]           -  -      -    
-=======
-  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x000431b0       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ctrl_interval_size                        0x000431b1       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ctrl_start_bsn                            0x000431b2       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431b3       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_current_input_bsn                     0x000431b4       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431b5       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_input_bsn_at_sync                     0x000431b6       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431b7       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_output_enable                         0x000431b8       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      mon_output_sync_bsn                       0x000431b9       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431ba       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_size                                0x000431bb       1     RO       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_BSN_MONITOR_V2_SST_OFFLOAD            1     1     REG    xon_stable                                0x00043470       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043470       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043470       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043471       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043472       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043473       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043474       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043475       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043478       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x00043420       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ctrl_interval_size                        0x00043421       1     RW       uint32     b[30:0]           -  -      -    
+  -                                         -     -     -      ctrl_start_bsn                            0x00043422       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043423       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      mon_current_input_bsn                     0x00043424       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043425       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      mon_input_bsn_at_sync                     0x00043426       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043427       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      mon_output_enable                         0x00043428       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      mon_output_sync_bsn                       0x00043429       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x0004342a       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      block_size                                0x0004342b       1     RO       uint32     b[31:0]           -  -      -    
   RAM_ST_XSQ                                1     9     RAM    data                                      0x00010000    1008     RW    cint64_ir     b[31:0]     b[31:0]  -      4096 
   -                                         -     -     -      -                                         0x00010001       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      -                                         0x00010002       -      -            -     b[31:0]    b[95:64]  -      -    
   -                                         -     -     -      -                                         0x00010003       -      -            -     b[31:0]   b[127:96]  -      -    
-<<<<<<< HEAD
-  REG_CROSSLETS_INFO                        1     1     REG    offset                                    0x000431e0      15     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      step                                      0x000431ef       1     RW       uint32     b[31:0]           -  -      -    
-  REG_NOF_CROSSLETS                         1     1     REG    nof_crosslets                             0x00043268       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      unused                                    0x00043269       1     RW       uint32     b[31:0]           -  -      -    
-  REG_STAT_ENABLE_XST                       1     1     REG    enable                                    0x0004326a       1     RW       uint32      b[0:0]           -  -      -    
-=======
-  REG_CROSSLETS_INFO                        1     1     REG    offset                                    0x000431c0      15     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      step                                      0x000431cf       1     RW       uint32     b[31:0]           -  -      -    
-  REG_NOF_CROSSLETS                         1     1     REG    nof_crosslets                             0x00043240       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      unused                                    0x00043241       1     RW       uint32     b[31:0]           -  -      -    
-  REG_STAT_ENABLE_XST                       1     1     REG    enable                                    0x00043242       1     RW       uint32      b[0:0]           -  -      -    
->>>>>>> master
+  REG_CROSSLETS_INFO                        1     1     REG    offset                                    0x00043430      15     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      step                                      0x0004343f       1     RW       uint32     b[31:0]           -  -      -    
+  REG_NOF_CROSSLETS                         1     1     REG    nof_crosslets                             0x000434cc       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      unused                                    0x000434cd       1     RW       uint32     b[31:0]           -  -      -    
+  REG_STAT_ENABLE_XST                       1     1     REG    enable                                    0x000434ce       1     RW       uint32      b[0:0]           -  -      -    
   REG_STAT_HDR_DAT_XST                      1     1     REG    bsn                                       0x00000040       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x00000041       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      block_period                              0x00000042       1     RW       uint32     b[15:0]           -  -      -    
@@ -374,56 +283,35 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x00000069       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x0000006a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x0000006b       1     RW       uint32     b[15:0]           -  -      -    
-  REG_BSN_ALIGN_V2                          1     9     REG    enable                                    0x00000020       1     RW       uint32      b[0:0]           -  -      2    
-  -                                         -     -     -      replaced_pkt_cnt                          0x00000021       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_INPUT     1     9     REG    xon_stable                                0x00000d00       1     RO       uint32      b[0:0]           -  -      8    
-  -                                         -     -     -      ready_stable                              0x00000d00       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00000d00       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00000d01       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000d02       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00000d03       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00000d04       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00000d05       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00000d08       1     RO       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT    1     1     REG    xon_stable                                0x00043228       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00043228       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00043228       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00043229       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004322a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x0004322b       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x0004322c       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x0004322d       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043230       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_XST_OFFLOAD            1     1     REG    xon_stable                                0x00043220       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00043220       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00043220       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00043221       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043222       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00043223       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00043224       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00043225       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043228       1     RO       uint32     b[31:0]           -  -      -    
-=======
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT    1     1     REG    xon_stable                                0x00043200       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00043200       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00043200       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00043201       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043202       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00043203       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00043204       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00043205       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043208       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_XST_OFFLOAD            1     1     REG    xon_stable                                0x000431f8       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x000431f8       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x000431f8       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x000431f9       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431fa       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x000431fb       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x000431fc       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x000431fd       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043200       1     RO       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_BSN_ALIGN_V2_XSUB                     1     9     REG    enable                                    0x00043380       1     RW       uint32      b[0:0]           -  -      2    
+  -                                         -     -     -      replaced_pkt_cnt                          0x00043381       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RX_ALIGN_XSUB          1     9     REG    xon_stable                                0x00043100       1     RO       uint32      b[0:0]           -  -      8    
+  -                                         -     -     -      ready_stable                              0x00043100       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043100       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043101       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043102       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043103       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043104       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043105       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043108       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_XSUB           1     1     REG    xon_stable                                0x00043488       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043488       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043488       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043489       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x0004348a       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x0004348b       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x0004348c       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x0004348d       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043490       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_XST_OFFLOAD            1     1     REG    xon_stable                                0x00043480       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043480       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043480       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043481       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043482       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043483       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043484       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043485       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043488       1     RO       uint32     b[31:0]           -  -      -    
   REG_RING_LANE_INFO_XST                    1     1     REG    lane_direction                            0x00000c02       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      transport_nof_hops                        0x00000c03       1     RW       uint32     b[31:0]           -  -      -    
   REG_BSN_MONITOR_V2_RING_RX_XST            1     16    REG    xon_stable                                0x00000c80       1     RO       uint32      b[0:0]           -  -      8    
@@ -444,23 +332,13 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00000084       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00000085       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00000088       1     RO       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  REG_DP_BLOCK_VALIDATE_ERR_XST             1     1     REG    err_count_index                           0x000431c0       8     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_discarded_blocks                    0x000431c8       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_block_count                         0x000431c9       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x000431ca       1     RW       uint32     b[31:0]           -  -      -    
-  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_XST     1     1     REG    nof_sync_discarded                        0x00043254       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_sync                                  0x00043255       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x00043256       1     RW       uint32     b[31:0]           -  -      -    
-=======
-  REG_DP_BLOCK_VALIDATE_ERR_XST             1     1     REG    err_count_index                           0x000431a0       8     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_discarded_blocks                    0x000431a8       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_block_count                         0x000431a9       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x000431aa       1     RW       uint32     b[31:0]           -  -      -    
-  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_XST     1     1     REG    nof_sync_discarded                        0x0004322c       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_sync                                  0x0004322d       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x0004322e       1     RW       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_DP_BLOCK_VALIDATE_ERR_XST             1     1     REG    err_count_index                           0x00043410       8     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_discarded_blocks                    0x00043418       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_block_count                         0x00043419       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x0004341a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_XST     1     1     REG    nof_sync_discarded                        0x000434b8       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_sync                                  0x000434b9       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x000434ba       1     RW       uint32     b[31:0]           -  -      -    
   REG_TR_10GBE_MAC                          1     3     REG    rx_transfer_control                       0x00020000       1     RW       uint32      b[0:0]           -  -      1    
   -                                         -     -     -      rx_transfer_status                        0x00020001       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      tx_transfer_control                       0x00020002       1     RW       uint32      b[0:0]           -  -      -    
@@ -637,133 +515,23 @@ number_of_columns = 13
   -                                         -     -     -      -                                         0x00021c3b       -      -            -     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x00021c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
   -                                         -     -     -      -                                         0x00021c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-<<<<<<< HEAD
-  REG_TR_10GBE_ETH10G                       1     3     REG    tx_snk_out_xon                            0x00043218       1     RO       uint32      b[0:0]           -  -      1    
-  -                                         -     -     -      xgmii_tx_ready                            0x00043218       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x00043218       1     RO       uint32      b[3:2]           -  -      -    
-  RAM_SS_SS_WIDE                            2     6     RAM    data                                      0x00030000     976     RW       uint32      b[9:0]           -  8192   1024 
-  RAM_BF_WEIGHTS                            2     12    RAM    data                                      0x00028000     976     RW    cint16_ir     b[31:0]           -  16384  1024 
-  REG_BF_SCALE                              2     1     REG    scale                                     0x00043260       1     RW       uint32     b[15:0]           -  2      2    
-  -                                         -     -     -      unused                                    0x00043261       1     RW       uint32     b[31:0]           -  -      -    
-=======
-  REG_TR_10GBE_ETH10G                       1     3     REG    tx_snk_out_xon                            0x000431f0       1     RO       uint32      b[0:0]           -  -      1    
-  -                                         -     -     -      xgmii_tx_ready                            0x000431f0       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x000431f0       1     RO       uint32      b[3:2]           -  -      -    
+  REG_TR_10GBE_ETH10G                       1     3     REG    tx_snk_out_xon                            0x00043478       1     RO       uint32      b[0:0]           -  -      1    
+  -                                         -     -     -      xgmii_tx_ready                            0x00043478       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      xgmii_link_status                         0x00043478       1     RO       uint32      b[3:2]           -  -      -    
   RAM_SS_SS_WIDE                            2     6     RAM    data                                      0x00030000     976     RW       uint32      b[9:0]           -  8192   1024 
   RAM_BF_WEIGHTS                            2     12    RAM    data                                      0x00028000     976     RW    cint16_ir     b[31:0]           -  16384  1024 
-  REG_BF_SCALE                              2     1     REG    scale                                     0x00043238       1     RW       uint32     b[15:0]           -  2      2    
-  -                                         -     -     -      unused                                    0x00043239       1     RW       uint32     b[31:0]           -  -      -    
->>>>>>> master
-  REG_HDR_DAT                               2     1     REG    bsn                                       0x00043000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x00043001       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      sdp_block_period                          0x00043002       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_beamlets_per_block                0x00043003       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x00043004       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_index                         0x00043005       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_scale                         0x00043006       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x00043007       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043008       -      -            -      b[7:0]    b[39:32]  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x00043009       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_beamlet_width             0x0004300a       1     RW       uint32      b[7:5]           -  -      -    
-  -                                         -     -     -      sdp_source_info_repositioning_flag        0x0004300b       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x0004300c       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x0004300d       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x0004300e       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x0004300f       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00043010       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x00043011       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x00043012       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x00043013       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x00043014       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x00043015       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x00043016       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x00043017       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x00043018       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x00043019       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x0004301a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x0004301b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x0004301c       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x0004301d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x0004301e       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x0004301f       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x00043020       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x00043021       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x00043022       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x00043023       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x00043024       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x00043025       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x00043026       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043027       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x00043028       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043029       -      -            -     b[15:0]    b[47:32]  -      -    
-<<<<<<< HEAD
-  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x0004325c       1     RW       uint32      b[0:0]           -  2      2    
-  RAM_ST_BST                                2     1     RAM    data                                      0x00001000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
-  -                                         -     -     -      -                                         0x00001001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x00043258       1     RW       uint32      b[0:0]           -  2      2    
-=======
-  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x00043234       1     RW       uint32      b[0:0]           -  2      2    
-  RAM_ST_BST                                2     1     RAM    data                                      0x00001000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
-  -                                         -     -     -      -                                         0x00001001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x00043230       1     RW       uint32      b[0:0]           -  2      2    
->>>>>>> master
-  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x00000d80       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x00000d81       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_period                              0x00000d82       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_statistics_per_packet                 0x00000d83       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_bytes_per_statistic                   0x00000d84       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      nof_signal_inputs                         0x00000d85       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id                               0x00000d86       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x00000d86       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_reserved                  0x00000d86       1     RW       uint32    b[31:16]           -  -      -    
-  -                                         -     -     -      sdp_integration_interval                  0x00000d87       1     RW       uint32     b[23:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x00000d88       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x00000d89       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_reserved                  0x00000d8a       1     RW       uint32      b[7:5]           -  -      -    
-  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x00000d8b       1     RW       uint32      b[8:8]           -  -      -    
-  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x00000d8c       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x00000d8d       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x00000d8e       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x00000d8f       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x00000d90       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00000d91       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x00000d92       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x00000d93       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x00000d94       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x00000d95       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x00000d96       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x00000d97       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x00000d98       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x00000d99       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x00000d9a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x00000d9b       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x00000d9c       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x00000d9d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x00000d9e       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x00000d9f       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x00000da0       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x00000da1       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x00000da2       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x00000da3       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x00000da4       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x00000da5       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x00000da6       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x00000da7       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000da8       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x00000da9       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000daa       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      word_align                                0x00000dab       1     RW       uint32     b[15:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x000431a0       1     RO       uint32      b[0:0]           -  1      8    
-  -                                         -     -     -      ready_stable                              0x000431a0       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x000431a0       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x000431a1       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431a2       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x000431a3       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x000431a4       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x000431a5       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x000431a8       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x00000c10       1     RO       uint32      b[0:0]           -  1      8    
+  REG_BSN_ALIGN_V2_BF                       2     2     REG    enable                                    0x00043460       1     RW       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      replaced_pkt_cnt                          0x00043461       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RX_ALIGN_BF            2     2     REG    xon_stable                                0x00000c20       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00000c20       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00000c20       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00000c21       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00000c22       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00000c23       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00000c24       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00000c25       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00000c28       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_BF             2     1     REG    xon_stable                                0x00000c10       1     RO       uint32      b[0:0]           -  1      8    
   -                                         -     -     -      ready_stable                              0x00000c10       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00000c10       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00000c11       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -772,8 +540,145 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00000c14       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00000c15       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00000c18       1     RO       uint32     b[31:0]           -  -      -    
-=======
->>>>>>> master
+  REG_RING_LANE_INFO_BF                     2     1     REG    lane_direction                            0x00000c04       1     RO       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      transport_nof_hops                        0x00000c05       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_RX_BF             2     16    REG    xon_stable                                0x00000d00       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00000d00       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00000d00       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00000d01       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00000d02       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00000d03       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00000d04       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00000d05       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00000d08       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_TX_BF             2     16    REG    xon_stable                                0x00000100       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00000100       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00000100       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00000101       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00000102       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00000103       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00000104       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00000105       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00000108       1     RO       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_ERR_BF              2     1     REG    err_count_index                           0x00000020       8     RO       uint32     b[31:0]           -  1      16   
+  -                                         -     -     -      total_discarded_blocks                    0x00000028       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_block_count                         0x00000029       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x0000002a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_BF      2     1     REG    nof_sync_discarded                        0x00000c08       1     RO       uint32     b[31:0]           -  1      4    
+  -                                         -     -     -      nof_sync                                  0x00000c09       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x00000c0a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BF_SCALE                              2     1     REG    scale                                     0x000434c4       1     RW       uint32     b[15:0]           -  2      2    
+  -                                         -     -     -      unused                                    0x000434c5       1     RW       uint32     b[31:0]           -  -      -    
+  REG_HDR_DAT                               2     1     REG    bsn                                       0x00043200       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x00043201       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      sdp_block_period                          0x00043202       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_beamlets_per_block                0x00043203       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x00043204       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_index                         0x00043205       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_scale                         0x00043206       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x00043207       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043208       -      -            -      b[7:0]    b[39:32]  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x00043209       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beamlet_width             0x0004320a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_repositioning_flag        0x0004320b       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x0004320c       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x0004320d       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x0004320e       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x0004320f       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00043210       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x00043211       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x00043212       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x00043213       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x00043214       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x00043215       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x00043216       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x00043217       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x00043218       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x00043219       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x0004321a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x0004321b       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x0004321c       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x0004321d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x0004321e       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x0004321f       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x00043220       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x00043221       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x00043222       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x00043223       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x00043224       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x00043225       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x00043226       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043227       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x00043228       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043229       -      -            -     b[15:0]    b[47:32]  -      -    
+  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x000434c0       1     RW       uint32      b[0:0]           -  2      2    
+  RAM_ST_BST                                2     1     RAM    data                                      0x00001000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
+  -                                         -     -     -      -                                         0x00001001       -      -            -     b[21:0]    b[53:32]  -      -    
+  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x000434bc       1     RW       uint32      b[0:0]           -  2      2    
+  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x00043180       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x00043181       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      block_period                              0x00043182       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_statistics_per_packet                 0x00043183       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_bytes_per_statistic                   0x00043184       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      nof_signal_inputs                         0x00043185       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id                               0x00043186       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x00043186       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_reserved                  0x00043186       1     RW       uint32    b[31:16]           -  -      -    
+  -                                         -     -     -      sdp_integration_interval                  0x00043187       1     RW       uint32     b[23:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x00043188       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x00043189       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_reserved                  0x0004318a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x0004318b       1     RW       uint32      b[8:8]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x0004318c       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x0004318d       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x0004318e       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x0004318f       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x00043190       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00043191       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x00043192       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x00043193       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x00043194       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x00043195       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x00043196       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x00043197       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x00043198       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x00043199       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x0004319a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x0004319b       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x0004319c       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x0004319d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x0004319e       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x0004319f       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x000431a0       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x000431a1       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x000431a2       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x000431a3       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x000431a4       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x000431a5       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x000431a6       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x000431a7       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000431a8       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x000431a9       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000431aa       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      word_align                                0x000431ab       1     RW       uint32     b[15:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x00043400       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00043400       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043400       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043401       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043402       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043403       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043404       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043405       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043408       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x000433f0       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x000433f0       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x000433f0       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x000433f1       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000433f2       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x000433f3       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x000433f4       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x000433f5       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x000433f8       1     RO       uint32     b[31:0]           -  -      -    
   REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x00006000       1     RW       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      rx_transfer_status                        0x00006001       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      tx_transfer_control                       0x00006002       1     RW       uint32      b[0:0]           -  -      -    
@@ -950,12 +855,6 @@ number_of_columns = 13
   -                                         -     -     -      -                                         0x00007c3b       -      -            -     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x00007c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
   -                                         -     -     -      -                                         0x00007c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-<<<<<<< HEAD
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x00043270       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x00043270       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x00043270       1     RO       uint32      b[3:2]           -  -      -    
-=======
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x00043248       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x00043248       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x00043248       1     RO       uint32      b[3:2]           -  -      -    
->>>>>>> master
+  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x000434d4       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      xgmii_tx_ready                            0x000434d4       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      xgmii_link_status                         0x000434d4       1     RO       uint32      b[3:2]           -  -      -    
\ No newline at end of file
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.gold b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.gold
index bb5e1c60b0..7f34570bd9 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.gold
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.gold
@@ -172,11 +172,7 @@ number_of_columns = 13
   -                                         -     -     -      sdp_reserved                              0x000e8008       1     RW       uint32      b[7:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_gn_index                  0x000e8009       1     RW       uint32      b[4:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_reserved                  0x000e800a       1     RW       uint32      b[7:5]           -  -      -    
-<<<<<<< HEAD
-  -                                         -     -     -      sdp_source_info_subband_calibrated_flag   0x000e800b       1     RW       uint32      b[8:8]           -  -      -    
-=======
   -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x000e800b       1     RW       uint32      b[8:8]           -  -      -    
->>>>>>> master
   -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x000e800c       1     RW       uint32      b[9:9]           -  -      -    
   -                                         -     -     -      sdp_source_info_payload_error             0x000e800d       1     RW       uint32    b[10:10]           -  -      -    
   -                                         -     -     -      sdp_source_info_fsub_type                 0x000e800e       1     RW       uint32    b[11:11]           -  -      -    
@@ -209,7 +205,6 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x000e8029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x000e802a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x000e802b       1     RW       uint32     b[15:0]           -  -      -    
-<<<<<<< HEAD
   REG_BSN_MONITOR_V2_SST_OFFLOAD            1     1     REG    xon_stable                                0x000f0000       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      ready_stable                              0x000f0000       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x000f0000       1     RO       uint32      b[2:2]           -  -      -    
@@ -231,20 +226,6 @@ number_of_columns = 13
   -                                         -     -     -      mon_output_sync_bsn                       0x000f8009       1     RO       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x000f800a       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      block_size                                0x000f800b       1     RO       uint32     b[31:0]           -  -      -    
-=======
-  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x000f0000       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ctrl_interval_size                        0x000f0001       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ctrl_start_bsn                            0x000f0002       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000f0003       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_current_input_bsn                     0x000f0004       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000f0005       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_input_bsn_at_sync                     0x000f0006       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000f0007       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_output_enable                         0x000f0008       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      mon_output_sync_bsn                       0x000f0009       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000f000a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_size                                0x000f000b       1     RO       uint32     b[31:0]           -  -      -    
->>>>>>> master
   RAM_ST_XSQ                                1     9     RAM    data                                      0x00100000    1008     RW    cint64_ir     b[31:0]     b[31:0]  -      4096 
   -                                         -     -     -      -                                         0x00100001       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      -                                         0x00100002       -      -            -     b[31:0]    b[95:64]  -      -    
@@ -269,11 +250,7 @@ number_of_columns = 13
   -                                         -     -     -      sdp_reserved                              0x00128008       1     RW       uint32      b[7:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_gn_index                  0x00128009       1     RW       uint32      b[4:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_reserved                  0x0012800a       1     RW       uint32      b[7:5]           -  -      -    
-<<<<<<< HEAD
-  -                                         -     -     -      sdp_source_info_subband_calibrated_flag   0x0012800b       1     RW       uint32      b[8:8]           -  -      -    
-=======
   -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x0012800b       1     RW       uint32      b[8:8]           -  -      -    
->>>>>>> master
   -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x0012800c       1     RW       uint32      b[9:9]           -  -      -    
   -                                         -     -     -      sdp_source_info_payload_error             0x0012800d       1     RW       uint32    b[10:10]           -  -      -    
   -                                         -     -     -      sdp_source_info_fsub_type                 0x0012800e       1     RW       uint32    b[11:11]           -  -      -    
@@ -306,9 +283,9 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x00128029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x0012802a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x0012802b       1     RW       uint32     b[15:0]           -  -      -    
-  REG_BSN_ALIGN_V2                          1     9     REG    enable                                    0x00130000       1     RW       uint32      b[0:0]           -  -      2    
+  REG_BSN_ALIGN_V2_XSUB                     1     9     REG    enable                                    0x00130000       1     RW       uint32      b[0:0]           -  -      2    
   -                                         -     -     -      replaced_pkt_cnt                          0x00130001       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_INPUT     1     9     REG    xon_stable                                0x00138000       1     RO       uint32      b[0:0]           -  -      8    
+  REG_BSN_MONITOR_V2_RX_ALIGN_XSUB          1     9     REG    xon_stable                                0x00138000       1     RO       uint32      b[0:0]           -  -      8    
   -                                         -     -     -      ready_stable                              0x00138000       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00138000       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00138001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -317,7 +294,7 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00138004       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00138005       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00138008       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT    1     1     REG    xon_stable                                0x00140000       1     RO       uint32      b[0:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_XSUB           1     1     REG    xon_stable                                0x00140000       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      ready_stable                              0x00140000       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00140000       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00140001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -543,480 +520,341 @@ number_of_columns = 13
   -                                         -     -     -      xgmii_link_status                         0x00180000       1     RO       uint32      b[3:2]           -  -      -    
   RAM_SS_SS_WIDE                            2     6     RAM    data                                      0x00188000     976     RW       uint32      b[9:0]           -  8192   1024 
   RAM_BF_WEIGHTS                            2     12    RAM    data                                      0x00190000     976     RW    cint16_ir     b[31:0]           -  16384  1024 
-  REG_BF_SCALE                              2     1     REG    scale                                     0x00198000       1     RW       uint32     b[15:0]           -  2      2    
-  -                                         -     -     -      unused                                    0x00198001       1     RW       uint32     b[31:0]           -  -      -    
-  REG_HDR_DAT                               2     1     REG    bsn                                       0x001a0000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x001a0001       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      sdp_block_period                          0x001a0002       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_beamlets_per_block                0x001a0003       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x001a0004       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_index                         0x001a0005       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_scale                         0x001a0006       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x001a0007       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001a0008       -      -            -      b[7:0]    b[39:32]  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x001a0009       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_beamlet_width             0x001a000a       1     RW       uint32      b[7:5]           -  -      -    
-  -                                         -     -     -      sdp_source_info_repositioning_flag        0x001a000b       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x001a000c       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x001a000d       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x001a000e       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x001a000f       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x001a0010       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x001a0011       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x001a0012       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x001a0013       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x001a0014       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x001a0015       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x001a0016       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x001a0017       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x001a0018       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x001a0019       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x001a001a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x001a001b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x001a001c       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x001a001d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x001a001e       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x001a001f       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x001a0020       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x001a0021       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x001a0022       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x001a0023       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x001a0024       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x001a0025       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x001a0026       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001a0027       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x001a0028       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001a0029       -      -            -     b[15:0]    b[47:32]  -      -    
-  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x001a8000       1     RW       uint32      b[0:0]           -  2      2    
-  RAM_ST_BST                                2     1     RAM    data                                      0x001b0000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
-  -                                         -     -     -      -                                         0x001b0001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x001b8000       1     RW       uint32      b[0:0]           -  2      2    
-  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x001c0000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x001c0001       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_period                              0x001c0002       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_statistics_per_packet                 0x001c0003       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_bytes_per_statistic                   0x001c0004       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      nof_signal_inputs                         0x001c0005       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id                               0x001c0006       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x001c0006       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_reserved                  0x001c0006       1     RW       uint32    b[31:16]           -  -      -    
-  -                                         -     -     -      sdp_integration_interval                  0x001c0007       1     RW       uint32     b[23:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x001c0008       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x001c0009       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_reserved                  0x001c000a       1     RW       uint32      b[7:5]           -  -      -    
-<<<<<<< HEAD
-  -                                         -     -     -      sdp_source_info_subband_calibrated_flag   0x001c000b       1     RW       uint32      b[8:8]           -  -      -    
-=======
-  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x001c000b       1     RW       uint32      b[8:8]           -  -      -    
->>>>>>> master
-  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x001c000c       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x001c000d       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x001c000e       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x001c000f       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x001c0010       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x001c0011       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x001c0012       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x001c0013       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x001c0014       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x001c0015       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x001c0016       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x001c0017       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x001c0018       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x001c0019       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x001c001a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x001c001b       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x001c001c       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x001c001d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x001c001e       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x001c001f       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x001c0020       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x001c0021       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x001c0022       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x001c0023       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x001c0024       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x001c0025       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x001c0026       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x001c0027       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001c0028       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x001c0029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001c002a       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      word_align                                0x001c002b       1     RW       uint32     b[15:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x001c8000       1     RO       uint32      b[0:0]           -  1      8    
-  -                                         -     -     -      ready_stable                              0x001c8000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x001c8000       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x001c8001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001c8002       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x001c8003       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x001c8004       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x001c8005       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x001c8008       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x001d0000       1     RO       uint32      b[0:0]           -  1      8    
-  -                                         -     -     -      ready_stable                              0x001d0000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x001d0000       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x001d0001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x001d0002       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x001d0003       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x001d0004       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x001d0005       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x001d0008       1     RO       uint32     b[31:0]           -  -      -    
-  REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x001d8000       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_transfer_status                        0x001d8001       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_transfer_control                       0x001d8002       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_padcrc_control                         0x001d8040       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      rx_crccheck_control                       0x001d8080       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      rx_pktovrflow_error                       0x001d80c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d80c1       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_pktovrflow_etherstatsdropevents        0x001d80c2       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d80c3       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_lane_decoder_preamble_control          0x001d8100       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_preamble_inserter_control              0x001d8140       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_frame_control                          0x001d8800       1     RW       uint32     b[19:0]           -  -      -    
-  -                                         -     -     -      rx_frame_maxlength                        0x001d8801       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_addr0                            0x001d8802       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_addr1                            0x001d8803       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr0_0                        0x001d8804       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr0_1                        0x001d8805       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr1_0                        0x001d8806       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr1_1                        0x001d8807       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr2_0                        0x001d8808       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr2_1                        0x001d8809       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr3_0                        0x001d880a       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr3_1                        0x001d880b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_pfc_control                            0x001d8818       1     RW       uint32     b[16:0]           -  -      -    
-  -                                         -     -     -      rx_stats_clr                              0x001d8c00       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_stats_framesok                         0x001d8c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c03       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_frameserr                        0x001d8c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c05       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_framescrcerr                     0x001d8c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c07       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_octetsok                         0x001d8c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c09       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_pausemacctrl_frames              0x001d8c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c0b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_iferrors                         0x001d8c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c0d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicast_framesok                 0x001d8c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c0f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicast_frameserr                0x001d8c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c11       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicastframesok                0x001d8c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c13       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicast_frameserr              0x001d8c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c15       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcastframesok                0x001d8c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c17       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcast_frameserr              0x001d8c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c19       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatsoctets                 0x001d8c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c1b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatspkts                   0x001d8c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c1d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_undersizepkts         0x001d8c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c1f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_oversizepkts          0x001d8c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c21       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts64octets          0x001d8c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c23       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts65to127octets     0x001d8c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c25       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts128to255octets    0x001d8c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c27       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts256to511octets    0x001d8c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c29       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts512to1023octets   0x001d8c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c2b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstat_pkts1024to1518octets   0x001d8c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c2d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts1519toxoctets     0x001d8c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c2f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_fragments             0x001d8c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c31       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_jabbers               0x001d8c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c33       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatscrcerr                 0x001d8c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c35       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicastmacctrlframes             0x001d8c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c37       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicastmac_ctrlframes          0x001d8c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c39       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcastmac_ctrlframes          0x001d8c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c3b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_pfcmacctrlframes                 0x001d8c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d8c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_transfer_status                        0x001d9001       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_padins_control                         0x001d9040       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_crcins_control                         0x001d9080       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      tx_pktunderflow_error                     0x001d90c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d90c1       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_preamble_control                       0x001d9100       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_control                     0x001d9140       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_quanta                      0x001d9141       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_enable                      0x001d9142       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_0                        0x001d9180       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_1                        0x001d9181       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_2                        0x001d9182       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_3                        0x001d9183       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_4                        0x001d9184       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_5                        0x001d9185       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_6                        0x001d9186       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_7                        0x001d9187       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_0                      0x001d9190       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_1                      0x001d9191       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_2                      0x001d9192       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_3                      0x001d9193       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_4                      0x001d9194       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_5                      0x001d9195       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_6                      0x001d9196       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_7                      0x001d9197       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      tx_pfc_priority_enable                    0x001d91a0       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_control                        0x001d9200       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_macaddr0                       0x001d9201       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_macaddr1                       0x001d9202       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_frame_maxlength                        0x001d9801       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_stats_clr                              0x001d9c00       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_stats_framesok                         0x001d9c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c03       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_frameserr                        0x001d9c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c05       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_framescrcerr                     0x001d9c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c07       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_octetsok                         0x001d9c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c09       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_pausemacctrl_frames              0x001d9c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c0b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_iferrors                         0x001d9c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c0d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicast_framesok                 0x001d9c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c0f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicast_frameserr                0x001d9c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c11       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicastframesok                0x001d9c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c13       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicast_frameserr              0x001d9c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c15       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcastframesok                0x001d9c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c17       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcast_frameserr              0x001d9c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c19       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatsoctets                 0x001d9c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c1b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatspkts                   0x001d9c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c1d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_undersizepkts         0x001d9c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c1f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_oversizepkts          0x001d9c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c21       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts64octets          0x001d9c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c23       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts65to127octets     0x001d9c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c25       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts128to255octets    0x001d9c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c27       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts256to511octets    0x001d9c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c29       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts512to1023octets   0x001d9c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c2b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstat_pkts1024to1518octets   0x001d9c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c2d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts1519toxoctets     0x001d9c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c2f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_fragments             0x001d9c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c31       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_jabbers               0x001d9c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c33       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatscrcerr                 0x001d9c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c35       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicastmacctrlframes             0x001d9c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c37       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicastmac_ctrlframes          0x001d9c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c39       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcastmac_ctrlframes          0x001d9c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c3b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x001d9c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001d9c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x001e0000       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x001e0000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x001e0000       1     RO       uint32      b[3:2]           -  -      -    
-=======
-  REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x001c8000       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_transfer_status                        0x001c8001       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_transfer_control                       0x001c8002       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_padcrc_control                         0x001c8040       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      rx_crccheck_control                       0x001c8080       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      rx_pktovrflow_error                       0x001c80c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c80c1       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_pktovrflow_etherstatsdropevents        0x001c80c2       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c80c3       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_lane_decoder_preamble_control          0x001c8100       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_preamble_inserter_control              0x001c8140       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_frame_control                          0x001c8800       1     RW       uint32     b[19:0]           -  -      -    
-  -                                         -     -     -      rx_frame_maxlength                        0x001c8801       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_addr0                            0x001c8802       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_addr1                            0x001c8803       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr0_0                        0x001c8804       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr0_1                        0x001c8805       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr1_0                        0x001c8806       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr1_1                        0x001c8807       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr2_0                        0x001c8808       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr2_1                        0x001c8809       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr3_0                        0x001c880a       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_frame_spaddr3_1                        0x001c880b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      rx_pfc_control                            0x001c8818       1     RW       uint32     b[16:0]           -  -      -    
-  -                                         -     -     -      rx_stats_clr                              0x001c8c00       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      rx_stats_framesok                         0x001c8c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c03       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_frameserr                        0x001c8c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c05       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_framescrcerr                     0x001c8c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c07       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_octetsok                         0x001c8c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c09       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_pausemacctrl_frames              0x001c8c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c0b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_iferrors                         0x001c8c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c0d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicast_framesok                 0x001c8c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c0f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicast_frameserr                0x001c8c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c11       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicastframesok                0x001c8c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c13       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicast_frameserr              0x001c8c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c15       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcastframesok                0x001c8c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c17       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcast_frameserr              0x001c8c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c19       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatsoctets                 0x001c8c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c1b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatspkts                   0x001c8c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c1d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_undersizepkts         0x001c8c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c1f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_oversizepkts          0x001c8c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c21       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts64octets          0x001c8c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c23       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts65to127octets     0x001c8c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c25       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts128to255octets    0x001c8c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c27       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts256to511octets    0x001c8c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c29       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts512to1023octets   0x001c8c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c2b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstat_pkts1024to1518octets   0x001c8c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c2d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_pkts1519toxoctets     0x001c8c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c2f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_fragments             0x001c8c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c31       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstats_jabbers               0x001c8c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c33       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_etherstatscrcerr                 0x001c8c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c35       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_unicastmacctrlframes             0x001c8c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c37       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_multicastmac_ctrlframes          0x001c8c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c39       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_broadcastmac_ctrlframes          0x001c8c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c3b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      rx_stats_pfcmacctrlframes                 0x001c8c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c8c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_transfer_status                        0x001c9001       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_padins_control                         0x001c9040       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_crcins_control                         0x001c9080       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      tx_pktunderflow_error                     0x001c90c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c90c1       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_preamble_control                       0x001c9100       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_control                     0x001c9140       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_quanta                      0x001c9141       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_pauseframe_enable                      0x001c9142       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_0                        0x001c9180       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_1                        0x001c9181       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_2                        0x001c9182       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_3                        0x001c9183       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_4                        0x001c9184       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_5                        0x001c9185       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_6                        0x001c9186       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_pause_quanta_7                        0x001c9187       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_0                      0x001c9190       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_1                      0x001c9191       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_2                      0x001c9192       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_3                      0x001c9193       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_4                      0x001c9194       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_5                      0x001c9195       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_6                      0x001c9196       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      pfc_holdoff_quanta_7                      0x001c9197       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      tx_pfc_priority_enable                    0x001c91a0       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_control                        0x001c9200       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_macaddr0                       0x001c9201       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      tx_addrins_macaddr1                       0x001c9202       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_frame_maxlength                        0x001c9801       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      tx_stats_clr                              0x001c9c00       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      tx_stats_framesok                         0x001c9c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c03       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_frameserr                        0x001c9c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c05       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_framescrcerr                     0x001c9c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c07       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_octetsok                         0x001c9c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c09       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_pausemacctrl_frames              0x001c9c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c0b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_iferrors                         0x001c9c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c0d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicast_framesok                 0x001c9c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c0f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicast_frameserr                0x001c9c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c11       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicastframesok                0x001c9c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c13       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicast_frameserr              0x001c9c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c15       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcastframesok                0x001c9c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c17       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcast_frameserr              0x001c9c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c19       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatsoctets                 0x001c9c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c1b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatspkts                   0x001c9c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c1d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_undersizepkts         0x001c9c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c1f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_oversizepkts          0x001c9c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c21       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts64octets          0x001c9c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c23       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts65to127octets     0x001c9c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c25       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts128to255octets    0x001c9c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c27       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts256to511octets    0x001c9c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c29       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts512to1023octets   0x001c9c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c2b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstat_pkts1024to1518octets   0x001c9c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c2d       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_pkts1519toxoctets     0x001c9c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c2f       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_fragments             0x001c9c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c31       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstats_jabbers               0x001c9c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c33       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_etherstatscrcerr                 0x001c9c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c35       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_unicastmacctrlframes             0x001c9c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c37       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_multicastmac_ctrlframes          0x001c9c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c39       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_broadcastmac_ctrlframes          0x001c9c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c3b       -      -            -     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x001c9c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
-  -                                         -     -     -      -                                         0x001c9c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x001d0000       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x001d0000       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x001d0000       1     RO       uint32      b[3:2]           -  -      -    
->>>>>>> master
+  REG_BSN_ALIGN_V2_BF                       2     2     REG    enable                                    0x00198000       1     RW       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      replaced_pkt_cnt                          0x00198001       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RX_ALIGN_BF            2     2     REG    xon_stable                                0x001a0000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001a0000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001a0000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001a0001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001a0002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001a0003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001a0004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001a0005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001a0008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_BF             2     1     REG    xon_stable                                0x001a8000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001a8000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001a8000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001a8001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001a8002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001a8003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001a8004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001a8005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001a8008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_RING_LANE_INFO_BF                     2     1     REG    lane_direction                            0x001b0000       1     RO       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      transport_nof_hops                        0x001b0001       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_RX_BF             2     16    REG    xon_stable                                0x001b8000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001b8000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001b8000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001b8001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001b8002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001b8003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001b8004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001b8005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001b8008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_TX_BF             2     16    REG    xon_stable                                0x001c0000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x001c0000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x001c0000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x001c0001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001c0002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x001c0003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x001c0004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x001c0005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x001c0008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_ERR_BF              2     1     REG    err_count_index                           0x001c8000       8     RO       uint32     b[31:0]           -  1      16   
+  -                                         -     -     -      total_discarded_blocks                    0x001c8008       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_block_count                         0x001c8009       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x001c800a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_BF      2     1     REG    nof_sync_discarded                        0x001d0000       1     RO       uint32     b[31:0]           -  1      4    
+  -                                         -     -     -      nof_sync                                  0x001d0001       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x001d0002       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BF_SCALE                              2     1     REG    scale                                     0x001d8000       1     RW       uint32     b[15:0]           -  2      2    
+  -                                         -     -     -      unused                                    0x001d8001       1     RW       uint32     b[31:0]           -  -      -    
+  REG_HDR_DAT                               2     1     REG    bsn                                       0x001e0000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x001e0001       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      sdp_block_period                          0x001e0002       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_beamlets_per_block                0x001e0003       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x001e0004       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_index                         0x001e0005       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_scale                         0x001e0006       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x001e0007       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001e0008       -      -            -      b[7:0]    b[39:32]  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x001e0009       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beamlet_width             0x001e000a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_repositioning_flag        0x001e000b       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x001e000c       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x001e000d       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x001e000e       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x001e000f       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x001e0010       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x001e0011       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x001e0012       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x001e0013       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x001e0014       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x001e0015       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x001e0016       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x001e0017       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x001e0018       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x001e0019       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x001e001a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x001e001b       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x001e001c       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x001e001d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x001e001e       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x001e001f       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x001e0020       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x001e0021       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x001e0022       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x001e0023       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x001e0024       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x001e0025       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x001e0026       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001e0027       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x001e0028       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x001e0029       -      -            -     b[15:0]    b[47:32]  -      -    
+  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x001e8000       1     RW       uint32      b[0:0]           -  2      2    
+  RAM_ST_BST                                2     1     RAM    data                                      0x001f0000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
+  -                                         -     -     -      -                                         0x001f0001       -      -            -     b[21:0]    b[53:32]  -      -    
+  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x001f8000       1     RW       uint32      b[0:0]           -  2      2    
+  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x00200000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x00200001       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      block_period                              0x00200002       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_statistics_per_packet                 0x00200003       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_bytes_per_statistic                   0x00200004       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      nof_signal_inputs                         0x00200005       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id                               0x00200006       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x00200006       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_reserved                  0x00200006       1     RW       uint32    b[31:16]           -  -      -    
+  -                                         -     -     -      sdp_integration_interval                  0x00200007       1     RW       uint32     b[23:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x00200008       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x00200009       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_reserved                  0x0020000a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x0020000b       1     RW       uint32      b[8:8]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x0020000c       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x0020000d       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x0020000e       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x0020000f       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x00200010       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00200011       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x00200012       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x00200013       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x00200014       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x00200015       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x00200016       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x00200017       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x00200018       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x00200019       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x0020001a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x0020001b       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x0020001c       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x0020001d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x0020001e       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x0020001f       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x00200020       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x00200021       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x00200022       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x00200023       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x00200024       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x00200025       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x00200026       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x00200027       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00200028       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x00200029       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x0020002a       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      word_align                                0x0020002b       1     RW       uint32     b[15:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x00208000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00208000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00208000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00208001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00208002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00208003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00208004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00208005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00208008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x00210000       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00210000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00210000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00210001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00210002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00210003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00210004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00210005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00210008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x00218000       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_transfer_status                        0x00218001       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_transfer_control                       0x00218002       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_padcrc_control                         0x00218040       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      rx_crccheck_control                       0x00218080       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      rx_pktovrflow_error                       0x002180c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x002180c1       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_pktovrflow_etherstatsdropevents        0x002180c2       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x002180c3       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_lane_decoder_preamble_control          0x00218100       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_preamble_inserter_control              0x00218140       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_frame_control                          0x00218800       1     RW       uint32     b[19:0]           -  -      -    
+  -                                         -     -     -      rx_frame_maxlength                        0x00218801       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_addr0                            0x00218802       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_addr1                            0x00218803       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr0_0                        0x00218804       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr0_1                        0x00218805       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr1_0                        0x00218806       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr1_1                        0x00218807       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr2_0                        0x00218808       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr2_1                        0x00218809       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr3_0                        0x0021880a       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_frame_spaddr3_1                        0x0021880b       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      rx_pfc_control                            0x00218818       1     RW       uint32     b[16:0]           -  -      -    
+  -                                         -     -     -      rx_stats_clr                              0x00218c00       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      rx_stats_framesok                         0x00218c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c03       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_frameserr                        0x00218c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c05       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_framescrcerr                     0x00218c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c07       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_octetsok                         0x00218c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c09       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_pausemacctrl_frames              0x00218c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c0b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_iferrors                         0x00218c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c0d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_unicast_framesok                 0x00218c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c0f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_unicast_frameserr                0x00218c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c11       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_multicastframesok                0x00218c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c13       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_multicast_frameserr              0x00218c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c15       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_broadcastframesok                0x00218c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c17       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_broadcast_frameserr              0x00218c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c19       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstatsoctets                 0x00218c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c1b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstatspkts                   0x00218c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c1d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_undersizepkts         0x00218c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c1f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_oversizepkts          0x00218c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c21       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts64octets          0x00218c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c23       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts65to127octets     0x00218c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c25       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts128to255octets    0x00218c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c27       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts256to511octets    0x00218c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c29       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts512to1023octets   0x00218c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c2b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstat_pkts1024to1518octets   0x00218c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c2d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_pkts1519toxoctets     0x00218c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c2f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_fragments             0x00218c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c31       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstats_jabbers               0x00218c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c33       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_etherstatscrcerr                 0x00218c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c35       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_unicastmacctrlframes             0x00218c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c37       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_multicastmac_ctrlframes          0x00218c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c39       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_broadcastmac_ctrlframes          0x00218c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c3b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      rx_stats_pfcmacctrlframes                 0x00218c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00218c3d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_transfer_status                        0x00219001       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_padins_control                         0x00219040       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_crcins_control                         0x00219080       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      tx_pktunderflow_error                     0x002190c0       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x002190c1       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_preamble_control                       0x00219100       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_pauseframe_control                     0x00219140       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      tx_pauseframe_quanta                      0x00219141       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      tx_pauseframe_enable                      0x00219142       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_0                        0x00219180       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_1                        0x00219181       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_2                        0x00219182       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_3                        0x00219183       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_4                        0x00219184       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_5                        0x00219185       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_6                        0x00219186       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_pause_quanta_7                        0x00219187       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_0                      0x00219190       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_1                      0x00219191       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_2                      0x00219192       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_3                      0x00219193       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_4                      0x00219194       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_5                      0x00219195       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_6                      0x00219196       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      pfc_holdoff_quanta_7                      0x00219197       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      tx_pfc_priority_enable                    0x002191a0       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      tx_addrins_control                        0x00219200       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_addrins_macaddr0                       0x00219201       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      tx_addrins_macaddr1                       0x00219202       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      tx_frame_maxlength                        0x00219801       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      tx_stats_clr                              0x00219c00       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      tx_stats_framesok                         0x00219c02       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c03       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_frameserr                        0x00219c04       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c05       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_framescrcerr                     0x00219c06       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c07       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_octetsok                         0x00219c08       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c09       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_pausemacctrl_frames              0x00219c0a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c0b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_iferrors                         0x00219c0c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c0d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_unicast_framesok                 0x00219c0e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c0f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_unicast_frameserr                0x00219c10       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c11       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_multicastframesok                0x00219c12       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c13       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_multicast_frameserr              0x00219c14       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c15       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_broadcastframesok                0x00219c16       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c17       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_broadcast_frameserr              0x00219c18       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c19       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstatsoctets                 0x00219c1a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c1b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstatspkts                   0x00219c1c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c1d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_undersizepkts         0x00219c1e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c1f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_oversizepkts          0x00219c20       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c21       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts64octets          0x00219c22       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c23       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts65to127octets     0x00219c24       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c25       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts128to255octets    0x00219c26       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c27       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts256to511octets    0x00219c28       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c29       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts512to1023octets   0x00219c2a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c2b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstat_pkts1024to1518octets   0x00219c2c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c2d       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_pkts1519toxoctets     0x00219c2e       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c2f       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_fragments             0x00219c30       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c31       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstats_jabbers               0x00219c32       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c33       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_etherstatscrcerr                 0x00219c34       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c35       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_unicastmacctrlframes             0x00219c36       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c37       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_multicastmac_ctrlframes          0x00219c38       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c39       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_broadcastmac_ctrlframes          0x00219c3a       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c3b       -      -            -     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x00219c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
+  -                                         -     -     -      -                                         0x00219c3d       -      -            -     b[31:0]     b[31:0]  -      -    
+  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x00220000       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      xgmii_tx_ready                            0x00220000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      xgmii_link_status                         0x00220000       1     RO       uint32      b[3:2]           -  -      -    
\ No newline at end of file
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.qsys.gold b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.qsys.gold
index 478ac10469..b15cb41cfd 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.qsys.gold
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.mmap.qsys.gold
@@ -36,99 +36,51 @@ number_of_columns = 13
   -                                         -     -     -      stamp_commit                              0x00000011       3     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      design_note                               0x00000014      52     RO        char8     b[31:0]      b[7:0]  -      -    
   REG_WDI                                   1     1     REG    wdi_override                              0x00000c00       1     WO       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  REG_FPGA_TEMP_SENS                        1     1     REG    temp                                      0x000431b8       1     RO       uint32     b[31:0]           -  -      -    
-  REG_FPGA_VOLTAGE_SENS                     1     1     REG    voltages                                  0x00043180       6     RO       uint32     b[31:0]           -  -      -    
+  REG_FPGA_TEMP_SENS                        1     1     REG    temp                                      0x00043418       1     RO       uint32     b[31:0]           -  -      -    
+  REG_FPGA_VOLTAGE_SENS                     1     1     REG    voltages                                  0x000433d0       6     RO       uint32     b[31:0]           -  -      -    
   RAM_SCRAP                                 1     1     RAM    data                                      0x00000200     512     RW       uint32     b[31:0]           -  -      -    
   AVS_ETH_0_TSE                             1     1     REG    status                                    0x00000400    1024     RO       uint32     b[31:0]           -  -      -    
-  AVS_ETH_0_REG                             1     1     REG    status                                    0x00043130      12     RO       uint32     b[31:0]           -  -      -    
+  AVS_ETH_0_REG                             1     1     REG    status                                    0x00043360      12     RO       uint32     b[31:0]           -  -      -    
   AVS_ETH_0_RAM                             1     1     RAM    data                                      0x00000800    1024     RW       uint32     b[31:0]           -  -      -    
-  PIO_PPS                                   1     1     REG    capture_cnt                               0x000431e4       1     RO       uint32     b[29:0]           -  -      -    
-  -                                         -     -     -      stable                                    0x000431e4       1     RO       uint32    b[30:30]           -  -      -    
-  -                                         -     -     -      toggle                                    0x000431e4       1     RO       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      expected_cnt                              0x000431e5       1     RW       uint32     b[27:0]           -  -      -    
-  -                                         -     -     -      edge                                      0x000431e5       1     RW       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      offset_cnt                                0x000431e6       1     RO       uint32     b[27:0]           -  -      -    
-  REG_EPCS                                  1     1     REG    addr                                      0x000431c0       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      rden                                      0x000431c1       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      read_bit                                  0x000431c2       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_bit                                 0x000431c3       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      sector_erase                              0x000431c4       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x000431c5       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      unprotect                                 0x000431c6       1     WO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_CTRL                             1     1     REG    rd_usedw                                  0x000431fe       1     RO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_DATA                             1     1     FIFO   data                                      0x000431fc       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_CTRL                             1     1     REG    wr_usedw                                  0x000431fa       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      wr_availw                                 0x000431fb       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_DATA                             1     1     FIFO   data                                      0x000431f8       1     WO       uint32     b[31:0]           -  -      -    
-  REG_REMU                                  1     1     REG    reconfigure                               0x000431c8       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      param                                     0x000431c9       1     WO       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      read_param                                0x000431ca       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_param                               0x000431cb       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      data_out                                  0x000431cc       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      data_in                                   0x000431cd       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x000431ce       1     RO       uint32      b[0:0]           -  -      -    
-  REG_SDP_INFO                              1     1     REG    block_period                              0x00043170       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      beam_repositioning_flag                   0x00043171       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      fsub_type                                 0x00043172       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      f_adc                                     0x00043173       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      nyquist_zone_index                        0x00043174       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      observation_id                            0x00043175       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      antenna_band_index                        0x00043176       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      station_id                                0x00043177       1     RW       uint32     b[15:0]           -  -      -    
-  REG_RING_INFO                             1     1     REG    use_cable_to_previous_rn                  0x000431d0       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      use_cable_to_next_rn                      0x000431d1       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      n_rn                                      0x000431d2       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      o_rn                                      0x000431d3       1     RW       uint32      b[7:0]           -  -      -    
-  PIO_JESD_CTRL                             1     1     REG    enable                                    0x000431ee       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      reset                                     0x000431ee       1     RW       uint32    b[31:31]           -  -      -    
-=======
-  REG_FPGA_TEMP_SENS                        1     1     REG    temp                                      0x00043190       1     RO       uint32     b[31:0]           -  -      -    
-  REG_FPGA_VOLTAGE_SENS                     1     1     REG    voltages                                  0x00043160       6     RO       uint32     b[31:0]           -  -      -    
-  RAM_SCRAP                                 1     1     RAM    data                                      0x00000200     512     RW       uint32     b[31:0]           -  -      -    
-  AVS_ETH_0_TSE                             1     1     REG    status                                    0x00000400    1024     RO       uint32     b[31:0]           -  -      -    
-  AVS_ETH_0_REG                             1     1     REG    status                                    0x00000c10      12     RO       uint32     b[31:0]           -  -      -    
-  AVS_ETH_0_RAM                             1     1     RAM    data                                      0x00000800    1024     RW       uint32     b[31:0]           -  -      -    
-  PIO_PPS                                   1     1     REG    capture_cnt                               0x000431bc       1     RO       uint32     b[29:0]           -  -      -    
-  -                                         -     -     -      stable                                    0x000431bc       1     RO       uint32    b[30:30]           -  -      -    
-  -                                         -     -     -      toggle                                    0x000431bc       1     RO       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      expected_cnt                              0x000431bd       1     RW       uint32     b[27:0]           -  -      -    
-  -                                         -     -     -      edge                                      0x000431bd       1     RW       uint32    b[31:31]           -  -      -    
-  -                                         -     -     -      offset_cnt                                0x000431be       1     RO       uint32     b[27:0]           -  -      -    
-  REG_EPCS                                  1     1     REG    addr                                      0x00043198       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      rden                                      0x00043199       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      read_bit                                  0x0004319a       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_bit                                 0x0004319b       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      sector_erase                              0x0004319c       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x0004319d       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      unprotect                                 0x0004319e       1     WO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_CTRL                             1     1     REG    rd_usedw                                  0x000431d6       1     RO       uint32     b[31:0]           -  -      -    
-  REG_DPMM_DATA                             1     1     FIFO   data                                      0x000431d4       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_CTRL                             1     1     REG    wr_usedw                                  0x000431d2       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      wr_availw                                 0x000431d3       1     RO       uint32     b[31:0]           -  -      -    
-  REG_MMDP_DATA                             1     1     FIFO   data                                      0x000431d0       1     WO       uint32     b[31:0]           -  -      -    
-  REG_REMU                                  1     1     REG    reconfigure                               0x000431a0       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      param                                     0x000431a1       1     WO       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      read_param                                0x000431a2       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      write_param                               0x000431a3       1     WO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      data_out                                  0x000431a4       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      data_in                                   0x000431a5       1     WO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      busy                                      0x000431a6       1     RO       uint32      b[0:0]           -  -      -    
-  REG_SDP_INFO                              1     1     REG    block_period                              0x00043150       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      beam_repositioning_flag                   0x00043151       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      fsub_type                                 0x00043152       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      f_adc                                     0x00043153       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      nyquist_zone_index                        0x00043154       1     RW       uint32      b[1:0]           -  -      -    
-  -                                         -     -     -      observation_id                            0x00043155       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      antenna_band_index                        0x00043156       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      station_id                                0x00043157       1     RW       uint32     b[15:0]           -  -      -    
-  REG_RING_INFO                             1     1     REG    use_cable_to_previous_rn                  0x000431a8       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      use_cable_to_next_rn                      0x000431a9       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      n_rn                                      0x000431aa       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      o_rn                                      0x000431ab       1     RW       uint32      b[7:0]           -  -      -    
-  PIO_JESD_CTRL                             1     1     REG    enable                                    0x000431c6       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      reset                                     0x000431c6       1     RW       uint32    b[31:31]           -  -      -    
->>>>>>> master
+  PIO_PPS                                   1     1     REG    capture_cnt                               0x00043448       1     RO       uint32     b[29:0]           -  -      -    
+  -                                         -     -     -      stable                                    0x00043448       1     RO       uint32    b[30:30]           -  -      -    
+  -                                         -     -     -      toggle                                    0x00043448       1     RO       uint32    b[31:31]           -  -      -    
+  -                                         -     -     -      expected_cnt                              0x00043449       1     RW       uint32     b[27:0]           -  -      -    
+  -                                         -     -     -      edge                                      0x00043449       1     RW       uint32    b[31:31]           -  -      -    
+  -                                         -     -     -      offset_cnt                                0x0004344a       1     RO       uint32     b[27:0]           -  -      -    
+  REG_EPCS                                  1     1     REG    addr                                      0x00043420       1     WO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      rden                                      0x00043421       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      read_bit                                  0x00043422       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      write_bit                                 0x00043423       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      sector_erase                              0x00043424       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      busy                                      0x00043425       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      unprotect                                 0x00043426       1     WO       uint32     b[31:0]           -  -      -    
+  REG_DPMM_CTRL                             1     1     REG    rd_usedw                                  0x00043462       1     RO       uint32     b[31:0]           -  -      -    
+  REG_DPMM_DATA                             1     1     FIFO   data                                      0x00043460       1     RO       uint32     b[31:0]           -  -      -    
+  REG_MMDP_CTRL                             1     1     REG    wr_usedw                                  0x0004345e       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      wr_availw                                 0x0004345f       1     RO       uint32     b[31:0]           -  -      -    
+  REG_MMDP_DATA                             1     1     FIFO   data                                      0x0004345c       1     WO       uint32     b[31:0]           -  -      -    
+  REG_REMU                                  1     1     REG    reconfigure                               0x00043428       1     WO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      param                                     0x00043429       1     WO       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      read_param                                0x0004342a       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      write_param                               0x0004342b       1     WO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      data_out                                  0x0004342c       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      data_in                                   0x0004342d       1     WO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      busy                                      0x0004342e       1     RO       uint32      b[0:0]           -  -      -    
+  REG_SDP_INFO                              1     1     REG    block_period                              0x000433c0       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      beam_repositioning_flag                   0x000433c1       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      fsub_type                                 0x000433c2       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      f_adc                                     0x000433c3       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      nyquist_zone_index                        0x000433c4       1     RW       uint32      b[1:0]           -  -      -    
+  -                                         -     -     -      observation_id                            0x000433c5       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      antenna_band_index                        0x000433c6       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      station_id                                0x000433c7       1     RW       uint32     b[15:0]           -  -      -    
+  REG_RING_INFO                             1     1     REG    use_cable_to_previous_rn                  0x00043434       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      use_cable_to_next_rn                      0x00043435       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      n_rn                                      0x00043436       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      o_rn                                      0x00043437       1     RW       uint32      b[7:0]           -  -      -    
+  PIO_JESD_CTRL                             1     1     REG    enable                                    0x00043452       1     RW       uint32     b[30:0]           -  -      -    
+  -                                         -     -     -      reset                                     0x00043452       1     RW       uint32    b[31:31]           -  -      -    
   JESD204B                                  1     12    REG    rx_lane_ctrl_common                       0x00042000       1     RW       uint32      b[2:0]           -  -      256  
   -                                         -     -     -      rx_lane_ctrl_0                            0x00042001       1     RW       uint32      b[2:0]           -  -      -    
   -                                         -     -     -      rx_lane_ctrl_1                            0x00042002       1     RW       uint32      b[2:0]           -  -      -    
@@ -166,68 +118,47 @@ number_of_columns = 13
   -                                         -     -     -      rx_status5                                0x0004203d       1     RW       uint32     b[15:0]           -  -      -    
   -                                         -     -     -      rx_status6                                0x0004203e       1     RW       uint32     b[23:0]           -  -      -    
   -                                         -     -     -      rx_status7                                0x0004203f       1     RO       uint32     b[31:0]           -  -      -    
-  REG_DP_SHIFTRAM                           1     12    REG    shift                                     0x00043100       1     RW       uint32     b[11:0]           -  -      2    
-<<<<<<< HEAD
-  REG_BSN_SOURCE_V2                         1     1     REG    dp_on                                     0x000431b0       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      dp_on_pps                                 0x000431b0       1     RW       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      nof_clk_per_sync                          0x000431b1       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      bsn_init                                  0x000431b2       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431b3       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      bsn_time_offset                           0x000431b4       1     RW       uint32      b[9:0]           -  -      -    
-  REG_BSN_SCHEDULER                         1     1     REG    scheduled_bsn                             0x000431f4       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431f5       -      -            -     b[31:0]    b[63:32]  -      -    
-=======
-  REG_BSN_SOURCE_V2                         1     1     REG    dp_on                                     0x00043188       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      dp_on_pps                                 0x00043188       1     RW       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      nof_clk_per_sync                          0x00043189       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      bsn_init                                  0x0004318a       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004318b       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      bsn_time_offset                           0x0004318c       1     RW       uint32      b[9:0]           -  -      -    
-  REG_BSN_SCHEDULER                         1     1     REG    scheduled_bsn                             0x000431cc       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431cd       -      -            -     b[31:0]    b[63:32]  -      -    
->>>>>>> master
-  REG_BSN_MONITOR_INPUT                     1     1     REG    xon_stable                                0x00000100       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00000100       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00000100       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00000101       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000102       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00000103       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00000104       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00000105       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      bsn_first                                 0x00000106       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000107       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      bsn_first_cycle_cnt                       0x00000108       1     RO       uint32     b[31:0]           -  -      -    
-  REG_WG                                    1     12    REG    mode                                      0x00043080       1     RW       uint32      b[7:0]           -  -      4    
-  -                                         -     -     -      nof_samples                               0x00043080       1     RW       uint32    b[31:16]           -  -      -    
-  -                                         -     -     -      phase                                     0x00043081       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      freq                                      0x00043082       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ampl                                      0x00043083       1     RW       uint32     b[16:0]           -  -      -    
+  REG_DP_SHIFTRAM                           1     12    REG    shift                                     0x00043340       1     RW       uint32     b[11:0]           -  -      2    
+  REG_BSN_SOURCE_V2                         1     1     REG    dp_on                                     0x00043410       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      dp_on_pps                                 0x00043410       1     RW       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      nof_clk_per_sync                          0x00043411       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      bsn_init                                  0x00043412       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043413       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      bsn_time_offset                           0x00043414       1     RW       uint32      b[9:0]           -  -      -    
+  REG_BSN_SCHEDULER                         1     1     REG    scheduled_bsn                             0x00043458       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043459       -      -            -     b[31:0]    b[63:32]  -      -    
+  REG_BSN_MONITOR_INPUT                     1     1     REG    xon_stable                                0x00043000       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043000       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043000       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043001       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043002       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043003       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043004       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043005       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      bsn_first                                 0x00043006       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043007       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      bsn_first_cycle_cnt                       0x00043008       1     RO       uint32     b[31:0]           -  -      -    
+  REG_WG                                    1     12    REG    mode                                      0x00043280       1     RW       uint32      b[7:0]           -  -      4    
+  -                                         -     -     -      nof_samples                               0x00043280       1     RW       uint32    b[31:16]           -  -      -    
+  -                                         -     -     -      phase                                     0x00043281       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      freq                                      0x00043282       1     RW       uint32     b[30:0]           -  -      -    
+  -                                         -     -     -      ampl                                      0x00043283       1     RW       uint32     b[16:0]           -  -      -    
   RAM_WG                                    1     12    RAM    data                                      0x00034000    1024     RW       uint32     b[17:0]           -  -      1024 
   RAM_ST_HISTOGRAM                          1     12    RAM    data                                      0x00002000     512     RW       uint32     b[31:0]     b[27:0]  -      512  
-  REG_ADUH_MONITOR                          1     12    REG    mean_sum                                  0x000430c0       1     RO        int64     b[31:0]     b[31:0]  -      4    
-  -                                         -     -     -      -                                         0x000430c1       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      power_sum                                 0x000430c2       1     RO        int64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000430c3       -      -            -     b[31:0]    b[63:32]  -      -    
-  REG_DIAG_DATA_BUFFER_BSN                  1     12    REG    sync_cnt                                  0x00000c20       1     RO       uint32     b[31:0]           -  -      2    
-  -                                         -     -     -      word_cnt                                  0x00000c21       1     RO       uint32     b[31:0]           -  -      -    
+  REG_ADUH_MONITOR                          1     12    REG    mean_sum                                  0x000432c0       1     RO        int64     b[31:0]     b[31:0]  -      4    
+  -                                         -     -     -      -                                         0x000432c1       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      power_sum                                 0x000432c2       1     RO        int64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000432c3       -      -            -     b[31:0]    b[63:32]  -      -    
+  REG_DIAG_DATA_BUFFER_BSN                  1     12    REG    sync_cnt                                  0x00043320       1     RO       uint32     b[31:0]           -  -      2    
+  -                                         -     -     -      word_cnt                                  0x00043321       1     RO       uint32     b[31:0]           -  -      -    
   RAM_DIAG_DATA_BUFFER_BSN                  1     12    RAM    data                                      0x00200000    1024     RW       uint32     b[31:0]     b[15:0]  -      1024 
-<<<<<<< HEAD
-  REG_SI                                    1     1     REG    enable                                    0x000431f6       1     RW       uint32      b[0:0]           -  -      -    
+  REG_SI                                    1     1     REG    enable                                    0x0004345a       1     RW       uint32      b[0:0]           -  -      -    
   RAM_FIL_COEFS                             1     16    RAM    data                                      0x00038000    1024     RW       uint32     b[15:0]           -  -      1024 
   RAM_EQUALIZER_GAINS                       1     6     RAM    data                                      0x00040000    1024     RW    cint16_ir     b[31:0]           -  -      1024 
-  REG_DP_SELECTOR                           1     1     REG    input_select                              0x000431f2       1     RW       uint32      b[0:0]           -  -      -    
+  REG_DP_SELECTOR                           1     1     REG    input_select                              0x00043456       1     RW       uint32      b[0:0]           -  -      -    
   RAM_ST_SST                                1     6     RAM    data                                      0x0003c000    1024     RW       uint64     b[31:0]     b[31:0]  -      2048 
   -                                         -     -     -      -                                         0x0003c001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_SST                       1     1     REG    enable                                    0x000431ec       1     RW       uint32      b[0:0]           -  -      -    
-=======
-  REG_SI                                    1     1     REG    enable                                    0x000431ce       1     RW       uint32      b[0:0]           -  -      -    
-  RAM_FIL_COEFS                             1     16    RAM    data                                      0x00038000    1024     RW       uint32     b[15:0]           -  -      1024 
-  RAM_EQUALIZER_GAINS                       1     6     RAM    data                                      0x00040000    1024     RW    cint16_ir     b[31:0]           -  -      1024 
-  REG_DP_SELECTOR                           1     1     REG    input_select                              0x000431ca       1     RW       uint32      b[0:0]           -  -      -    
-  RAM_ST_SST                                1     6     RAM    data                                      0x0003c000    1024     RW       uint64     b[31:0]     b[31:0]  -      2048 
-  -                                         -     -     -      -                                         0x0003c001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_SST                       1     1     REG    enable                                    0x000431c4       1     RW       uint32      b[0:0]           -  -      -    
->>>>>>> master
+  REG_STAT_ENABLE_SST                       1     1     REG    enable                                    0x00043450       1     RW       uint32      b[0:0]           -  -      -    
   REG_STAT_HDR_DAT_SST                      1     1     REG    bsn                                       0x00000c40       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x00000c41       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      sdp_block_period                          0x00000c42       1     RW       uint32     b[15:0]           -  -      -    
@@ -241,11 +172,7 @@ number_of_columns = 13
   -                                         -     -     -      sdp_reserved                              0x00000c48       1     RW       uint32      b[7:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_gn_index                  0x00000c49       1     RW       uint32      b[4:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_reserved                  0x00000c4a       1     RW       uint32      b[7:5]           -  -      -    
-<<<<<<< HEAD
-  -                                         -     -     -      sdp_source_info_subband_calibrated_flag   0x00000c4b       1     RW       uint32      b[8:8]           -  -      -    
-=======
   -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x00000c4b       1     RW       uint32      b[8:8]           -  -      -    
->>>>>>> master
   -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x00000c4c       1     RW       uint32      b[9:9]           -  -      -    
   -                                         -     -     -      sdp_source_info_payload_error             0x00000c4d       1     RW       uint32    b[10:10]           -  -      -    
   -                                         -     -     -      sdp_source_info_fsub_type                 0x00000c4e       1     RW       uint32    b[11:11]           -  -      -    
@@ -278,59 +205,36 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x00000c69       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x00000c6a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x00000c6b       1     RW       uint32     b[15:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_SST_OFFLOAD            1     1     REG    xon_stable                                0x00000c08       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00000c08       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00000c08       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00000c09       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000c0a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00000c0b       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00000c0c       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00000c0d       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00000c10       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x00043150       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ctrl_interval_size                        0x00043151       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ctrl_start_bsn                            0x00043152       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043153       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_current_input_bsn                     0x00043154       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043155       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_input_bsn_at_sync                     0x00043156       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043157       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_output_enable                         0x00043158       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      mon_output_sync_bsn                       0x00043159       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004315a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_size                                0x0004315b       1     RO       uint32     b[31:0]           -  -      -    
-=======
-  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x00043130       1     RW       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ctrl_interval_size                        0x00043131       1     RW       uint32     b[30:0]           -  -      -    
-  -                                         -     -     -      ctrl_start_bsn                            0x00043132       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043133       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_current_input_bsn                     0x00043134       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043135       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_input_bsn_at_sync                     0x00043136       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043137       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      mon_output_enable                         0x00043138       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      mon_output_sync_bsn                       0x00043139       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004313a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_size                                0x0004313b       1     RO       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_BSN_MONITOR_V2_SST_OFFLOAD            1     1     REG    xon_stable                                0x000433f0       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x000433f0       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x000433f0       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x000433f1       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000433f2       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x000433f3       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x000433f4       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x000433f5       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x000433f8       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_SYNC_SCHEDULER_XSUB               1     1     REG    ctrl_enable                               0x000433a0       1     RW       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ctrl_interval_size                        0x000433a1       1     RW       uint32     b[30:0]           -  -      -    
+  -                                         -     -     -      ctrl_start_bsn                            0x000433a2       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000433a3       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      mon_current_input_bsn                     0x000433a4       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000433a5       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      mon_input_bsn_at_sync                     0x000433a6       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000433a7       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      mon_output_enable                         0x000433a8       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      mon_output_sync_bsn                       0x000433a9       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000433aa       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      block_size                                0x000433ab       1     RO       uint32     b[31:0]           -  -      -    
   RAM_ST_XSQ                                1     9     RAM    data                                      0x00010000    1008     RW    cint64_ir     b[31:0]     b[31:0]  -      4096 
   -                                         -     -     -      -                                         0x00010001       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      -                                         0x00010002       -      -            -     b[31:0]    b[95:64]  -      -    
   -                                         -     -     -      -                                         0x00010003       -      -            -     b[31:0]   b[127:96]  -      -    
-<<<<<<< HEAD
-  REG_CROSSLETS_INFO                        1     1     REG    offset                                    0x00043160      15     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      step                                      0x0004316f       1     RW       uint32     b[31:0]           -  -      -    
-  REG_NOF_CROSSLETS                         1     1     REG    nof_crosslets                             0x000431e8       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      unused                                    0x000431e9       1     RW       uint32     b[31:0]           -  -      -    
-  REG_STAT_ENABLE_XST                       1     1     REG    enable                                    0x000431ea       1     RW       uint32      b[0:0]           -  -      -    
-=======
-  REG_CROSSLETS_INFO                        1     1     REG    offset                                    0x00043140      15     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      step                                      0x0004314f       1     RW       uint32     b[31:0]           -  -      -    
-  REG_NOF_CROSSLETS                         1     1     REG    nof_crosslets                             0x000431c0       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      unused                                    0x000431c1       1     RW       uint32     b[31:0]           -  -      -    
-  REG_STAT_ENABLE_XST                       1     1     REG    enable                                    0x000431c2       1     RW       uint32      b[0:0]           -  -      -    
->>>>>>> master
+  REG_CROSSLETS_INFO                        1     1     REG    offset                                    0x000433b0      15     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      step                                      0x000433bf       1     RW       uint32     b[31:0]           -  -      -    
+  REG_NOF_CROSSLETS                         1     1     REG    nof_crosslets                             0x0004344c       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      unused                                    0x0004344d       1     RW       uint32     b[31:0]           -  -      -    
+  REG_STAT_ENABLE_XST                       1     1     REG    enable                                    0x0004344e       1     RW       uint32      b[0:0]           -  -      -    
   REG_STAT_HDR_DAT_XST                      1     1     REG    bsn                                       0x00000040       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x00000041       -      -            -     b[31:0]    b[63:32]  -      -    
   -                                         -     -     -      block_period                              0x00000042       1     RW       uint32     b[15:0]           -  -      -    
@@ -346,11 +250,7 @@ number_of_columns = 13
   -                                         -     -     -      sdp_reserved                              0x00000048       1     RW       uint32      b[7:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_gn_index                  0x00000049       1     RW       uint32      b[4:0]           -  -      -    
   -                                         -     -     -      sdp_source_info_reserved                  0x0000004a       1     RW       uint32      b[7:5]           -  -      -    
-<<<<<<< HEAD
-  -                                         -     -     -      sdp_source_info_subband_calibrated_flag   0x0000004b       1     RW       uint32      b[8:8]           -  -      -    
-=======
   -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x0000004b       1     RW       uint32      b[8:8]           -  -      -    
->>>>>>> master
   -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x0000004c       1     RW       uint32      b[9:9]           -  -      -    
   -                                         -     -     -      sdp_source_info_payload_error             0x0000004d       1     RW       uint32    b[10:10]           -  -      -    
   -                                         -     -     -      sdp_source_info_fsub_type                 0x0000004e       1     RW       uint32    b[11:11]           -  -      -    
@@ -383,9 +283,9 @@ number_of_columns = 13
   -                                         -     -     -      eth_destination_mac                       0x00000069       1     RW       uint64     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      -                                         0x0000006a       -      -            -     b[15:0]    b[47:32]  -      -    
   -                                         -     -     -      word_align                                0x0000006b       1     RW       uint32     b[15:0]           -  -      -    
-  REG_BSN_ALIGN_V2                          1     9     REG    enable                                    0x00000020       1     RW       uint32      b[0:0]           -  -      2    
-  -                                         -     -     -      replaced_pkt_cnt                          0x00000021       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_INPUT     1     9     REG    xon_stable                                0x00000080       1     RO       uint32      b[0:0]           -  -      8    
+  REG_BSN_ALIGN_V2_XSUB                     1     9     REG    enable                                    0x00043300       1     RW       uint32      b[0:0]           -  -      2    
+  -                                         -     -     -      replaced_pkt_cnt                          0x00043301       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RX_ALIGN_XSUB          1     9     REG    xon_stable                                0x00000080       1     RO       uint32      b[0:0]           -  -      8    
   -                                         -     -     -      ready_stable                              0x00000080       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00000080       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00000081       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -394,56 +294,35 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00000084       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00000085       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00000088       1     RO       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT    1     1     REG    xon_stable                                0x000431a8       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x000431a8       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x000431a8       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x000431a9       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431aa       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x000431ab       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x000431ac       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x000431ad       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x000431b0       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_XST_OFFLOAD            1     1     REG    xon_stable                                0x000431a0       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x000431a0       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x000431a0       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x000431a1       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x000431a2       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x000431a3       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x000431a4       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x000431a5       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x000431a8       1     RO       uint32     b[31:0]           -  -      -    
-=======
-  REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT    1     1     REG    xon_stable                                0x00043180       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00043180       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00043180       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00043181       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043182       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00043183       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00043184       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00043185       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043188       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_XST_OFFLOAD            1     1     REG    xon_stable                                0x00043178       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      ready_stable                              0x00043178       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00043178       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00043179       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x0004317a       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x0004317b       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x0004317c       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x0004317d       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043180       1     RO       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_BSN_MONITOR_V2_ALIGNED_XSUB           1     1     REG    xon_stable                                0x00043408       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043408       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043408       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043409       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x0004340a       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x0004340b       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x0004340c       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x0004340d       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043410       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_XST_OFFLOAD            1     1     REG    xon_stable                                0x00043400       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      ready_stable                              0x00043400       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043400       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043401       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043402       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043403       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043404       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043405       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043408       1     RO       uint32     b[31:0]           -  -      -    
   REG_RING_LANE_INFO_XST                    1     1     REG    lane_direction                            0x00000c02       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      transport_nof_hops                        0x00000c03       1     RW       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_RING_RX_XST            1     16    REG    xon_stable                                0x00000d00       1     RO       uint32      b[0:0]           -  -      8    
-  -                                         -     -     -      ready_stable                              0x00000d00       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00000d00       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00000d01       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000d02       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00000d03       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00000d04       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00000d05       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00000d08       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_RX_XST            1     16    REG    xon_stable                                0x00043100       1     RO       uint32      b[0:0]           -  -      8    
+  -                                         -     -     -      ready_stable                              0x00043100       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043100       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043101       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043102       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043103       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043104       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043105       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043108       1     RO       uint32     b[31:0]           -  -      -    
   REG_BSN_MONITOR_V2_RING_TX_XST            1     16    REG    xon_stable                                0x00000c80       1     RO       uint32      b[0:0]           -  -      8    
   -                                         -     -     -      ready_stable                              0x00000c80       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00000c80       1     RO       uint32      b[2:2]           -  -      -    
@@ -453,23 +332,13 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00000c84       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00000c85       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00000c88       1     RO       uint32     b[31:0]           -  -      -    
-<<<<<<< HEAD
-  REG_DP_BLOCK_VALIDATE_ERR_XST             1     1     REG    err_count_index                           0x00043140       8     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_discarded_blocks                    0x00043148       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_block_count                         0x00043149       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x0004314a       1     RW       uint32     b[31:0]           -  -      -    
-  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_XST     1     1     REG    nof_sync_discarded                        0x000431d4       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_sync                                  0x000431d5       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x000431d6       1     RW       uint32     b[31:0]           -  -      -    
-=======
-  REG_DP_BLOCK_VALIDATE_ERR_XST             1     1     REG    err_count_index                           0x00043120       8     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_discarded_blocks                    0x00043128       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      total_block_count                         0x00043129       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x0004312a       1     RW       uint32     b[31:0]           -  -      -    
-  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_XST     1     1     REG    nof_sync_discarded                        0x000431ac       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_sync                                  0x000431ad       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      clear                                     0x000431ae       1     RW       uint32     b[31:0]           -  -      -    
->>>>>>> master
+  REG_DP_BLOCK_VALIDATE_ERR_XST             1     1     REG    err_count_index                           0x00043390       8     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_discarded_blocks                    0x00043398       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_block_count                         0x00043399       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x0004339a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_XST     1     1     REG    nof_sync_discarded                        0x00043438       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_sync                                  0x00043439       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x0004343a       1     RW       uint32     b[31:0]           -  -      -    
   REG_TR_10GBE_MAC                          1     3     REG    rx_transfer_control                       0x00020000       1     RW       uint32      b[0:0]           -  -      1    
   -                                         -     -     -      rx_transfer_status                        0x00020001       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      tx_transfer_control                       0x00020002       1     RW       uint32      b[0:0]           -  -      -    
@@ -646,137 +515,23 @@ number_of_columns = 13
   -                                         -     -     -      -                                         0x00021c3b       -      -            -     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x00021c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
   -                                         -     -     -      -                                         0x00021c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-<<<<<<< HEAD
-  REG_TR_10GBE_ETH10G                       1     3     REG    tx_snk_out_xon                            0x00043198       1     RO       uint32      b[0:0]           -  -      1    
-  -                                         -     -     -      xgmii_tx_ready                            0x00043198       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x00043198       1     RO       uint32      b[3:2]           -  -      -    
+  REG_TR_10GBE_ETH10G                       1     3     REG    tx_snk_out_xon                            0x000433f8       1     RO       uint32      b[0:0]           -  -      1    
+  -                                         -     -     -      xgmii_tx_ready                            0x000433f8       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      xgmii_link_status                         0x000433f8       1     RO       uint32      b[3:2]           -  -      -    
   RAM_SS_SS_WIDE                            2     6     RAM    data                                      0x00030000     976     RW       uint32      b[9:0]           -  8192   1024 
   RAM_BF_WEIGHTS                            2     12    RAM    data                                      0x00028000     976     RW    cint16_ir     b[31:0]           -  16384  1024 
-  REG_BF_SCALE                              2     1     REG    scale                                     0x000431e0       1     RW       uint32     b[15:0]           -  2      2    
-  -                                         -     -     -      unused                                    0x000431e1       1     RW       uint32     b[31:0]           -  -      -    
-=======
-  REG_TR_10GBE_ETH10G                       1     3     REG    tx_snk_out_xon                            0x00043170       1     RO       uint32      b[0:0]           -  -      1    
-  -                                         -     -     -      xgmii_tx_ready                            0x00043170       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x00043170       1     RO       uint32      b[3:2]           -  -      -    
-  RAM_SS_SS_WIDE                            2     6     RAM    data                                      0x00030000     976     RW       uint32      b[9:0]           -  8192   1024 
-  RAM_BF_WEIGHTS                            2     12    RAM    data                                      0x00028000     976     RW    cint16_ir     b[31:0]           -  16384  1024 
-  REG_BF_SCALE                              2     1     REG    scale                                     0x000431b8       1     RW       uint32     b[15:0]           -  2      2    
-  -                                         -     -     -      unused                                    0x000431b9       1     RW       uint32     b[31:0]           -  -      -    
->>>>>>> master
-  REG_HDR_DAT                               2     1     REG    bsn                                       0x00043000       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x00043001       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      sdp_block_period                          0x00043002       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_beamlets_per_block                0x00043003       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x00043004       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_index                         0x00043005       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_beamlet_scale                         0x00043006       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x00043007       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043008       -      -            -      b[7:0]    b[39:32]  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x00043009       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_beamlet_width             0x0004300a       1     RW       uint32      b[7:5]           -  -      -    
-  -                                         -     -     -      sdp_source_info_repositioning_flag        0x0004300b       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x0004300c       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x0004300d       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x0004300e       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x0004300f       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00043010       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x00043011       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x00043012       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x00043013       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x00043014       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x00043015       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x00043016       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x00043017       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x00043018       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x00043019       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x0004301a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x0004301b       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x0004301c       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x0004301d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x0004301e       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x0004301f       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x00043020       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x00043021       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x00043022       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x00043023       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x00043024       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x00043025       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x00043026       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043027       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x00043028       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043029       -      -            -     b[15:0]    b[47:32]  -      -    
-<<<<<<< HEAD
-  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x000431dc       1     RW       uint32      b[0:0]           -  2      2    
-  RAM_ST_BST                                2     1     RAM    data                                      0x00001000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
-  -                                         -     -     -      -                                         0x00001001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x000431d8       1     RW       uint32      b[0:0]           -  2      2    
-=======
-  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x000431b4       1     RW       uint32      b[0:0]           -  2      2    
-  RAM_ST_BST                                2     1     RAM    data                                      0x00001000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
-  -                                         -     -     -      -                                         0x00001001       -      -            -     b[21:0]    b[53:32]  -      -    
-  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x000431b0       1     RW       uint32      b[0:0]           -  2      2    
->>>>>>> master
-  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x00000d80       1     RW       uint64     b[31:0]     b[31:0]  64     64   
-  -                                         -     -     -      -                                         0x00000d81       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      block_period                              0x00000d82       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_statistics_per_packet                 0x00000d83       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      nof_bytes_per_statistic                   0x00000d84       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      nof_signal_inputs                         0x00000d85       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id                               0x00000d86       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x00000d86       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_data_id_bst_reserved                  0x00000d86       1     RW       uint32    b[31:16]           -  -      -    
-  -                                         -     -     -      sdp_integration_interval                  0x00000d87       1     RW       uint32     b[23:0]           -  -      -    
-  -                                         -     -     -      sdp_reserved                              0x00000d88       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_gn_index                  0x00000d89       1     RW       uint32      b[4:0]           -  -      -    
-  -                                         -     -     -      sdp_source_info_reserved                  0x00000d8a       1     RW       uint32      b[7:5]           -  -      -    
-<<<<<<< HEAD
-  -                                         -     -     -      sdp_source_info_subband_calibrated_flag   0x00000d8b       1     RW       uint32      b[8:8]           -  -      -    
-=======
-  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x00000d8b       1     RW       uint32      b[8:8]           -  -      -    
->>>>>>> master
-  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x00000d8c       1     RW       uint32      b[9:9]           -  -      -    
-  -                                         -     -     -      sdp_source_info_payload_error             0x00000d8d       1     RW       uint32    b[10:10]           -  -      -    
-  -                                         -     -     -      sdp_source_info_fsub_type                 0x00000d8e       1     RW       uint32    b[11:11]           -  -      -    
-  -                                         -     -     -      sdp_source_info_f_adc                     0x00000d8f       1     RW       uint32    b[12:12]           -  -      -    
-  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x00000d90       1     RW       uint32    b[14:13]           -  -      -    
-  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00000d91       1     RW       uint32    b[15:15]           -  -      -    
-  -                                         -     -     -      sdp_station_id                            0x00000d92       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      sdp_observation_id                        0x00000d93       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      sdp_version_id                            0x00000d94       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      sdp_marker                                0x00000d95       1     RO       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      udp_checksum                              0x00000d96       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_length                                0x00000d97       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_destination_port                      0x00000d98       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      udp_source_port                           0x00000d99       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_destination_address                    0x00000d9a       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_source_address                         0x00000d9b       1     RW       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      ip_header_checksum                        0x00000d9c       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_protocol                               0x00000d9d       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_time_to_live                           0x00000d9e       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_fragment_offset                        0x00000d9f       1     RW       uint32     b[12:0]           -  -      -    
-  -                                         -     -     -      ip_flags                                  0x00000da0       1     RW       uint32      b[2:0]           -  -      -    
-  -                                         -     -     -      ip_identification                         0x00000da1       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_total_length                           0x00000da2       1     RW       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      ip_services                               0x00000da3       1     RW       uint32      b[7:0]           -  -      -    
-  -                                         -     -     -      ip_header_length                          0x00000da4       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      ip_version                                0x00000da5       1     RW       uint32      b[3:0]           -  -      -    
-  -                                         -     -     -      eth_type                                  0x00000da6       1     RO       uint32     b[15:0]           -  -      -    
-  -                                         -     -     -      eth_source_mac                            0x00000da7       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000da8       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      eth_destination_mac                       0x00000da9       1     RW       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00000daa       -      -            -     b[15:0]    b[47:32]  -      -    
-  -                                         -     -     -      word_align                                0x00000dab       1     RW       uint32     b[15:0]           -  -      -    
-<<<<<<< HEAD
-  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x00043120       1     RO       uint32      b[0:0]           -  1      8    
-  -                                         -     -     -      ready_stable                              0x00043120       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      sync_timeout                              0x00043120       1     RO       uint32      b[2:2]           -  -      -    
-  -                                         -     -     -      bsn_at_sync                               0x00043121       1     RO       uint64     b[31:0]     b[31:0]  -      -    
-  -                                         -     -     -      -                                         0x00043122       -      -            -     b[31:0]    b[63:32]  -      -    
-  -                                         -     -     -      nof_sop                                   0x00043123       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_valid                                 0x00043124       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      nof_err                                   0x00043125       1     RO       uint32     b[31:0]           -  -      -    
-  -                                         -     -     -      latency                                   0x00043128       1     RO       uint32     b[31:0]           -  -      -    
-  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x00000c10       1     RO       uint32      b[0:0]           -  1      8    
+  REG_BSN_ALIGN_V2_BF                       2     2     REG    enable                                    0x000433e0       1     RW       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      replaced_pkt_cnt                          0x000433e1       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RX_ALIGN_BF            2     2     REG    xon_stable                                0x00000c20       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00000c20       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00000c20       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00000c21       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00000c22       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00000c23       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00000c24       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00000c25       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00000c28       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_ALIGNED_BF             2     1     REG    xon_stable                                0x00000c10       1     RO       uint32      b[0:0]           -  1      8    
   -                                         -     -     -      ready_stable                              0x00000c10       1     RO       uint32      b[1:1]           -  -      -    
   -                                         -     -     -      sync_timeout                              0x00000c10       1     RO       uint32      b[2:2]           -  -      -    
   -                                         -     -     -      bsn_at_sync                               0x00000c11       1     RO       uint64     b[31:0]     b[31:0]  -      -    
@@ -785,8 +540,145 @@ number_of_columns = 13
   -                                         -     -     -      nof_valid                                 0x00000c14       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      nof_err                                   0x00000c15       1     RO       uint32     b[31:0]           -  -      -    
   -                                         -     -     -      latency                                   0x00000c18       1     RO       uint32     b[31:0]           -  -      -    
-=======
->>>>>>> master
+  REG_RING_LANE_INFO_BF                     2     1     REG    lane_direction                            0x00000c04       1     RO       uint32      b[0:0]           -  1      2    
+  -                                         -     -     -      transport_nof_hops                        0x00000c05       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_RX_BF             2     16    REG    xon_stable                                0x00000d00       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00000d00       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00000d00       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00000d01       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00000d02       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00000d03       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00000d04       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00000d05       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00000d08       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_RING_TX_BF             2     16    REG    xon_stable                                0x00000100       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00000100       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00000100       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00000101       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00000102       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00000103       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00000104       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00000105       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00000108       1     RO       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_ERR_BF              2     1     REG    err_count_index                           0x00000020       8     RO       uint32     b[31:0]           -  1      16   
+  -                                         -     -     -      total_discarded_blocks                    0x00000028       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      total_block_count                         0x00000029       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x0000002a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC_BF      2     1     REG    nof_sync_discarded                        0x00000c08       1     RO       uint32     b[31:0]           -  1      4    
+  -                                         -     -     -      nof_sync                                  0x00000c09       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      clear                                     0x00000c0a       1     RW       uint32     b[31:0]           -  -      -    
+  REG_BF_SCALE                              2     1     REG    scale                                     0x00043444       1     RW       uint32     b[15:0]           -  2      2    
+  -                                         -     -     -      unused                                    0x00043445       1     RW       uint32     b[31:0]           -  -      -    
+  REG_HDR_DAT                               2     1     REG    bsn                                       0x00043200       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x00043201       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      sdp_block_period                          0x00043202       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_beamlets_per_block                0x00043203       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_nof_blocks_per_packet                 0x00043204       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_index                         0x00043205       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_beamlet_scale                         0x00043206       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x00043207       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043208       -      -            -      b[7:0]    b[39:32]  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x00043209       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beamlet_width             0x0004320a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_repositioning_flag        0x0004320b       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x0004320c       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x0004320d       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x0004320e       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x0004320f       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00043210       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x00043211       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x00043212       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x00043213       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x00043214       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x00043215       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x00043216       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x00043217       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x00043218       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x00043219       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x0004321a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x0004321b       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x0004321c       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x0004321d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x0004321e       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x0004321f       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x00043220       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x00043221       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x00043222       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x00043223       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x00043224       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x00043225       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x00043226       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043227       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x00043228       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043229       -      -            -     b[15:0]    b[47:32]  -      -    
+  REG_DP_XONOFF                             2     1     REG    enable_stream                             0x00043440       1     RW       uint32      b[0:0]           -  2      2    
+  RAM_ST_BST                                2     1     RAM    data                                      0x00001000     976     RW       uint64     b[31:0]     b[31:0]  2048   2048 
+  -                                         -     -     -      -                                         0x00001001       -      -            -     b[21:0]    b[53:32]  -      -    
+  REG_STAT_ENABLE_BST                       2     1     REG    enable                                    0x0004343c       1     RW       uint32      b[0:0]           -  2      2    
+  REG_STAT_HDR_DAT_BST                      2     1     REG    bsn                                       0x00043180       1     RW       uint64     b[31:0]     b[31:0]  64     64   
+  -                                         -     -     -      -                                         0x00043181       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      block_period                              0x00043182       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_statistics_per_packet                 0x00043183       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      nof_bytes_per_statistic                   0x00043184       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      nof_signal_inputs                         0x00043185       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id                               0x00043186       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_beamlet_index             0x00043186       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_data_id_bst_reserved                  0x00043186       1     RW       uint32    b[31:16]           -  -      -    
+  -                                         -     -     -      sdp_integration_interval                  0x00043187       1     RW       uint32     b[23:0]           -  -      -    
+  -                                         -     -     -      sdp_reserved                              0x00043188       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_gn_index                  0x00043189       1     RW       uint32      b[4:0]           -  -      -    
+  -                                         -     -     -      sdp_source_info_reserved                  0x0004318a       1     RW       uint32      b[7:5]           -  -      -    
+  -                                         -     -     -      sdp_source_info_weighted_subbands_flag    0x0004318b       1     RW       uint32      b[8:8]           -  -      -    
+  -                                         -     -     -      sdp_source_info_beam_repositioning_flag   0x0004318c       1     RW       uint32      b[9:9]           -  -      -    
+  -                                         -     -     -      sdp_source_info_payload_error             0x0004318d       1     RW       uint32    b[10:10]           -  -      -    
+  -                                         -     -     -      sdp_source_info_fsub_type                 0x0004318e       1     RW       uint32    b[11:11]           -  -      -    
+  -                                         -     -     -      sdp_source_info_f_adc                     0x0004318f       1     RW       uint32    b[12:12]           -  -      -    
+  -                                         -     -     -      sdp_source_info_nyquist_zone_index        0x00043190       1     RW       uint32    b[14:13]           -  -      -    
+  -                                         -     -     -      sdp_source_info_antenna_band_index        0x00043191       1     RW       uint32    b[15:15]           -  -      -    
+  -                                         -     -     -      sdp_station_id                            0x00043192       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      sdp_observation_id                        0x00043193       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      sdp_version_id                            0x00043194       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      sdp_marker                                0x00043195       1     RO       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      udp_checksum                              0x00043196       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_length                                0x00043197       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_destination_port                      0x00043198       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      udp_source_port                           0x00043199       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_destination_address                    0x0004319a       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_source_address                         0x0004319b       1     RW       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      ip_header_checksum                        0x0004319c       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_protocol                               0x0004319d       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_time_to_live                           0x0004319e       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_fragment_offset                        0x0004319f       1     RW       uint32     b[12:0]           -  -      -    
+  -                                         -     -     -      ip_flags                                  0x000431a0       1     RW       uint32      b[2:0]           -  -      -    
+  -                                         -     -     -      ip_identification                         0x000431a1       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_total_length                           0x000431a2       1     RW       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      ip_services                               0x000431a3       1     RW       uint32      b[7:0]           -  -      -    
+  -                                         -     -     -      ip_header_length                          0x000431a4       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      ip_version                                0x000431a5       1     RW       uint32      b[3:0]           -  -      -    
+  -                                         -     -     -      eth_type                                  0x000431a6       1     RO       uint32     b[15:0]           -  -      -    
+  -                                         -     -     -      eth_source_mac                            0x000431a7       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000431a8       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      eth_destination_mac                       0x000431a9       1     RW       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x000431aa       -      -            -     b[15:0]    b[47:32]  -      -    
+  -                                         -     -     -      word_align                                0x000431ab       1     RW       uint32     b[15:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BST_OFFLOAD            2     1     REG    xon_stable                                0x00043380       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00043380       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043380       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043381       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043382       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043383       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043384       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043385       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043388       1     RO       uint32     b[31:0]           -  -      -    
+  REG_BSN_MONITOR_V2_BEAMLET_OUTPUT         2     1     REG    xon_stable                                0x00043370       1     RO       uint32      b[0:0]           -  1      8    
+  -                                         -     -     -      ready_stable                              0x00043370       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      sync_timeout                              0x00043370       1     RO       uint32      b[2:2]           -  -      -    
+  -                                         -     -     -      bsn_at_sync                               0x00043371       1     RO       uint64     b[31:0]     b[31:0]  -      -    
+  -                                         -     -     -      -                                         0x00043372       -      -            -     b[31:0]    b[63:32]  -      -    
+  -                                         -     -     -      nof_sop                                   0x00043373       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_valid                                 0x00043374       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      nof_err                                   0x00043375       1     RO       uint32     b[31:0]           -  -      -    
+  -                                         -     -     -      latency                                   0x00043378       1     RO       uint32     b[31:0]           -  -      -    
   REG_NW_10GBE_MAC                          1     1     REG    rx_transfer_control                       0x00006000       1     RW       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      rx_transfer_status                        0x00006001       1     RO       uint32      b[0:0]           -  -      -    
   -                                         -     -     -      tx_transfer_control                       0x00006002       1     RW       uint32      b[0:0]           -  -      -    
@@ -963,12 +855,6 @@ number_of_columns = 13
   -                                         -     -     -      -                                         0x00007c3b       -      -            -     b[31:0]     b[31:0]  -      -    
   -                                         -     -     -      tx_stats_pfcmacctrlframes                 0x00007c3c       1     RO       uint64      b[3:0]    b[35:32]  -      -    
   -                                         -     -     -      -                                         0x00007c3d       -      -            -     b[31:0]     b[31:0]  -      -    
-<<<<<<< HEAD
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x000431f0       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x000431f0       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x000431f0       1     RO       uint32      b[3:2]           -  -      -    
-=======
-  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x000431c8       1     RO       uint32      b[0:0]           -  -      -    
-  -                                         -     -     -      xgmii_tx_ready                            0x000431c8       1     RO       uint32      b[1:1]           -  -      -    
-  -                                         -     -     -      xgmii_link_status                         0x000431c8       1     RO       uint32      b[3:2]           -  -      -    
->>>>>>> master
+  REG_NW_10GBE_ETH10G                       1     1     REG    tx_snk_out_xon                            0x00043454       1     RO       uint32      b[0:0]           -  -      -    
+  -                                         -     -     -      xgmii_tx_ready                            0x00043454       1     RO       uint32      b[1:1]           -  -      -    
+  -                                         -     -     -      xgmii_link_status                         0x00043454       1     RO       uint32      b[3:2]           -  -      -    
\ No newline at end of file
-- 
GitLab