From 52c0c1d9a632106d732337a416482839e647d205 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 8 Jan 2023 18:56:49 +0100
Subject: [PATCH] adds more fixes for #7

---
 .../src/com/minres/rdl/generator/AddrmapGenerator.xtend     | 4 +---
 .../src/com/minres/rdl/generator/FwAddrmapGenerator.xtend   | 2 +-
 .../src/com/minres/rdl/generator/FwRegfileGenerator.xtend   | 6 ++----
 .../src/com/minres/rdl/generator/ModuleGenerator.xtend      | 4 +---
 .../src/com/minres/rdl/generator/RegfileGenerator.xtend     | 3 +--
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
index 0008c10..66cbe69 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
@@ -20,7 +20,7 @@ class AddrmapGenerator extends RdlBaseGenerator {
     
     override generateHeader(String namespace) {'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
@@ -39,8 +39,6 @@ class AddrmapGenerator extends RdlBaseGenerator {
                 «ENDFOR»
             «ENDFOR»
         }};
-        
-        #endif /* _«componentDefinition.effectiveName.toUpperCase»_MAP_H_ */
     '''
     }
 	    
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwAddrmapGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwAddrmapGenerator.xtend
index 8d8d41d..67963dc 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwAddrmapGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwAddrmapGenerator.xtend
@@ -22,7 +22,7 @@ class FwAddrmapGenerator extends RdlBaseGenerator {
     
     override generateHeader(String namespace) {'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwRegfileGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwRegfileGenerator.xtend
index 71ad3f9..dcc1b76 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwRegfileGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/FwRegfileGenerator.xtend
@@ -23,7 +23,7 @@ class FwRegfileGenerator extends RdlBaseGenerator{
     
     override String generateHeader(String namespace)'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
@@ -91,9 +91,7 @@ class FwRegfileGenerator extends RdlBaseGenerator{
                 «ENDFOR»
             «ENDFOR»
         };
-        
-        #endif // _«componentDefinition.name.toUpperCase»_H_
-        '''
+    '''
         
     override generateSource(String namespace) {
         ''
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/ModuleGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/ModuleGenerator.xtend
index bbde586..c820a8f 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/ModuleGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/ModuleGenerator.xtend
@@ -30,7 +30,7 @@ class ModuleGenerator extends RdlBaseGenerator {
 //        if(addrMaps.size==0) return ''
         '''
             /*
-             * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+             * Copyright (c) 2023 MINRES Technologies GmbH
              *
              * SPDX-License-Identifier: Apache-2.0
              */
@@ -63,8 +63,6 @@ class ModuleGenerator extends RdlBaseGenerator {
             «FOR ns : namespace.split('::').reverse»
             } // namespace «ns»
             «ENDFOR»
-            
-            #endif /* _«namespace.toUpperCase»_«componentDefinition.effectiveName.toUpperCase»_H_ */
         '''
     }
 	    
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
index 1b2c0d4..6eb9ff4 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RegfileGenerator.xtend
@@ -23,7 +23,7 @@ class RegfileGenerator extends RdlBaseGenerator{
     
     override String generateHeader(String namespace)'''
         /*
-         * Copyright (c) 2019 -2022 MINRES Technologies GmbH
+         * Copyright (c) 2023 MINRES Technologies GmbH
          *
          * SPDX-License-Identifier: Apache-2.0
          *
@@ -162,7 +162,6 @@ class RegfileGenerator extends RdlBaseGenerator{
                 «ENDFOR»
             «ENDFOR»
         }
-        
         '''
     
     override generateSource(String namespace) {