Skip to content

Commit f5bca12

Browse files
stefanunreinstefanunrein
committed
Apply suggestion
1 parent bcc92dd commit f5bca12

File tree

2 files changed

+68
-68
lines changed

2 files changed

+68
-68
lines changed

‎src/bus/axi4/AXI4Lite/AXI4Lite_GitVersionRegister.vhdl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
-- can be used by another interface than AXI4L, if necessary.
1616
-- If you dont need the UID field, use this to directly create a constant out of
1717
-- the mem-file:
18-
-- constant My_Version : T_Version_Register := to_Version_Register(MEM_PATH);
18+
-- constant My_Version : T_VersionRegister := to_VersionRegister(MEM_PATH);
1919
--
2020
-- Use the pre-synthesis script from
2121
-- PoC/tools/git/preSynth_GitVersionRegister_Vivado.tcl
@@ -70,14 +70,14 @@ entity AXI4Lite_GitVersionRegister is
7070
AXI4Lite_m2s : in T_AXI4Lite_BUS_M2S;
7171
AXI4Lite_s2m : out T_AXI4Lite_BUS_S2M;
7272

73-
Version : out T_Version_Register
73+
Version : out T_VersionRegister
7474
);
7575
end entity;
7676

7777

7878
architecture rtl of AXI4Lite_GitVersionRegister is
7979
constant CONFIG : T_AXI4_Register_Vector := get_Version_Descriptor;
80-
constant VersionData : T_SLVV_32(0 to C_Num_Version_Header - 1) := read_Version_from_mem(PROJECT_DIR & VERSION_FILE_NAME);
80+
constant VersionData : T_SLVV_32(0 to C_Num_VersionHeader - 1) := read_Version_from_mem(PROJECT_DIR & VERSION_FILE_NAME);
8181

8282
signal RegisterFile_ReadPort : T_SLVV(0 to CONFIG'Length -1)(DATA_BITS - 1 downto 0);
8383
signal RegisterFile_WritePort : T_SLVV(0 to CONFIG'Length -1)(DATA_BITS - 1 downto 0);
@@ -106,9 +106,9 @@ begin
106106
RegisterFile_ReadPort => RegisterFile_ReadPort,
107107
RegisterFile_WritePort => RegisterFile_WritePort
108108
);
109-
RegisterFile_WritePort(0 to C_Num_Version_Header -1) <= VersionData;
110-
RegisterFile_WritePort(C_Num_Version_Header to C_Num_Version_Register -1) <= UID_vec;
111-
Version <= to_Version_Register(RegisterFile_ReadPort);
109+
RegisterFile_WritePort(0 to C_Num_VersionHeader -1) <= VersionData;
110+
RegisterFile_WritePort(C_Num_VersionHeader to C_Num_VersionRegister -1) <= UID_vec;
111+
Version <= to_VersionRegister(RegisterFile_ReadPort);
112112

113113
---------------------------------
114114
-- Generate data for UID-vector

‎src/mem/mem_GitVersionRegister.pkg.vhdl‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ package mem_GitVersionRegister is
5151
constant Address_Width : natural := 32;
5252
constant Data_Width : natural := 32;
5353

54-
type T_Version_Register_Common is record
54+
type T_VersionRegister_Common is record
5555
BuildDate_Day : std_logic_vector(7 downto 0);
5656
BuildDate_Month : std_logic_vector(7 downto 0);
5757
BuildDate_Year : std_logic_vector(15 downto 0);
@@ -66,7 +66,7 @@ package mem_GitVersionRegister is
6666
ProjektName : std_logic_vector(159 downto 0);
6767
end record;
6868

69-
type T_Version_Register_Top is record
69+
type T_VersionRegister_Top is record
7070
Version_Major : std_logic_vector(7 downto 0);
7171
Version_Minor : std_logic_vector(7 downto 0);
7272
Version_Release : std_logic_vector(7 downto 0);
@@ -90,54 +90,54 @@ package mem_GitVersionRegister is
9090
GitURL : std_logic_vector(1023 downto 0);
9191
end record;
9292

93-
type T_Version_Register_UID is record
93+
type T_VersionRegister_UID is record
9494
UID : std_logic_vector(127 downto 0);
9595
User_eFuse : std_logic_vector(31 downto 0);
9696
User_ID : std_logic_vector(95 downto 0);
9797
end record;
9898

99-
type T_Version_Register is record
100-
Common : T_Version_Register_Common;
101-
Top : T_Version_Register_Top;
102-
UID : T_Version_Register_UID;
99+
type T_VersionRegister is record
100+
Common : T_VersionRegister_Common;
101+
Top : T_VersionRegister_Top;
102+
UID : T_VersionRegister_UID;
103103
end record;
104104

105-
constant C_VERSION_REGISTER_UID_INIT : T_Version_Register_UID := (
105+
constant C_VersionRegister_UID_INIT : T_VersionRegister_UID := (
106106
UID => (others => '0'),
107107
User_eFuse => (others => '0'),
108108
User_ID => (others => '0')
109109
);
110110

111111
constant C_Num_reg_UID_vec : T_NATVEC := (
112-
0 => C_VERSION_REGISTER_UID_INIT.UID'length / 32,
113-
1 => C_VERSION_REGISTER_UID_INIT.User_eFuse'length / 32,
114-
2 => C_VERSION_REGISTER_UID_INIT.User_ID'length / 32
112+
0 => C_VersionRegister_UID_INIT.UID'length / 32,
113+
1 => C_VersionRegister_UID_INIT.User_eFuse'length / 32,
114+
2 => C_VersionRegister_UID_INIT.User_ID'length / 32
115115
);
116116

117117
constant C_Num_Reg_Common : natural := 8;
118118
constant C_Num_Reg_Top : natural := 56;
119119
constant C_Num_Reg_UID : natural := isum(C_Num_reg_UID_vec);
120120

121121

122-
constant C_Num_Version_Header : natural := C_Num_Reg_Common + C_Num_Reg_Top;
123-
constant C_Num_Version_Register : natural := C_Num_Version_Header + C_Num_Reg_UID;
122+
constant C_Num_VersionHeader : natural := C_Num_Reg_Common + C_Num_Reg_Top;
123+
constant C_Num_VersionRegister : natural := C_Num_VersionHeader + C_Num_Reg_UID;
124124

125-
function to_SLVV_32_Common (data : T_Version_Register_Common) return T_SLVV_32;
126-
function to_SLVV_32_Top (data : T_Version_Register_Top) return T_SLVV_32;
127-
function to_Version_Register (reg_vec : T_SLVV) return T_Version_Register;
125+
function to_SLVV_32_Common (data : T_VersionRegister_Common) return T_SLVV_32;
126+
function to_SLVV_32_Top (data : T_VersionRegister_Top) return T_SLVV_32;
127+
function to_VersionRegister (registerValues : T_SLVV) return T_VersionRegister;
128128
function get_Dummy_Descriptor(len : natural) return T_AXI4_Register_Vector;
129129

130130
function get_Version_Descriptor return T_AXI4_Register_Vector;
131131

132132
impure function read_Version_from_mem(FileName : string) return T_SLVV_32;
133-
impure function to_Version_Register (FileName : string) return T_Version_Register;
133+
impure function to_VersionRegister (FileName : string) return T_VersionRegister;
134134
end package;
135135

136136

137137
package body mem_GitVersionRegister is
138138

139139
function get_Version_Descriptor return T_AXI4_Register_Vector is
140-
variable temp : T_AXI4_Register_Vector(0 to C_Num_Version_Register -1);
140+
variable temp : T_AXI4_Register_Vector(0 to C_Num_VersionRegister -1);
141141
variable pos : natural := 0;
142142
variable addr : natural := 0;
143143
begin
@@ -186,50 +186,50 @@ package body mem_GitVersionRegister is
186186
return temp(0 to pos -1);
187187
end function;
188188

189-
function to_Version_Register (reg_vec : T_SLVV) return T_Version_Register is
190-
variable temp : T_Version_Register;
189+
function to_VersionRegister (registerValues : T_SLVV) return T_VersionRegister is
190+
variable temp : T_VersionRegister;
191191
begin
192-
temp.Common.BuildDate_Day := reg_vec(0)(31 downto 24);
193-
temp.Common.BuildDate_Month := reg_vec(0)(23 downto 16);
194-
temp.Common.BuildDate_Year := reg_vec(0)(15 downto 0);
195-
temp.Common.NumberModule := reg_vec(1)(31 downto 8);
196-
temp.Common.VersionOfVersionReg := reg_vec(1)( 7 downto 0);
197-
temp.Common.ToolVersion_Year := reg_vec(2)(31 downto 16);
198-
temp.Common.ToolVersion_Release := reg_vec(2)(15 downto 8);
199-
temp.Common.ToolVersion_SubRelease := reg_vec(2)( 7 downto 0);
192+
temp.Common.BuildDate_Day := registerValues(0)(31 downto 24);
193+
temp.Common.BuildDate_Month := registerValues(0)(23 downto 16);
194+
temp.Common.BuildDate_Year := registerValues(0)(15 downto 0);
195+
temp.Common.NumberModule := registerValues(1)(31 downto 8);
196+
temp.Common.VersionOfVersionReg := registerValues(1)( 7 downto 0);
197+
temp.Common.ToolVersion_Year := registerValues(2)(31 downto 16);
198+
temp.Common.ToolVersion_Release := registerValues(2)(15 downto 8);
199+
temp.Common.ToolVersion_SubRelease := registerValues(2)( 7 downto 0);
200200
for i in 0 to 4 loop
201-
temp.Common.ProjektName(32 * i +31 downto 32 * i) := reg_vec(i + 3);
201+
temp.Common.ProjektName(32 * i +31 downto 32 * i) := registerValues(i + 3);
202202
end loop;
203203

204-
temp.Top.Version_Major := reg_vec(8)(31 downto 24);
205-
temp.Top.Version_Minor := reg_vec(8)(23 downto 16);
206-
temp.Top.Version_Release := reg_vec(8)(15 downto 8);
207-
temp.Top.Version_CommitsToTag := reg_vec(8)( 7 downto 2);
208-
temp.Top.Version_DirtyUntracked := reg_vec(8)(1);
209-
temp.Top.Version_DirtyModified := reg_vec(8)(0);
204+
temp.Top.Version_Major := registerValues(8)(31 downto 24);
205+
temp.Top.Version_Minor := registerValues(8)(23 downto 16);
206+
temp.Top.Version_Release := registerValues(8)(15 downto 8);
207+
temp.Top.Version_CommitsToTag := registerValues(8)( 7 downto 2);
208+
temp.Top.Version_DirtyUntracked := registerValues(8)(1);
209+
temp.Top.Version_DirtyModified := registerValues(8)(0);
210210
for i in 0 to 4 loop
211-
temp.Top.GitHash(32 * i +31 downto 32 * i) := reg_vec(i + 9);
211+
temp.Top.GitHash(32 * i +31 downto 32 * i) := registerValues(i + 9);
212212
end loop;
213-
temp.Top.GitDate_Day := reg_vec(14)(31 downto 24);
214-
temp.Top.GitDate_Month := reg_vec(14)(23 downto 16);
215-
temp.Top.GitDate_Year := reg_vec(14)(15 downto 0);
216-
temp.Top.GitTime_Hour := reg_vec(15)(31 downto 24);
217-
temp.Top.GitTime_Min := reg_vec(15)(23 downto 16);
218-
temp.Top.GitTime_Sec := reg_vec(15)(15 downto 8);
219-
temp.Top.GitTime_Zone := reg_vec(15)( 7 downto 0);
213+
temp.Top.GitDate_Day := registerValues(14)(31 downto 24);
214+
temp.Top.GitDate_Month := registerValues(14)(23 downto 16);
215+
temp.Top.GitDate_Year := registerValues(14)(15 downto 0);
216+
temp.Top.GitTime_Hour := registerValues(15)(31 downto 24);
217+
temp.Top.GitTime_Min := registerValues(15)(23 downto 16);
218+
temp.Top.GitTime_Sec := registerValues(15)(15 downto 8);
219+
temp.Top.GitTime_Zone := registerValues(15)( 7 downto 0);
220220
for i in 0 to 15 loop
221-
temp.Top.BranchName_Tag(32 * i +31 downto 32 * i) := reg_vec(i + 16);
221+
temp.Top.BranchName_Tag(32 * i +31 downto 32 * i) := registerValues(i + 16);
222222
end loop;
223223
for i in 0 to 31 loop
224-
temp.Top.GitURL(32 * i +31 downto 32 * i) := reg_vec(i + 32);
224+
temp.Top.GitURL(32 * i +31 downto 32 * i) := registerValues(i + 32);
225225
end loop;
226226

227227
for i in 0 to 3 loop
228-
temp.UID.UID(32 * i +31 downto 32 * i) := reg_vec(i + 64);
228+
temp.UID.UID(32 * i +31 downto 32 * i) := registerValues(i + 64);
229229
end loop;
230-
temp.UID.User_eFuse := reg_vec(68);
230+
temp.UID.User_eFuse := registerValues(68);
231231
for i in 0 to 2 loop
232-
temp.UID.User_ID(32 * i +31 downto 32 * i) := reg_vec(i + 69);
232+
temp.UID.User_ID(32 * i +31 downto 32 * i) := registerValues(i + 69);
233233
end loop;
234234

235235
return temp;
@@ -249,7 +249,7 @@ package body mem_GitVersionRegister is
249249
end function;
250250

251251

252-
function to_SLVV_32_Common(data : T_Version_Register_Common) return T_SLVV_32 is
252+
function to_SLVV_32_Common(data : T_VersionRegister_Common) return T_SLVV_32 is
253253
variable temp : T_SLVV_32(0 to 7) := (others => (others => '0'));
254254
variable name : T_SLVV_32(4 downto 0) := to_slvv_32(data.ProjektName);
255255
begin
@@ -263,7 +263,7 @@ package body mem_GitVersionRegister is
263263
return temp;
264264
end function;
265265

266-
function to_SLVV_32_Top(data : T_Version_Register_Top) return T_SLVV_32 is
266+
function to_SLVV_32_Top(data : T_VersionRegister_Top) return T_SLVV_32 is
267267
variable temp : T_SLVV_32(0 to 55) := (others => (others => '0'));
268268

269269
variable hash : T_SLVV_32(4 downto 0) := to_slvv_32(data.GitHash);
@@ -300,9 +300,9 @@ package body mem_GitVersionRegister is
300300

301301
impure function read_Version_from_mem(FileName : string) return T_SLVV_32 is
302302
constant Verbose : boolean := POC_VERBOSE;
303-
constant MemoryLines : positive := C_Num_Version_Header;
304-
variable HW_BUILD_VERSION_COMMON : T_Version_Register_Common;
305-
variable HW_BUILD_VERSION_TOP : T_Version_Register_Top;
303+
constant MemoryLines : positive := C_Num_VersionHeader;
304+
variable HW_BUILD_VERSION_COMMON : T_VersionRegister_Common;
305+
variable HW_BUILD_VERSION_TOP : T_VersionRegister_Top;
306306

307307
file FileHandle : TEXT open READ_MODE is FileName;
308308
variable CurrentLine : LINE;
@@ -465,18 +465,18 @@ package body mem_GitVersionRegister is
465465
HW_BUILD_VERSION_TOP.GitURL := to_slv(to_RawString(resize(result_s(1 to Len), 128, NUL)));
466466

467467
temp(0 to C_Num_Reg_Common - 1) := to_SLVV_32_Common(HW_BUILD_VERSION_COMMON);
468-
temp(C_Num_Reg_Common to C_Num_Version_Header - 1) := to_SLVV_32_Top(HW_BUILD_VERSION_TOP);
468+
temp(C_Num_Reg_Common to C_Num_VersionHeader - 1) := to_SLVV_32_Top(HW_BUILD_VERSION_TOP);
469469

470470
return temp;
471471
end function;
472-
473-
impure function to_Version_Register (FileName : string) return T_Version_Register is
474-
variable VersionData : T_SLVV_32(0 to C_Num_Version_Register - 1);
475-
472+
473+
impure function to_VersionRegister (FileName : string) return T_VersionRegister is
474+
variable VersionData : T_SLVV_32(0 to C_Num_VersionRegister - 1);
475+
476476
begin
477-
VersionData(0 to C_Num_Version_Header - 1) := read_Version_from_mem(FileName);
478-
VersionData(C_Num_Version_Header to C_Num_Version_Register - 1) := (others => (others => '0'));
479-
return to_Version_Register(VersionData);
477+
VersionData(0 to C_Num_VersionHeader - 1) := read_Version_from_mem(FileName);
478+
VersionData(C_Num_VersionHeader to C_Num_VersionRegister - 1) := (others => (others => '0'));
479+
return to_VersionRegister(VersionData);
480480
end function;
481-
481+
482482
end package body;

0 commit comments

Comments
 (0)