[stm32] Move peripheral enumeration to :cmsis:device

Author: salkinium

ext/st/module.lb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2016, Fabian Greif
-# Copyright (c) 2017, Niklas Hauser
+# Copyright (c) 2017, 2024, Niklas Hauser
 #
 # This file is part of the modm project.
 #
@@ -101,6 +101,7 @@ def common_rcc_map(env):
     bprops["peripherals"] = peripherals
     return rcc_map
 
+
 def common_header_file(env):
     """
     Gives information about the STM32 header files. For example the STM32F469:
@@ -145,6 +146,45 @@ def common_header_file(env):
     bprops["folder"] = folder
     return headers
 
+
+def common_peripherals(env):
+    """
+    All peripherals translated to the modm naming convention.
+
+    :returns: a sorted list of all peripheral names.
+    """
+    def get_driver(s):
+        name = None
+        if "driver" in s: name = translate(s["driver"])
+        if "instance" in s: name += translate(s["instance"])
+        return name
+
+    def translate(s):
+        return s.replace("_", "").capitalize()
+
+    device = env[":target"]
+    gpio_driver = device.get_driver("gpio")
+    # Get all the peripherals from the GPIO remap-able signals
+    all_peripherals = {get_driver(remap) for remap in gpio_driver.get("remap", [])}
+    # Get all the peripherals from the normal GPIO signals
+    all_peripherals.update(get_driver(s) for gpio in gpio_driver["gpio"] for s in gpio.get("signal", []))
+    # Get all peripherals from the driver instances
+    all_drivers = (d for d in device._properties["driver"] if d["name"] not in ["gpio", "core"])
+    for d in all_drivers:
+        dname = translate(d["name"])
+        if "instance" in d:
+            all_peripherals.update(dname + translate(i) for i in d["instance"])
+        else:
+            all_peripherals.add(dname)
+        if dname == "Dma" and d["type"] == "stm32-mux":
+            all_peripherals.add("Dmamux1")
+
+    all_peripherals.discard(None)
+    all_peripherals = sorted(list(all_peripherals))
+    bprops["all_peripherals"] = all_peripherals
+    return all_peripherals
+
+
 # -----------------------------------------------------------------------------
 def init(module):
     module.name = ":cmsis:device"
@@ -157,6 +197,8 @@ def prepare(module, options):
 
     module.add_query(
         EnvironmentQuery(name="rcc-map", factory=common_rcc_map))
+    module.add_query(
+        EnvironmentQuery(name="peripherals", factory=common_peripherals))
     module.add_query(
         EnvironmentQuery(name="headers", factory=common_header_file))
 
@@ -165,6 +207,7 @@ def prepare(module, options):
 
 def validate(env):
     env.query("rcc-map")
+    env.query("peripherals")
 
 def build(env):
     env.collect(":build:path.include", "modm/ext")
@@ -184,3 +227,6 @@ def build(env):
     })
     env.outbasepath = "modm/src/modm/platform"
     env.template("device.hpp.in")
+
+    env.outbasepath = "modm/src/modm/platform/core"
+    env.template("peripherals.hpp.in")

src/modm/platform/gpio/stm32/peripherals.hpp.in renamed to ext/st/peripherals.hpp.in

@@ -128,19 +128,7 @@ def build(env):
     env.template("rcc.cpp.in")
     env.template("rcc.hpp.in")
 
-    all_peripherals = set()
-    all_drivers = [d for d in device._properties["driver"] if d["name"] not in ["gpio", "core"]]
-    translate = lambda s: s.replace("_", "").capitalize()
-    for d in all_drivers:
-        dname = translate(d["name"])
-        if "instance" in d:
-            all_peripherals.update(dname + translate(i) for i in d["instance"])
-        else:
-            all_peripherals.add(dname)
-        if dname == "Dma" and d["type"] == "stm32-mux":
-            all_peripherals.add("Dmamux1")
-
-    all_peripherals = sorted(list(all_peripherals))
+    all_peripherals = env.query(":cmsis:device:peripherals")
     rcc_map = env.query(":cmsis:device:rcc-map")
     rcc_enable = {}
     rcc_reset = {}

src/modm/platform/clock/stm32/module.lb

@@ -30,7 +30,7 @@ def translate(s):
     return s.replace("_", "").capitalize()
 
 def get_driver(s):
-    name = "None"
+    name = None
     if "driver" in s: name = translate(s["driver"]);
     if "instance" in s: name += translate(s["instance"]);
     return name
@@ -42,6 +42,7 @@ def extract_signals(signals):
     afs = {}
     for s in signals:
         driver = get_driver(s)
+        if driver is None: continue
         name = get_name(s)
         key = driver + name
         afs[key] = {"driver": driver, "name": name, "af": s["af"]}
@@ -238,22 +239,6 @@ def validate(env):
                 "remap_value": remapped_gpios[key]
             })
 
-    all_peripherals = [s["driver"] for s in all_signals.values()]
-    # Signals are not enough, since there are peripherals that don't have signals.
-    # Example: STM32F401RE < 64pins: SPI4 cannot be connected to any pins.
-    # FIXME: Allow accessing device file more freely
-    all_drivers = [d for d in device._properties["driver"] if d["name"] not in ["gpio", "core"]]
-    for d in all_drivers:
-        dname = translate(d["name"])
-        if "instance" in d:
-            all_peripherals.extend([dname + translate(i) for i in d["instance"]])
-        else:
-            all_peripherals.append(dname)
-        if dname == "Dma" and d["type"] == "stm32-mux":
-            all_peripherals.append("Dmamux1")
-    if "remap" in driver:
-        all_peripherals.extend([get_driver(r) for r in driver["remap"]])
-    bprops["all_peripherals"] = sorted(list(set(all_peripherals)))
     bprops["all_signals"] = sorted(list(set(s["name"] for s in all_signals.values())))
     bprops["gpios"] = [bprops[g["port"] + g["pin"]] for g in driver["gpio"]]
     bprops["port_width"] = 16
@@ -285,7 +270,3 @@ def build(env):
     env.template("../common/connector.hpp.in", "connector.hpp",
                  filters={"formatPeripheral": get_driver,
                           "printSignalMap": print_remap_group_table})
-
-    # FIXME: Move to modm:platform:core!
-    env.outbasepath = "modm/src/modm/platform/core"
-    env.template("peripherals.hpp.in")