From f950322d05afd41d6f90c68623d23f297059ea3e Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Tue, 3 Oct 2017 15:52:48 +0200
Subject: [PATCH] Fixed build problem and adapted visibility in generated code

---
 com.minres.rdl.parent/com.minres.rdl.ui/build.properties      | 3 ++-
 .../src/com/minres/rdl/generator/RegfileGenerator.xtend       | 3 +--
 .../xtend-gen/com/minres/rdl/generator/RegfileGenerator.java  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/build.properties b/com.minres.rdl.parent/com.minres.rdl.ui/build.properties
index 323f56c..f931a87 100644
--- a/com.minres.rdl.parent/com.minres.rdl.ui/build.properties
+++ b/com.minres.rdl.parent/com.minres.rdl.ui/build.properties
@@ -3,5 +3,6 @@ source.. = src/,\
            xtend-gen/
 bin.includes = .,\
                META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               icons/
 bin.excludes = **/*.xtend
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 6765d27..b0994b9 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
@@ -66,7 +66,7 @@ class RegfileGenerator extends RdlBaseGenerator{
                 public sc_core::sc_module,
                 public sysc::resetable
         {
-        protected:
+        public:
             // storage declarations
             «FOR cdef : componentDefinition.componentDefinitions»
                 «IF cdef.type == ComponentDefinitionType.REG»
@@ -119,7 +119,6 @@ class RegfileGenerator extends RdlBaseGenerator{
                 «ENDFOR»
             «ENDFOR»
             
-        public:
             «componentDefinition.name»(sc_core::sc_module_name nm);
         
             template<unsigned BUSWIDTH=32>
diff --git a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RegfileGenerator.java b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RegfileGenerator.java
index cb46619..583e250 100644
--- a/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RegfileGenerator.java
+++ b/com.minres.rdl.parent/com.minres.rdl/xtend-gen/com/minres/rdl/generator/RegfileGenerator.java
@@ -138,7 +138,7 @@ public class RegfileGenerator extends RdlBaseGenerator {
     _builder.newLine();
     _builder.append("{");
     _builder.newLine();
-    _builder.append("protected:");
+    _builder.append("public:");
     _builder.newLine();
     _builder.append("    ");
     _builder.append("// storage declarations");
@@ -384,8 +384,6 @@ public class RegfileGenerator extends RdlBaseGenerator {
     }
     _builder.append("    ");
     _builder.newLine();
-    _builder.append("public:");
-    _builder.newLine();
     _builder.append("    ");
     String _name_8 = this.componentDefinition.getName();
     _builder.append(_name_8, "    ");