From 73b1b68a8386971de093ce6606ba18971cbb9f6f Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Wed, 31 Mar 2021 08:53:15 +0200
Subject: [PATCH] Renamed radix char into char8.
---
.../lofar2_unb2b_beamformer.mmap.gold | 10 +++++-----
.../libraries/unb2b_board/unb2b_board.peripheral.yaml | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.mmap.gold b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.mmap.gold
index ef9b9aa2ad..77fe322829 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.mmap.gold
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.mmap.gold
@@ -6,9 +6,9 @@ number_of_columns = 11
# col 4: mm_port_type, if - then it is part of previous MM port.
# col 5: field_name
# col 6: field start address (in MM words)
-# col 7: number of fields
-# col 8: field access_mode
-# col 9: field radix
+# col 7: number of fields, if - then it is part of previous field_name.
+# col 8: field access_mode, if - then it is part of previous field_name.
+# col 9: field radix, if - then it is part of previous field_name.
# col 10: field mm_mask
# col 11: field user_mask, if - then it is same as mm_mask
#
@@ -24,11 +24,11 @@ number_of_columns = 11
- - - - info_rom_version 0x00008000 1 RO uint32 b[26:24] -
- - - - info_technology 0x00008000 1 RO uint32 b[31:27] -
- - - - use_phy 0x00008001 1 RO uint32 b[7:0] -
- - - - - design_name 0x00008002 52 RO char b[31:0] b[7:0]
+ - - - - design_name 0x00008002 52 RO char8 b[31:0] b[7:0]
- - - - stamp_date 0x0000800f 1 RO uint32 b[31:0] -
- - - - stamp_time 0x00008010 1 RO uint32 b[31:0] -
- - - - stamp_commit 0x00008011 3 RO uint32 b[31:0] -
- - - - - design_note 0x00008014 52 RO char b[31:0] b[7:0]
+ - - - - design_note 0x00008014 52 RO char8 b[31:0] b[7:0]
PIO_WDI 1 1 REG wdi_override 0x0000a000 1 WO uint32 b[31:0] -
REG_FPGA_TEMP_SENS 1 1 REG temp 0x0000c000 1 RO uint32 b[31:0] -
REG_FPGA_VOLTAGE_SENS 1 1 REG voltages 0x0000c000 6 RO uint32 b[31:0] -
diff --git a/boards/uniboard2b/libraries/unb2b_board/unb2b_board.peripheral.yaml b/boards/uniboard2b/libraries/unb2b_board/unb2b_board.peripheral.yaml
index b3602a1ae3..3e40802728 100644
--- a/boards/uniboard2b/libraries/unb2b_board/unb2b_board.peripheral.yaml
+++ b/boards/uniboard2b/libraries/unb2b_board/unb2b_board.peripheral.yaml
@@ -34,7 +34,7 @@ peripherals:
field_description: "FPGA info memory map data"
mm_width: 32
user_width: 8
- radix: char
+ radix: char8
access_mode: RO
address_offset: 0x0
number_of_fields: 32768 # c_rom_addr_w in mms_unb2b_board_system_info
@@ -110,7 +110,7 @@ peripherals:
field_description: "FPGA FW design name string."
mm_width: 32
user_width: 8
- radix: char
+ radix: char8
access_mode: RO
address_offset: 0x8
number_of_fields: 52
@@ -133,7 +133,7 @@ peripherals:
field_description: "FPGA FW design note string."
mm_width: 32
user_width: 8
- radix: char
+ radix: char8
access_mode: RO
address_offset: 0x50
number_of_fields: 52
--
GitLab