From d1748212bf3abe4c8c5bd2dee45154444492b961 Mon Sep 17 00:00:00 2001 From: "Ille, Ondrej, Ing" Date: Sat, 19 May 2018 23:24:45 +0200 Subject: [PATCH] Fixed header guard generator. --- scripts/Readme.txt | 5 +++-- scripts/gen_c_header.py | 4 ++-- scripts/pyXact_generator/ip_xact/h_addr_generator.py | 4 ++-- scripts/update_reg_map.py | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/Readme.txt b/scripts/Readme.txt index d560bfd6..1ac184eb 100644 --- a/scripts/Readme.txt +++ b/scripts/Readme.txt @@ -7,8 +7,9 @@ python3.5 gen_vhdl_package.py --licPath ../LICENSE --xactSpec ../spec/CTU/ip/CAN # To generate C header files (register map and frame format) -python3.5 gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec ../spec/CTU/ip/CAN_FD_IP_Core/2.1/CAN_FD_IP_Core.2.1.xml --addrMap Regs --fieldMap Regs --wordWidth 32 --outFile ../driver/ctu_can_fd_regs.h --headName CAN_FD_frame_format -py gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec ../spec/CTU/ip/CAN_FD_IP_Core/2.1/CAN_FD_IP_Core.2.1.xml --addrMap Frame_format --fieldMap Frame_format --wordWidth 32 --outFile ../driver/ctu_can_fd_frame.h --headName CAN_FD_frame_format +python3.5 gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec ../spec/CTU/ip/CAN_FD_IP_Core/2.1/CAN_FD_IP_Core.2.1.xml --addrMap Regs --fieldMap Regs --wordWidth 32 --outFile ../driver/ctu_can_fd_regs.h --headName regs + +python3.5 gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec ../spec/CTU/ip/CAN_FD_IP_Core/2.1/CAN_FD_IP_Core.2.1.xml --addrMap Frame_format --fieldMap Frame_format --wordWidth 32 --outFile ../driver/ctu_can_fd_frame.h --headName frame # To generate Lyx docu for register map diff --git a/scripts/gen_c_header.py b/scripts/gen_c_header.py index 088bca0c..375c7374 100644 --- a/scripts/gen_c_header.py +++ b/scripts/gen_c_header.py @@ -97,6 +97,6 @@ if __name__ == '__main__': write_license(lic_text, '*', of) headerGen.prefix = "ctu_can_fd" - headerGen.create_addrMap_package("CTU_CAN_FD") + headerGen.create_addrMap_package(args.packName) - headerGen.commit_to_file() \ No newline at end of file + headerGen.commit_to_file() diff --git a/scripts/pyXact_generator/ip_xact/h_addr_generator.py b/scripts/pyXact_generator/ip_xact/h_addr_generator.py index e90bc5a7..60694114 100644 --- a/scripts/pyXact_generator/ip_xact/h_addr_generator.py +++ b/scripts/pyXact_generator/ip_xact/h_addr_generator.py @@ -144,7 +144,7 @@ class HeaderAddrGenerator(IpXactAddrGenerator): self.headerGen.write_comment("This file is autogenerated, DO NOT EDIT!", 0, small=True) self.headerGen.wr_nl() - self.headerGen.create_package(name) + self.headerGen.create_package((self.prefix + "_" + name).upper()) self.headerGen.wr_nl() if (self.addrMap): @@ -165,4 +165,4 @@ class HeaderAddrGenerator(IpXactAddrGenerator): def write_reg(self): - pass \ No newline at end of file + pass diff --git a/scripts/update_reg_map.py b/scripts/update_reg_map.py index 43e6edf8..cd7be1b9 100644 --- a/scripts/update_reg_map.py +++ b/scripts/update_reg_map.py @@ -70,8 +70,8 @@ if __name__ == '__main__': if (str_arg_to_bool(args.updHeader)): print("Generating CAN FD memory registers Header file...\n") - os.system("""{} gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec {} --addrMap Regs --fieldMap Regs --wordWidth 32 --outFile ../driver/ctu_can_fd_regs.h --headName CAN_FD_frame_format""".format(pythonAlias, args.xactSpec)) - os.system("""{} gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec {} --addrMap Frame_format --fieldMap Frame_format --wordWidth 32 --outFile ../driver/ctu_can_fd_frame.h --headName CAN_FD_frame_format""".format(pythonAlias, args.xactSpec)) + os.system("""{} gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec {} --addrMap Regs --fieldMap Regs --wordWidth 32 --outFile ../driver/ctu_can_fd_regs.h --headName regs""".format(pythonAlias, args.xactSpec)) + os.system("""{} gen_c_header.py --licPath ../lic/gpl_v2.txt --xactSpec {} --addrMap Frame_format --fieldMap Frame_format --wordWidth 32 --outFile ../driver/ctu_can_fd_frame.h --headName frame""".format(pythonAlias, args.xactSpec)) print("\nDone\n") if (str_arg_to_bool(args.updDocs)): -- GitLab