X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=4fbc1b9c600d13a257444a14ff6c924cc436b033;hb=772bad94baf392492f6b5298fa9305d2719c4379;hp=fe346e8f12f41d8a19cb30ce736115efaa157c34;hpb=0766963bc9873ffcecd9b1f4440926d04e224142;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index fe346e8f..4fbc1b9c 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -51,6 +51,15 @@ def createBertosProject(project_info):
     prjdir = directory + "/" + os.path.basename(directory)
     shutil.rmtree(prjdir, True)
     os.mkdir(prjdir)
+    # Destination hw files
+    hwdir = prjdir + "/hw"
+    shutil.rmtree(hwdir, True)
+    os.mkdir(hwdir)
+    # Copy all the hw files
+    for module, information in project_info.info("MODULES").items():
+        for hwfile in information["hw"]:
+            string = open(sources_dir + "/" + hwfile, "r").read()
+            open(hwdir + "/" + os.path.basename(hwfile), "w").write(string)
     # Destination configurations files
     cfgdir = prjdir + "/cfg"
     shutil.rmtree(cfgdir, True)
@@ -147,19 +156,23 @@ def csrcGenerator(project_info):
         dependency_files = set([])
         # assembly sources
         asm_files = set([])
+        hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" 
         if information["enabled"]:
             if "constants" in information:
                 constants.update(information["constants"])
             cfiles, sfiles = findModuleFiles(module, project_info)
             module_files |= set(cfiles)
             asm_files |= set(sfiles)
+            for file in information["hw"]:
+                if file.endswith(".c"):
+                    module_files |= set([hwdir + "/" + os.path.basename(file)])
             for file_dependency in information["depends"]:
                 if file_dependency in files:
                     dependencyCFiles, dependencySFiles = findModuleFiles(file_dependency, project_info)
                     dependency_files |= set(dependencyCFiles)
                     asm_files |= set(dependencySFiles)
             for file in module_files:
-                if not harvard or "harvard" not in information or information["harvard"] == "both":
+                if not harvard or information.get("harvard", "both") == "both":
                     csrc.append(file)
                 if harvard and "harvard" in information:
                     pcsrc.append(file)
@@ -288,6 +301,16 @@ def loadCpuInfos(project):
         cpuInfos.append(getInfos(definition))
     return cpuInfos
 
+def getTagSet(cpu_info):
+    tag_set = set([])
+    for cpu in cpu_info:
+        tag_set |= set([cpu["CPU_NAME"]])
+        tag_set |= set(cpu["CPU_TAGS"])
+        tag_set |= set([cpu["CORE_CPU"]])
+        tag_set |= set([cpu["TOOLCHAIN"]])
+    return tag_set
+        
+
 def getInfos(definition):
     D = {}
     D.update(const.CPU_DEF)
@@ -324,10 +347,11 @@ def loadModuleDefinition(first_comment):
         del module_definition[const.MODULE_DEFINITION["module_name"]]
         module_dict[module_name] = {}
         if const.MODULE_DEFINITION["module_depends"] in module_definition.keys():
-            if type(module_definition[const.MODULE_DEFINITION["module_depends"]]) == str:
-                module_definition[const.MODULE_DEFINITION["module_depends"]] = (module_definition[const.MODULE_DEFINITION["module_depends"]],)
-            module_dict[module_name]["depends"] = module_definition[const.MODULE_DEFINITION["module_depends"]]
+            depends = module_definition[const.MODULE_DEFINITION["module_depends"]]
             del module_definition[const.MODULE_DEFINITION["module_depends"]]
+            if type(depends) == str:
+                depends = (depends,)
+            module_dict[module_name]["depends"] = depends
         else:
             module_dict[module_name]["depends"] = ()
         if const.MODULE_DEFINITION["module_configuration"] in module_definition.keys():
@@ -343,10 +367,40 @@ def loadModuleDefinition(first_comment):
             if harvard == "both" or harvard == "pgm_memory":
                 module_dict[module_name]["harvard"] = harvard
             del module_definition[const.MODULE_DEFINITION["module_harvard"]]
+        if const.MODULE_DEFINITION["module_hw"] in module_definition.keys():
+            hw = module_definition[const.MODULE_DEFINITION["module_hw"]]
+            del module_definition[const.MODULE_DEFINITION["module_hw"]]
+            if type(hw) == str:
+                hw = (hw, )
+            module_dict[module_name]["hw"] = hw
+        else:
+            module_dict[module_name]["hw"] = ()
+        if const.MODULE_DEFINITION["module_supports"] in module_definition.keys():
+            supports = module_definition[const.MODULE_DEFINITION["module_supports"]]
+            del module_definition[const.MODULE_DEFINITION["module_supports"]]
+            module_dict[module_name]["supports"] = supports
         module_dict[module_name]["constants"] = module_definition
         module_dict[module_name]["enabled"] = False
     return to_be_parsed, module_dict
 
+def isSupported(module, project):
+    tag_dict = project.info("ALL_CPU_TAGS")
+    module = project.info("MODULES")[module]
+    if "supports" in module:
+        support_string = module["supports"]
+        for tag, value in tag_dict.items():
+            while support_string.find(tag) != -1:
+                support_string = support_string.replace(tag, value)
+        supported = {}
+        try:
+            exec "supported = " + support_string in {}, supported
+        except:
+            raise SupportedException(support_string)
+        return supported["supported"]
+    else:
+        return True
+            
+
 def loadDefineLists(comment_list):
     define_list = {}
     for comment in comment_list:
@@ -558,3 +612,8 @@ class ParseError(Exception):
         Exception.__init__(self)
         self.line_number = line_number
         self.line = line
+
+class SupportedException(Exception):
+    def __init__(self, support_string):
+        Exception.__init__(self)
+        self.support_string = support_string
\ No newline at end of file