Merge pull request #943 from Logic-Design-Services/check-component-action

Update LICENSE to Logic Design Services.

Author: Blebowski

LICENSE

@@ -1,13 +1,13 @@
 
-CTU CAN FD IP Core 
-Copyright (C) 2021-present Ondrej Ille
+CTU CAN FD IP Core
+Copyright (C) 2021-2023 Ondrej Ille
+Copyright (C) 2023-     Logic Design Services Ltd.s
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this VHDL component and associated documentation files (the "Component"),
 to use, copy, modify, merge, publish, distribute the Component for
-educational, research, evaluation, self-interest purposes. Using the
-Component for commercial purposes is forbidden unless previously agreed with
-Copyright holder.
+non-commercial purposes. Using the Component for commercial purposes is
+forbidden unless previously agreed with Copyright holder.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Component.
@@ -26,14 +26,14 @@ protocol license from Bosch.
 
 -------------------------------------------------------------------------------
 
-CTU CAN FD IP Core 
+CTU CAN FD IP Core
 Copyright (C) 2015-2020 MIT License
 
 Authors:
     Ondrej Ille <[email protected]>
     Martin Jerabek <[email protected]>
 
-Project advisors: 
+Project advisors:
 	Jiri Novak <[email protected]>
 	Pavel Pisa <[email protected]>
 

scripts/license_updater.py

@@ -1,21 +1,21 @@
-################################################################################                                                     
-## 
-##   CAN with Flexible Data-Rate IP Core 
-##   
+################################################################################
+##
+##   CAN with Flexible Data-Rate IP Core
+##
 ##   Copyright (C) 2017 Ondrej Ille <[email protected]>
-##   
+##
 ##   Script for updating license in the header source codes of CAN FD IP Core.
 ##   Supports following file extensions: ".vhd" , ".tcl" , ".h" , ".c", ".cpp"
-##    
+##
 ##   Arguments:
 ##		lic_path 	- File with license which should be placed to header of the
 ##                    all source code files.
-##		sup_files	- Supported file endings which should have the license 
+##		sup_files	- Supported file endings which should have the license
 ##					  updated.
 ##     subfolders	- Which sub-folders should be updated
 ##
 ##	Example of usage from IDLE shell
-##     python ./license_updater.py 'myPrettyLicense.txt' ['.c','.vhd'] 
+##     python ./license_updater.py 'myPrettyLicense.txt' ['.c','.vhd']
 ##				['src','test']
 ##
 ##	Revision history:
@@ -71,14 +71,14 @@ def print_help():
 
 
 def write_license(lic_text, comment_char, file):
-	
+
 	line_length = 80
-	
+
 	# Write the initial line (TCL, VHDL)
 	if (comment_char == "-" or comment_char == "#"):
 		for i in range(0, line_length):
 			file.write(comment_char)
-			
+
 	# Write the initial line (C)
 	elif (comment_char == "*"):
 
@@ -91,10 +91,10 @@ def write_license(lic_text, comment_char, file):
 			file.write(comment_char)
 	else:
 		print("Unsuported Comment character")
-	
+
 	file.write("\n")
-	
-	# Write rest of the lines	
+
+	# Write rest of the lines
 	buf = io.StringIO(lic_text)
 	i = 0
 	while True:
@@ -104,18 +104,20 @@ def write_license(lic_text, comment_char, file):
 		lic_line = buf.readline()
 		if (not(str.find("<licend1234>", lic_line) == -1)):
 			break
-		
+
 		# Write Begining of the line
 		if (comment_char == "-" or comment_char == "#"):
-			file.write(comment_char + comment_char + " ")
+			file.write(comment_char + comment_char)
+			if (len(lic_line.strip()) > 0):
+				file.write(" ")
 		elif (comment_char == "*"):
 			file.write(" " + comment_char)
 			if (len(lic_line.strip()) > 0):
-				file.write(" ")        
-	
+				file.write(" ")
+
 		# Write Rest of the line
 		file.write(lic_line)
-		
+
 	# Write the final line
 	if (comment_char == "-" or comment_char == "#"):
 		for i in range(0, line_length):
@@ -128,10 +130,10 @@ def write_license(lic_text, comment_char, file):
 				file.write(comment_char)
 		else:
 			for i in range(0, line_length-1):
-				file.write(comment_char)			
+				file.write(comment_char)
 
 		file.write("/")
-		
+
 	file.write("\n")
 
 
@@ -141,78 +143,78 @@ def write_license(lic_text, comment_char, file):
 def write_source(source_file, dest_file, comment_sign):
 	## Read the first file line because this is always commented
 	source_file.readline()
-	
+
 	## Read the license lines
 	## First or second line of the source code is
 	## the "comment character"
 	line = source_file.readline()
-	while (line.startswith(comment_sign) or line[1]==comment_sign):	
+	while (line.startswith(comment_sign) or line[1]==comment_sign):
 		line = source_file.readline()
 		if (len(line)==1):
 			break
-				 
+
 	dest_file.write("\n")
-				 
+
 	## Now read rest of the source code and copy to dest
 	while True:
 		char = source_file.read()
 		if (char == ""):
 			break
 		dest_file.write(char)
-		
-	
-	
-		
+
+
+
+
 
 ################################################################################
 ## Process the file and change the license header, if the file type is in the
 ## list of supported file extensions.
 ################################################################################
 def process_file(filename):
-	
+
 	global sup_files
 	file_ext_match = False
 	ext_type = ""
 	comment_sign = ""
-	
+
 	for ext in sup_files:
 		if (filename.endswith(ext)):
 			file_ext_match = True
 			ext_type = ext
-	
+
 	if (file_ext_match == False):
 		return
-		
+
 	print("Processing file: " + filename)
-	
+
 	## Check the comment sign based on file type
 	if ((ext_type == ".c") or (ext_type == ".cpp")):
 		comment_sign = "*"
-	elif (ext_type == ".h"): 
+	elif (ext_type == ".h"):
 		comment_sign = "*"
-	elif (ext_type == ".tcl"): 
+	elif (ext_type == ".tcl"):
 		comment_sign = "#"
-	elif (ext_type == ".vhd"): 
+	elif (ext_type == ".vhd"):
 		comment_sign = "-"
 	else:
 		comment_sign = "-"
 
 	## Read the file content
 	file = open (filename,"r")
 	temp_file = open ("temp.txt","wt")
-	
+
 	## Write the new license to the temp file
 	write_license(lic_text, comment_sign, temp_file)
-	
+
 	## Write rest of the file after license update
 	write_source(file, temp_file, comment_sign)
 	temp_file.close()
 	file.close()
-	
+
 	## Replace the original file and erase the temp file
 	os.remove(filename)
 	os.rename("temp.txt", filename)
-	
+
 
 ################################################################################
 ## Parse the command line arguments and fill according global variables
@@ -223,9 +225,9 @@ def parse_args():
 	global sub_folders
 	global lic_path
 	global src_path
-	
-	src_path=os.path.dirname(os.path.abspath(__file__))	
-	
+
+	src_path=os.path.dirname(os.path.abspath(__file__))
+
 	lic_path = sys.argv[1]
 	sup_files = sys.argv[2]
 	sup_files = sup_files.replace("[","")
@@ -242,9 +244,9 @@ def parse_args():
 def load_license(lic_path):
 	global lic_text
 	global src_path
-	
-	src_path=os.path.dirname(os.path.abspath(__file__))	
-	
+
+	src_path=os.path.dirname(os.path.abspath(__file__))
+
 	lic_full_path=os.path.join(src_path, lic_path)
 	print(lic_full_path)
 	if (os.path.isfile(lic_full_path)):
@@ -267,54 +269,54 @@ def load_license(lic_path):
 def iterate_dir(dir_path):
 
 	print ("Processing directory: "+dir_path)
-			
+
 	## Process files and directories in this directory
 	sub_dirs = os.listdir(dir_path)
 	for fold in sub_dirs:
 		full_dir = os.path.join(dir_path, fold)
-		
+
 		## Execute recursively on directories
 		if (os.path.isdir(full_dir)):
 			iterate_dir(full_dir)
-		
+
 		## Process the files
 		if (os.path.isfile(full_dir)):
 			process_file(full_dir)
-			
+
 
 ################################################################################
 ## Main function which executes the license replacement
 ################################################################################
 def main():
-	
+
 	global sup_files
 	global sub_folders
 	global lic_text
 	global lic_path
 	global src_path
 	print ("")
-	
+
 	## Check valid input arguments
-	arg_count = 4  ## 3 arguments + script itself  
+	arg_count = 4  ## 3 arguments + script itself
 	if (len(sys.argv) != arg_count):
 		print(" Incorrect amount of arguments!")
 		print_help()
 		print(" Exiting!")
 		sys.exit(1)
-		
+
     ## Parse Command line arguments
 	parse_args()
-	
+
 	## Check license existance and load it
 	load_license(lic_path)
-	
+
 	#Check file extensions
 	for ext in sup_files:
 		if (not ext.startswith(".")):
 			print ("Invalid file extension '"+ext+"' File extenstions should "\
 					"start with '.'")
 			sys.exit(1)
-	
+
 	#Replace the license in the subfolders
 	for dir in sub_folders:
 		dir_path=os.path.join(src_path,'..')
@@ -323,6 +325,6 @@ def main():
 			iterate_dir(dir_path)
 		else:
 			print(dir_path+" directory does not exist")
-		
+
 if __name__ == "__main__":
 	main()

scripts/update_reg_map

@@ -4,9 +4,20 @@ d="$(dirname "$0")"
 
 # Note: the script uses relative paths and must be called from this directory
 cd "$d"
+
+echo "********************************************************************************"
+echo "Generate register map"
+echo "********************************************************************************"
+
 python3 update_reg_map.py --xactSpec ../spec/CTU/ip/CAN_FD_IP_Core/2.1/CAN_FD_IP_Core.2.1.xml \
     --updVHDLPackage True \
     --updHeaderFile True \
     --updLyxDocs True \
     --updRTLRegMap True \
     --updTbPackage True
+
+echo "********************************************************************************"
+echo "Replace license in the generated RTL register map:"
+echo "********************************************************************************"
+
+python3 license_updater.py ../LICENSE ['.vhd'] ['src/memory_registers/generated']

src/bus_sampling/bit_err_detector.vhd

@@ -1,14 +1,14 @@
 --------------------------------------------------------------------------------
 --
 -- CTU CAN FD IP Core
--- Copyright (C) 2021-present Ondrej Ille
+-- Copyright (C) 2021-2023 Ondrej Ille
+-- Copyright (C) 2023-     Logic Design Services Ltd.s
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this VHDL component and associated documentation files (the "Component"),
 -- to use, copy, modify, merge, publish, distribute the Component for
--- educational, research, evaluation, self-interest purposes. Using the
--- Component for commercial purposes is forbidden unless previously agreed with
--- Copyright holder.
+-- non-commercial purposes. Using the Component for commercial purposes is
+-- forbidden unless previously agreed with Copyright holder.
 --
 -- The above copyright notice and this permission notice shall be included in
 -- all copies or substantial portions of the Component.

src/bus_sampling/bus_sampling.vhd

@@ -1,14 +1,14 @@
 --------------------------------------------------------------------------------
 --
 -- CTU CAN FD IP Core
--- Copyright (C) 2021-present Ondrej Ille
+-- Copyright (C) 2021-2023 Ondrej Ille
+-- Copyright (C) 2023-     Logic Design Services Ltd.s
 --
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this VHDL component and associated documentation files (the "Component"),
 -- to use, copy, modify, merge, publish, distribute the Component for
--- educational, research, evaluation, self-interest purposes. Using the
--- Component for commercial purposes is forbidden unless previously agreed with
--- Copyright holder.
+-- non-commercial purposes. Using the Component for commercial purposes is
+-- forbidden unless previously agreed with Copyright holder.
 --
 -- The above copyright notice and this permission notice shall be included in
 -- all copies or substantial portions of the Component.