From 7c5f5843bdd7ab822a9c332a5f7eaf9774c43164 Mon Sep 17 00:00:00 2001
From: donker <donker@astron.nl>
Date: Wed, 20 Nov 2019 14:59:50 +0100
Subject: [PATCH] changed yaml files to work with code

---
 .../unb1_minimal_sopc.fpga.yaml               |  10 -
 .../unb1_board/unb1_board.peripheral.yaml     | 147 ++++++-------
 libraries/base/diag/diag.peripheral.yaml      | 207 ++++++++----------
 libraries/base/dp/dp.peripheral.yaml          |  68 +++---
 libraries/dsp/bf/bf.peripheral.yaml           |  77 +++----
 .../fringe_stop/fringe_stop.peripheral.yaml   |  35 ++-
 libraries/io/epcs/epcs.peripheral.yaml        | 139 +++++-------
 libraries/io/eth/eth.peripheral.yaml          |  57 ++---
 libraries/io/ppsh/ppsh.peripheral.yaml        |  22 +-
 libraries/io/remu/remu.peripheral.yaml        |  91 ++++----
 10 files changed, 359 insertions(+), 494 deletions(-)

diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml
index d6ee3b6377..8680311ad7 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/unb1_minimal_sopc.fpga.yaml
@@ -10,44 +10,36 @@ fpga_description: |
 
 peripherals:
   - peripheral_name: rom_system_info
-    subsystem_name : ''
     slave_port_names:
         - rom_system_info
     parameters:
       - { name: lock_base_address,  value: 0x1000 }    
     
   - peripheral_name: reg_system_info
-  
-    subsystem_name : ''
     slave_port_names:
         - pio_system_info
     parameters:
       - { name: lock_base_address, value: 0x0 }    
 
   - peripheral_name: ctrl_unb1_board
-    subsystem_name : ''
     slave_port_names:
         - pio_wdi
 
   - peripheral_name: unb1_board_wdi_reg
-    subsystem_name : ''
     slave_port_names:
         - reg_wdi
   
   - peripheral_name: eth1g
-    subsystem_name : ''
     slave_port_names:
         - avs_eth_0_mms_tse
         - avs_eth_0_mms_reg
         - avs_eth_0_mms_ram
     
   - peripheral_name: ppsh
-    subsystem_name : ''
     slave_port_names:
         - pio_pps
 
   - peripheral_name: epcs_reg
-    subsystem_name : ''
     slave_port_names:
         - reg_epcs
         - reg_mmdp_ctrl
@@ -58,12 +50,10 @@ peripherals:
       - { name : g_sim_flash_model, value: FALSE }
 
   - peripheral_name: remu_reg
-    subsystem_name : ''
     slave_port_names:
         - reg_remu
 
   - peripheral_name: unb1_board_sens_reg
-    subsystem_name : ''
     slave_port_names:
         - reg_unb_sens
     parameters:
diff --git a/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml b/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml
index 1dc9ae0ba5..11f2c20a13 100644
--- a/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml
+++ b/boards/uniboard1/libraries/unb1_board/unb1_board.peripheral.yaml
@@ -6,97 +6,78 @@ hdl_library_name       : unb1_board
 hdl_library_description: " This is the description for the unb1_board package "
 
 peripherals:
-  -  
-    peripheral_name: rom_system_info
+  - peripheral_name: rom_system_info
     slave_ports:
-      - 
         # rom_system_info
-        slave_prefix : WORK 
-        slave_name   : ROM_SYSTEM_INFO  
-        slave_postfix: REG
+      - slave_name   : ROM_SYSTEM_INFO_REG  
         slave_type   : REG
         fields:
-          -
-            field_name    : field_rom_info
-            access_mode   : RO
-            address_offset: 0x0
-            number_of_fields: 1024
-            field_description: |
-                "address place for rom_system_info"
+          - - field_name    : field_rom_info
+              access_mode   : RO
+              address_offset: 0x0
+              number_of_fields: 1024
+              field_description: |
+                  "address place for rom_system_info"
         slave_description: " rom_info  "
         
     peripheral_description: |
         " settings for rom_system_info register "
-  - 
-    peripheral_name: reg_system_info
+  
+  - peripheral_name: reg_system_info
     slave_ports:
-      -
         # reg_system_info
-        slave_prefix : WORK
-        slave_name   : REG_SYSTEM_INFO  
-        slave_postfix: REG
+      - slave_name   : REG_SYSTEM_INFO_REG  
         slave_type   : REG
         fields:
-          -
-            field_name    : field_reg_info
-            access_mode   : RO
-            address_offset: 0x0
-            number_of_fields: 31
-            field_description: |
-                "address place for reg_system_info"
+          - - field_name    : field_reg_info
+              access_mode   : RO
+              address_offset: 0x0
+              number_of_fields: 32
+              field_description: |
+                  "address place for reg_system_info"
         slave_description: " reg_info "
         
     peripheral_description: |
         " settings for reg_system_info register "
 
   # peripheral, unb1_board_wdi_reg
-  - 
-    peripheral_name: ctrl_unb1_board
+  - peripheral_name: ctrl_unb1_board
 
     slave_ports:
-      - 
-        # actual hdl name: unb1_board_wdi_reg
-        slave_prefix : UNB1_BOARD
-        slave_name   : PIO_WDI
-        slave_postfix: REG
+      # actual hdl name: unb1_board_wdi_reg
+      - slave_name   : UNB1_BOARD_PIO_WDI_REG
         slave_type   : REG
         fields:
-          -
-            field_name      : nios_reset
-            access_mode     : WO
-            address_offset  : 0x0
-            number_of_fields: 4
-            field_description: " Reset done by nios "
+          - - field_name      : nios_reset
+              width           : 32
+              access_mode     : WO
+              address_offset  : 0x0
+              number_of_fields: 1
+              field_description: " Reset done by nios "
          
         slave_description:  "Reset register, for nios "
     
     peripheral_description: " "
   
   # peripheral, unb1_board_wdi_reg
-  - 
-    peripheral_name: unb1_board_wdi_reg
+  - peripheral_name: unb1_board_wdi_reg
 
     slave_ports:
-      - 
-        # actual hdl name: unb1_board_wdi_reg
-        slave_prefix : UNB1_BOARD
-        slave_name   : WDI
-        slave_postfix: REG
+      # actual hdl name: unb1_board_wdi_reg
+      - slave_name   : UNB1_BOARD_WDI_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : reset_word
-            access_mode   : WO
-            address_offset: 0x0
-            field_description: " Only the value 0xB007FAC7 'Boot factory' will result in a reset "
-         
+          - - field_name    : reset_word
+              access_mode   : WO
+              address_offset: 0x0
+              field_description: " Only the value 0xB007FAC7 'Boot factory' will result in a reset "
+           
         slave_description:  "Reset register, if the right value is provided the factory image will be reloaded "
     
     peripheral_description: " "
   
   # periheral, unb1_board_sens
-  - 
-    peripheral_name: unb1_board_sens_reg
+  - peripheral_name: unb1_board_sens_reg
 
     parameters:
       - { name: g_sim,       value: FALSE }
@@ -104,41 +85,35 @@ peripherals:
       - { name: g_temp_high, value: 85 }
 
     slave_ports:
-      - 
-        # actual hdl name: reg_unb1_sens
-        slave_prefix : UNB1_BOARD
-        slave_name   : SENS
-        slave_postfix: REG
+      # actual hdl name: reg_unb1_sens
+      - slave_name   : UNB1_BOARD_SENS_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : sens_data
-            width         : 8
-            access_mode   : RO
-            address_offset: 0x0
-            number_of_fields: 4
-            field_description: | 
-                " data array with sens data 
-                0x0 = fpga temperature in degrees (two's complement) 
-                0x1 = eth_temp temperature in degrees (two's complement)
-                0x2 = hot_swap_v_sens
-                0x3 = hot_swap_v_source"
-        
-          -
-            field_name    : sens_err
-            width         : 1
-            access_mode   : RO
-            address_offset: 0x4
-            radix         : unsigned 
-            field_description: ""
+          - - field_name    : sens_data
+              width         : 8
+              access_mode   : RO
+              address_offset: 0x0
+              number_of_fields: 4
+              field_description: | 
+                  " data array with sens data 
+                  0x0 = fpga temperature in degrees (two's complement) 
+                  0x1 = eth_temp temperature in degrees (two's complement)
+                  0x2 = hot_swap_v_sens
+                  0x3 = hot_swap_v_source"
+          
+          - - field_name    : sens_err
+              width         : 1
+              access_mode   : RO
+              address_offset: 0x10
+              radix         : unsigned 
+              field_description: ""
         
-          -
-            field_name    : temp_high
-            width         : 7
-            address_offset: 0x5
-            reset_value   : g_temp_high
-            software_value: g_temp_high
-            field_description: ""
+          - - field_name    : temp_high
+              width         : 7
+              address_offset: 0x14
+              reset_value   : g_temp_high
+              software_value: g_temp_high
+              field_description: ""
 
         slave_description:  " "
     
diff --git a/libraries/base/diag/diag.peripheral.yaml b/libraries/base/diag/diag.peripheral.yaml
index 65d1b28189..600f1bdf5e 100644
--- a/libraries/base/diag/diag.peripheral.yaml
+++ b/libraries/base/diag/diag.peripheral.yaml
@@ -15,80 +15,73 @@ peripherals:
       - { name: g_buf_addr_w , value: 7 }
 
     slave_ports:
-      - 
         # actual hdl name: reg_diag_bg 
-        slave_prefix : DIAG 
-        slave_name   : BG  
-        slave_postfix: REG
+      - slave_name : DIAG_BG_REG  
         slave_type : REG
         fields:
-          - 
-            field_name    : Enable
-            width         : 2
-            address_offset: 0x0
-            field_description: |
-                "Bit 0: enable the block generator Bit 1: enable the blok generator on PPS"
-          - 
-            field_name    :     Samples_per_packet
-            width         : 16
-            address_offset: 0x1
-            reset_value   : 256
-            field_description: |
-                "This REG specifies the number samples in a packet"
-          - 
-            field_name    :     Blocks_per_sync
-            width         : 16
-            address_offset: 0x2
-            reset_value   : 781250
-            field_description: |
-                "This REG specifies the number of packets in a sync period"
-          - 
-            field_name    :     Gapsize
-            width         : 16
-            address_offset: 0x3
-            reset_value   : 80
-            field_description: |
-                "This REG specifies the gap in number of clock cycles between two consecutive packets"
-          - 
-            field_name    :     Mem_low_address
-            width         : 8
-            address_offset: 0x4
-            field_description: |
-                "This REG specifies the starting address for reading from the waveform memory"
-          - 
-            field_name    :     Mem_high_address
-            width         : 8
-            address_offset: 0x5
-            field_description: |
-                "This REG specifies the last address to be read when from the waveform memory"
-          - 
-            field_name    :     BSN_init_low
-            address_offset: 0x6
-            field_description: |
-                "This REG specifies the lower(LSB) 32 bits [31:0] of the initialization BSN"
-          - 
-            field_name    :     BSN_init_high
-            address_offset: 0x7
-            field_description: |
-                "This REG specifies the higher(MSB) 32 bits [63:32] of the initialization BSN"
-      - 
+          - - field_name    : Enable
+              width         : 2
+              address_offset: 0x0
+              field_description: |
+                  "Bit 0: enable the block generator Bit 1: enable the blok generator on PPS"
+          
+          - - field_name    :     Samples_per_packet
+              width         : 16
+              address_offset: 0x1
+              reset_value   : 256
+              field_description: |
+                  "This REG specifies the number samples in a packet"
+          
+          - - field_name    :     Blocks_per_sync
+              width         : 16
+              address_offset: 0x2
+              reset_value   : 781250
+              field_description: |
+                  "This REG specifies the number of packets in a sync period"
+          
+          - - field_name    :     Gapsize
+              width         : 16
+              address_offset: 0x3
+              reset_value   : 80
+              field_description: |
+                  "This REG specifies the gap in number of clock cycles between two consecutive packets"
+          
+          - - field_name    :     Mem_low_address
+              width         : 8
+              address_offset: 0x4
+              field_description: |
+                  "This REG specifies the starting address for reading from the waveform memory"
+          
+          - - field_name    :     Mem_high_address
+              width         : 8
+              address_offset: 0x5
+              field_description: |
+                  "This REG specifies the last address to be read when from the waveform memory"
+          
+          - - field_name    :     BSN_init_low
+              address_offset: 0x6
+              field_description: |
+                  "This REG specifies the lower(LSB) 32 bits [31:0] of the initialization BSN"
+          
+          - - field_name    :     BSN_init_high
+              address_offset: 0x7
+              field_description: |
+                  "This REG specifies the higher(MSB) 32 bits [63:32] of the initialization BSN"
+        
         # actual hdl name: ram_diag_bg
-        slave_prefix : DIAG 
-        slave_name   : BG  
-        slave_postfix: RAM
+      - slave_name   : DIAG_BG_RAM  
         number_of_slaves: g_nof_streams
         slave_type      : RAM
         fields:
-          - 
-            field_name: diag_bg
-            width: g_buf_dat_w
-            number_of_fields: 2**g_buf_addr_w
-            field_description  : |
-                "Contains the Waveform data for the data-streams to be send"
+          - - field_name: diag_bg
+              width: g_buf_dat_w
+              number_of_fields: 2**g_buf_addr_w
+              field_description  : |
+                  "Contains the Waveform data for the data-streams to be send"
     peripheral_description: |
         "Block generator"
-  - 
-    peripheral_name: diag_data_buffer
+  
+  - peripheral_name: diag_data_buffer
 
     parameters:
       -  { name: g_nof_streams , value: 1 }
@@ -96,60 +89,52 @@ peripherals:
       -  { name: g_buf_nof_data, value: 1024 }
     
     slave_ports:
-      - 
         # actual hdl name: reg_diag_data_buffer
-        slave_prefix : DIAG 
-        slave_name   : DATA_BUFFER  
-        slave_postfix: REG
+      - slave_name   : DIAG_DATA_BUFFER_REG  
         slave_type   : REG
         fields:
-          - 
-            field_name    : Sync_cnt
-            access_mode   : RO
-            address_offset: 0x0
-            field_description: |
-                "Sync_cnt contains the nof times the buffer (ST) has received a sync pulse since the last MM read
-                (cleared when the last data word from the buffer is read)"
-          - 
-            field_name    : Word_cnt
-            access_mode   : RO
-            address_offset: 0x1
-            field_description: |
-                "Word_cnt indicates the number of word currently (ST) written in the buffer. Cleared on (ST) re-write of buffer."
-          - 
-            field_name    : Valid_cnt_arm_ena
-            address_offset: 0x2
-            field_description: |
-                "Valid_cnt contains the number of valid cycles since the last sync pulse. Cleared on every sync pulse.
-                Arm_enable: Write to this REG to arm the system.
-                After the system is armed the next syn pulse will trigger the acquisition of data."
-          - 
-            field_name    : Reg_sync_delay
-            address_offset: 0x3
-            field_description: |
-                "Reg_sync_delay contains the number of valid cycles to delay/wait after an armed-syncpulse,
-                before the data is written to the databuffer."
-          - 
-            field_name    : Version
-            access_mode   : RO
-            address_offset: 0x7
-            field_description: |
-                "Version contains the version number of the databuffer peripheral."
+          - - field_name    : Sync_cnt
+              access_mode   : RO
+              address_offset: 0x0
+              field_description: |
+                  "Sync_cnt contains the nof times the buffer (ST) has received a sync pulse since the last MM read
+                  (cleared when the last data word from the buffer is read)"
+          
+          - - field_name    : Word_cnt
+              access_mode   : RO
+              address_offset: 0x1
+              field_description: |
+                  "Word_cnt indicates the number of word currently (ST) written in the buffer. Cleared on (ST) re-write of buffer."
+          
+          - - field_name    : Valid_cnt_arm_ena
+              address_offset: 0x2
+              field_description: |
+                  "Valid_cnt contains the number of valid cycles since the last sync pulse. Cleared on every sync pulse.
+                  Arm_enable: Write to this REG to arm the system.
+                  After the system is armed the next syn pulse will trigger the acquisition of data."
+          
+          - - field_name    : Reg_sync_delay
+              address_offset: 0x3
+              field_description: |
+                  "Reg_sync_delay contains the number of valid cycles to delay/wait after an armed-syncpulse,
+                  before the data is written to the databuffer."
+          
+          - - field_name    : Version
+              access_mode   : RO
+              address_offset: 0x7
+              field_description: |
+                  "Version contains the version number of the databuffer peripheral."
         slave_description: ""
-      - 
         # actual hdl name: ram_diag_data_buffer
-        slave_prefix : DIAG 
-        slave_name   : DATA_BUFFER  
-        slave_postfix: RAM    
+      - slave_name   : DIAG_DATA_BUFFER_RAM  
         number_of_slaves: g_nof_streams
         slave_type      : RAM
         fields:
-          - 
-            field_name    : ram
-            width         : g_data_w
-            number_of_fields: g_buf_nof_data
-            field_description: |
-                "Contains the data that is being captured."
+          - - field_name    : ram
+              width         : g_data_w
+              number_of_fields: g_buf_nof_data
+              field_description: |
+                  "Contains the data that is being captured."
         slave_description: ""
 
     peripheral_description: |
diff --git a/libraries/base/dp/dp.peripheral.yaml b/libraries/base/dp/dp.peripheral.yaml
index 1c6e7a3bb2..6e7f2f874d 100644
--- a/libraries/base/dp/dp.peripheral.yaml
+++ b/libraries/base/dp/dp.peripheral.yaml
@@ -6,64 +6,54 @@ hdl_library_name       : dp
 hdl_library_description: " This is the description for the dp package "
 
 peripherals:
-  - 
-    peripheral_name: dp_bsn_align
+  - peripheral_name: dp_bsn_align
 
     parameters:
         - { name: g_nof_input, value : 2 }
 
     slave_ports:
-      - 
         # actual hdl name: reg_dp_bsn_align
-        slave_prefix : DP 
-        slave_name   : BSN_ALIGN  
-        slave_postfix: REG
+      - slave_name   : DP_BSN_ALIGN_REG
         number_of_slaves: g_nof_input
         slave_type      : REG
         fields:
-          - 
-            field_name       : Enable
-            width            : 1
-            address_offset   : 0x0
-            field_description: |
-                "Input enable register for input 0. If set to 0 the input is discarded from alignment.
-                    If set to 1 the corresopnding input is taken into account."
+          - - field_name       : Enable
+              width            : 1
+              address_offset   : 0x0
+              field_description: |
+                  "Input enable register for input 0. If set to 0 the input is discarded from alignment.
+                      If set to 1 the corresopnding input is taken into account."
         slave_discription: " "
-            
+
     peripheral_description: "This is the BSN aligner"
-  
-  - 
-    peripheral_name: dp_fifo_fill
+
+  - peripheral_name: dp_fifo_fill
     parameters:
         - { name : g_nof_streams, value: 3 }
 
     slave_ports:
-      - 
         # actual hdl name: reg_dp_fifo_fill
-        slave_prefix : DP 
-        slave_name   : FIFO_FILL  
-        slave_postfix: REG
+      - slave_name   : DP_FIFO_FILL_REG
         number_of_slaves: g_nof_streams
         slave_type      : REG
         fields:
-          - 
-            field_name       : fifo_used_words
-            access_mode      : RO
-            address_offset   : 0x0
-            field_description: "Register reflects the currently used nof words on the fifo."
-          - 
-            field_name       : fifo_status
-            width            : 2
-            access_mode      : RO
-            address_offset   : 0x1
-            field_description: "Bit 0: fifo_read_empty Bit 1: fifo_wr_full."
-          - 
-            field_name       : max_fifo_used_words
-            access_mode      : RO
-            address_offset   : 0x2
-            field_description: |
-                "Register contains the maximum number of words that have been in the fifo.
+          - - field_name       : fifo_used_words
+              access_mode      : RO
+              address_offset   : 0x0
+              field_description: "Register reflects the currently used nof words on the fifo."
+
+          - - field_name       : fifo_status
+              width            : 2
+              access_mode      : RO
+              address_offset   : 0x4
+              field_description: "Bit 0: fifo_read_empty Bit 1: fifo_wr_full."
+
+          - - field_name       : max_fifo_used_words
+              access_mode      : RO
+              address_offset   : 0x8
+              field_description: |
+                  "Register contains the maximum number of words that have been in the fifo.
                     Will be cleared after it has been read."
         slave_discription: ""
-                
+
     peripheral_description: "This is the MM slave version of the dp_fifo_fill component."
diff --git a/libraries/dsp/bf/bf.peripheral.yaml b/libraries/dsp/bf/bf.peripheral.yaml
index b4359c3404..96cba5309f 100644
--- a/libraries/dsp/bf/bf.peripheral.yaml
+++ b/libraries/dsp/bf/bf.peripheral.yaml
@@ -17,76 +17,61 @@ peripherals:
       - { name: c_nof_signal_paths_per_stream, value: g_bf.nof_signal_paths / g_bf.nof_input_streams }
 
     slave_ports:
-      - 
         # ram_bf_weights
-        slave_prefix : BF 
-        slave_name   : WEIGHTS 
-        slave_postfix: RAM
+      - slave_name   : BF_WEIGHTS_RAM 
         number_of_slaves: g_bf.nof_weights
         slave_type: RAM
         fields:
-          - 
-            field_name    : bf_weights 
-            width         : g_bf.in_weights_w * c_nof_complex
+          - - field_name    : bf_weights 
+              width         : g_bf.in_weights_w * c_nof_complex
 
-            number_of_fields: g_bf.nof_signal_paths
-            field_description: |
-                        "Contains the weights. 
-                        The real and the imaginary parts are concatenated: W_real in Lower part. W_imag in Higher part."
+              number_of_fields: g_bf.nof_signal_paths
+              field_description: |
+                          "Contains the weights. 
+                          The real and the imaginary parts are concatenated: W_real in Lower part. W_imag in Higher part."
         slave_discription: >
                 " "
-      
-      - 
+    
         # ram_ss_ss_wide
-        slave_prefix : BF 
-        slave_name   : SS_SS_WIDE
-        slave_postfix: RAM    
+      - slave_name   : BF_SS_SS_WIDE_RAM
         number_of_slaves: g_bf.nof_weights
         slave_type: RAM
         fields:
-          - 
-            field_name      : ss_ss_wide
-            width           : 32
-            number_of_fields: g_bf.nof_subbands * g_bf.nof_input_streams * c_nof_signal_paths_per_stream  # 16*4=64, nof_input_streams*nof_signal_paths_per_stream
-            field_description: |
-                "Contains the addresses to select from the stored subbands."
+          - - field_name      : ss_ss_wide
+              width           : 32
+              number_of_fields: g_bf.nof_subbands * g_bf.nof_input_streams * c_nof_signal_paths_per_stream  # 16*4=64, nof_input_streams*nof_signal_paths_per_stream
+              field_description: |
+                  "Contains the addresses to select from the stored subbands."
         slave_discription: >
             " "
       
-      - 
         # ram_st_sst_bf
-        slave_prefix : BF 
-        slave_name   : ST_SST
-        slave_postfix: RAM
+      - slave_name   : BF_ST_SST_RAM
         number_of_slaves: g_bf.nof_weights
         slave_type: RAM 
         fields:
-          - 
-            field_name      : st_sst_bf
-            width           : 56
-            number_of_fields: 512
-            access_mode : RO   
-            field_description: |
-                "Contains the weights.
-                The real and the imaginary parts are concatenated: W_real in Lower part. W_imag in Higher part."
+          - - field_name      : st_sst_bf
+              width           : 56
+              number_of_fields: 512
+              access_mode : RO   
+              field_description: |
+                  "Contains the weights.
+                  The real and the imaginary parts are concatenated: W_real in Lower part. W_imag in Higher part."
         slave_discription: >
+          " "
       
-      - 
         # reg_st_sst_bf
-        slave_prefix : BF 
-        slave_name   : ST_SST
-        slave_postfix: REG
+      - slave_name   : BF_ST_SST_REG
         number_of_slaves: 1
         slave_type: REG
         fields:
-          - 
-            field_name    : treshold
-            address_offset: 0x0
-            field_description  : |
-                "When the treshold register is set to 0 the statistics will be auto-correlations.
-                In case the treshold register is set to a non-zero value, it allows to create a sample & hold function
-                for the a-input of the multiplier. 
-                The a-input of the multiplier is updated every treshold clockcycle. Thereby cross statistics can be created."
+          - - field_name    : treshold
+              address_offset: 0x0
+              field_description  : |
+                  "When the treshold register is set to 0 the statistics will be auto-correlations.
+                  In case the treshold register is set to a non-zero value, it allows to create a sample & hold function
+                  for the a-input of the multiplier. 
+                  The a-input of the multiplier is updated every treshold clockcycle. Thereby cross statistics can be created."
         slave_discription: >
             " "
     
diff --git a/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml b/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml
index a48573c686..aca95e8e62 100644
--- a/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml
+++ b/libraries/dsp/fringe_stop/fringe_stop.peripheral.yaml
@@ -6,8 +6,7 @@ hdl_library_name       : fringe_stop
 hdl_library_description: " This is the description for the finge_stop library "
 
 peripherals:
-  - 
-    peripheral_name: fringe_stop_unit
+  - peripheral_name: fringe_stop_unit
 
     parameters:
       - { name: g_nof_channels,  value: 256 }
@@ -15,34 +14,26 @@ peripherals:
       - { name: g_fs_step_w   ,  value: 17 }
     
     slave_ports:
-      - 
         # actual hdl name: ram_fringe_stop_step
-        slave_prefix : FRINGE_STOP 
-        slave_name   : STEP  
-        slave_postfix: RAM
+      - slave_name   : "FRINGE_STOP_STEP_RAM"
         slave_type   : RAM
         fields:
-          - 
-            field_name  : fringe_stop_step
-            width: g_fs_step_w
-            number_of_fields: g_nof_channels
-            field_description: |
-                "Contains the step size for all nof_channels channels."
+          - - field_name  : fringe_stop_step
+              width: g_fs_step_w
+              number_of_fields: g_nof_channels
+              field_description: |
+                  "Contains the step size for all nof_channels channels."
         slave_discription: " "
 
-      - 
         # actual hdl name: fringe_stop_offset
-        slave_prefix : FRINGE_STOP 
-        slave_name   : OFFSET  
-        slave_postfix: RAM
+      - slave_name   : "FRINGE_STOP_OFFSET_RAM"  
         slave_type   : RAM
         fields:
-          - 
-            field_name:  fringe_stop_offset
-            width: g_fs_offset_w
-            number_of_fields: g_nof_channels
-            field_description: |
-                "Contains the offset for all nof_channels channels."
+          - - field_name:  fringe_stop_offset
+              width: g_fs_offset_w
+              number_of_fields: g_nof_channels
+              field_description: |
+                  "Contains the offset for all nof_channels channels."
         slave_discription: " "
 
     peripheral_description: |
diff --git a/libraries/io/epcs/epcs.peripheral.yaml b/libraries/io/epcs/epcs.peripheral.yaml
index 50045e05a6..1b41c1ae6d 100644
--- a/libraries/io/epcs/epcs.peripheral.yaml
+++ b/libraries/io/epcs/epcs.peripheral.yaml
@@ -15,112 +15,87 @@ peripherals:
       - {name: "g_sim_flash_model", value: TRUE} 
 
     slave_ports:
-      - 
         # actual hdl name: epcs_reg
-        slave_prefix : EPCS
-        slave_name   : EPCS
-        slave_postfix: REG
+      - slave_name   : EPCS_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : addr
-            width         : 24
-            access_mode   : WO
-            address_offset: 0x0
-            field_description: " address to write to or read from "
+          - - field_name    : addr
+              width         : 24
+              access_mode   : WO
+              address_offset: 0x0
+              field_description: " address to write to or read from "
         
-          -
-            field_name    : rden
-            width         : 1
-            access_mode   : WO
-            address_offset: 0x1
-            field_description: " Read enable bit "
+          - - field_name    : rden
+              width         : 1
+              access_mode   : WO
+              address_offset: 0x4
+              field_description: " Read enable bit "
         
-          -
-            field_name    : read_bit
-            width         : 1
-            access_mode   : WO
-            side_effect   : PW
-            address_offset: 0x2
-            field_description: " Read bit "
+          - - field_name    : read_bit
+              width         : 1
+              access_mode   : WO
+              side_effect   : PW
+              address_offset: 0x8
+              field_description: " Read bit "
 
-          -
-            field_name    : write_bit
-            width         : 1
-            access_mode   : WO
-            side_effect   : PW
-            address_offset: 0x3
-            field_description: " Write bit "
+          - - field_name    : write_bit
+              width         : 1
+              access_mode   : WO
+              side_effect   : PW
+              address_offset: 0xc
+              field_description: " Write bit "
 
-          -
-            field_name    : sector_erase
-            width         : 1
-            access_mode   : WO
-            address_offset: 0x4
-            field_description: " Sector erase bit "
+          - - field_name    : sector_erase
+              width         : 1
+              access_mode   : WO
+              address_offset: 0x10
+              field_description: " Sector erase bit "
 
-          -
-            field_name    : busy
-            width         : 1
-            access_mode   : RO
-            address_offset: 0x5
-            field_description: " busy "
+          - - field_name    : busy
+              width         : 1
+              access_mode   : RO
+              address_offset: 0x14
+              field_description: " busy "
 
         slave_description:  " Read and write access to flash "
 
       # actual hdl name: mms_dp_fifo_to_mm
-      - 
-        slave_prefix : EPCS
-        slave_name   : DPMM_CTRL
-        slave_postfix: REG
+      - slave_name   : EPCS_DPMM_CTRL_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : ctrl
-            width         : 32
-            access_mode   : RW
-            address_offset: 0x0
-            field_description: "  "
+          - - field_name    : ctrl
+              width         : 32
+              access_mode   : RW
+              address_offset: 0x0
+              field_description: "  "
       
-      -   
-        slave_prefix : EPCS
-        slave_name   : DPMM_DATA
-        slave_postfix: REG
+      - slave_name   : EPCS_DPMM_DATA_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : data
-            width         : 32
-            access_mode   : RW
-            address_offset: 0x0
-            field_description: "  "
+          - - field_name    : data
+              width         : 32
+              access_mode   : RW
+              address_offset: 0x0
+              field_description: "  "
 
       # actual hdl name: mms_dp_fifo_from_mm
-      - 
-        slave_prefix : EPCS
-        slave_name   : MMDP_CTRL
-        slave_postfix: REG
+      - slave_name   : EPCS_MMDP_CTRL_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : ctrl
-            width         : 32
-            access_mode   : RW
-            address_offset: 0x0
-            field_description: "  "
+          - - field_name    : ctrl
+              width         : 32
+              access_mode   : RW
+              address_offset: 0x0
+              field_description: "  "
       
-      -  
-        slave_prefix : EPCS
-        slave_name   : MMDP_DATA
-        slave_postfix: REG
+      - slave_name   : EPCS_MMDP_DATA_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : data
-            width         : 32
-            access_mode   : RW
-            address_offset: 0x0
-            field_description: "  "
+          - - field_name    : data
+              width         : 32
+              access_mode   : RW
+              address_offset: 0x0
+              field_description: "  "
     
     peripheral_description: |
         "wi  Bits     SE  R/W Name              Default  Description         |REG_EPCS|                      
diff --git a/libraries/io/eth/eth.peripheral.yaml b/libraries/io/eth/eth.peripheral.yaml
index f8a3023268..9656fb34fe 100644
--- a/libraries/io/eth/eth.peripheral.yaml
+++ b/libraries/io/eth/eth.peripheral.yaml
@@ -15,47 +15,36 @@ peripherals:
         #g_ETH_PHY   : "LVDS" 
 
     slave_ports:
-      - 
-        # actual hdl name: reg_tse
-        slave_prefix : ETH 
-        slave_name   : TSE  
-        slave_postfix: REG
+      # actual hdl name: reg_tse
+      - slave_name   : ETH_TSE_REG  
         slave_type   : REG
         fields:
-          - 
-            field_name      : status
-            access_mode     : RO
-            address_offset  : 0x0
-            number_of_fields: 1024
-            field_description: | 
-                " reg tse "
-        slave_description: ""
-      - 
-        # actual hdl name: reg
-        slave_prefix : ETH 
-        slave_name   : REG  
-        slave_postfix: REG
+          - - field_name      : status
+              access_mode     : RO
+              address_offset  : 0x0
+              number_of_fields: 1024
+              field_description: "reg tse"
+        slave_description: " "
+        
+      # actual hdl name: reg
+      - slave_name   : ETH_REG  
         slave_type   : REG    
         fields:
-          - 
-            field_name      : status
-            access_mode     : RO
-            address_offset  : 0x0
-            number_of_fields: 11
-            field_description: " reg registers "
+          - - field_name      : status
+              access_mode     : RO
+              address_offset  : 0x0
+              number_of_fields: 12
+              field_description: "reg registers"
         slave_description: " "
-      - 
-        # actual hdl name: ram
-        slave_prefix : ETH 
-        slave_name   : RAM  
-        slave_postfix: RAM
+        
+      # actual hdl name: ram
+      - slave_name   : ETH_RAM  
         slave_type   : RAM
         fields:
-          - 
-            field_name      : ram
-            number_of_fields: c_eth_ram_nof_words
-            field_description: |
-                "Contains the Waveform data for the data-streams to be send"
+          - - field_name      : ram
+              number_of_fields: c_eth_ram_nof_words
+              field_description: |
+                  "Contains the Waveform data for the data-streams to be send"
         slave_description: " "
 
     peripheral_description: |
diff --git a/libraries/io/ppsh/ppsh.peripheral.yaml b/libraries/io/ppsh/ppsh.peripheral.yaml
index b9b71e89d6..bbbf08cf25 100644
--- a/libraries/io/ppsh/ppsh.peripheral.yaml
+++ b/libraries/io/ppsh/ppsh.peripheral.yaml
@@ -13,22 +13,18 @@ peripherals:
       - { name: g_st_clk_freq,        value: 200 * 10**6 }
     
     slave_ports:
-      - 
         # actual hdl name: reg_ppsh
-        slave_prefix : PPSH 
-        slave_name   : PPSH  
-        slave_postfix: REG
+      - slave_name   : PPSH_REG  
         slave_type   : REG
         fields:
-          - 
-            field_name    : status
-            access_mode   : RO
-            address_offset: 0x0
-            field_description: " ppsh status "
-          - 
-            field_name    : control
-            address_offset: 0x1
-            field_description: " ppsh control "
+          - - field_name    : status
+              access_mode   : RO
+              address_offset: 0x0
+              field_description: " ppsh status "
+          
+          - - field_name    : control
+              address_offset: 0x4
+              field_description: " ppsh control "
         slave_discription: " "
     
     peripheral_description: |
diff --git a/libraries/io/remu/remu.peripheral.yaml b/libraries/io/remu/remu.peripheral.yaml
index 51d26382f1..136ae9f9a1 100644
--- a/libraries/io/remu/remu.peripheral.yaml
+++ b/libraries/io/remu/remu.peripheral.yaml
@@ -8,71 +8,60 @@ hdl_library_description: " This is the description for the remu package "
 peripherals:
  
   # peripheral, remu_reg
-  - 
-    peripheral_name: remu_reg
+  - peripheral_name: remu_reg
 
     parameters:
       - { name: g_data_w, value: 24 }
 
     slave_ports:
-      - 
         # actual hdl name: reg_remu
-        slave_prefix : WORK
-        slave_name   : REMU
-        slave_postfix: REG
+      - slave_name   : REMU_REG
         slave_type   : REG
         fields:
-          -
-            field_name    : reconfigure_key
-            width         : c_word_w
-            access_mode   : WO
-            address_offset: 0x0
-            field_description: " reconfigure key for safety "
+          - - field_name    : reconfigure_key
+              width         : c_word_w
+              access_mode   : WO
+              address_offset: 0x0
+              field_description: " reconfigure key for safety "
         
-          -
-            field_name    : param
-            width         : 3
-            access_mode   : WO
-            address_offset: 0x1
-            radix         : unsigned 
-            field_description: " "
+          - - field_name    : param
+              width         : 3
+              access_mode   : WO
+              address_offset: 0x4
+              radix         : unsigned 
+              field_description: " "
         
-          -
-            field_name    : read_param
-            width         : 1
-            access_mode   : WO
-            side_effect   : PW
-            address_offset: 0x2
-            field_description: " read_param "
+          - - field_name    : read_param
+              width         : 1
+              access_mode   : WO
+              side_effect   : PW
+              address_offset: 0x8
+              field_description: " read_param "
 
-          -
-            field_name    : write_param
-            width         : 1
-            access_mode   : WO
-            side_effect   : PW
-            address_offset: 0x3
-            field_description: " write_param "
+          - - field_name    : write_param
+              width         : 1
+              access_mode   : WO
+              side_effect   : PW
+              address_offset: 0xc
+              field_description: " write_param "
 
-          -
-            field_name    : data_out
-            width         : g_data_w
-            access_mode   : RO
-            address_offset: 0x4
-            field_description: " data_out "
+          - - field_name    : data_out
+              width         : g_data_w
+              access_mode   : RO
+              address_offset: 0x10
+              field_description: " data_out "
 
-          -
-            field_name    : data_in
-            width         : g_data_w
-            access_mode   : WO
-            address_offset: 0x5
-            field_description: " data_in "
+          - - field_name    : data_in
+              width         : g_data_w
+              access_mode   : WO
+              address_offset: 0x14
+              field_description: " data_in "
 
-          -
-            field_name    : busy
-            width         : 1
-            access_mode   : RO
-            address_offset: 0x6
-            field_description: " busy "
+          - - field_name    : busy
+              width         : 1
+              access_mode   : RO
+              address_offset: 0x18
+              field_description: " busy "
 
         slave_description:  " Remote Upgrade "
     
-- 
GitLab