Fix native_sim by adding 1:1 pin mapping

Author: tannewt

ports/zephyr-cp/boards/native/native_sim/board.conf

@@ -1,6 +1,10 @@
 # No Bluetooth hardware on native_sim
 CONFIG_BT=n
 
+# native_sim has no physical package: use the identity package pin map so
+# pin objects (LED, P_00..P_31) resolve to their GPIO controller.
+CONFIG_IOBROKER_PACKAGE_ONE_TO_ONE=y
+
 CONFIG_EMUL=y
 CONFIG_GPIO=y
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=n

ports/zephyr-cp/boards/native/native_sim_asan/board.conf

@@ -4,6 +4,10 @@ CONFIG_ASAN=y
 # No Bluetooth hardware on native_sim
 CONFIG_BT=n
 
+# native_sim has no physical package: use the identity package pin map so
+# pin objects (LED, P_00..P_31) resolve to their GPIO controller.
+CONFIG_IOBROKER_PACKAGE_ONE_TO_ONE=y
+
 CONFIG_EMUL=y
 CONFIG_GPIO=y
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=n

ports/zephyr-cp/cptools/zephyr2cp.py

@@ -956,9 +956,9 @@ def zephyr_dts_to_cp_board(board_id, portdir, builddir, zephyrbuilddir, mpconfig
         port_indexes[label] = int(match.group(1)) if match else len(port_indexes)
     # Package pin map selected through the IOBROKER_PACKAGE choice: map each
     # SoC pad to the package pin it is bonded to so that the pin objects can
-    # hand package pins straight to the iobroker module. When no package
-    # applies to the SoC (IOBROKER_PACKAGE_NONE) there is no map, so the pin
-    # objects get IOBROKER_NO_PIN instead.
+    # hand package pins straight to the iobroker module. The 1:1 choice is an
+    # identity map (package pin number == global pin number); IOBROKER_PACKAGE_NONE
+    # has no map, so the pin objects get IOBROKER_NO_PIN instead.
     package_pin_of_pad = {}
     package_pins = None
     package_choice = None
@@ -968,8 +968,16 @@ def zephyr_dts_to_cp_board(board_id, portdir, builddir, zephyrbuilddir, mpconfig
             if not stripped.startswith("CONFIG_IOBROKER_PACKAGE_") or not stripped.endswith("=y"):
                 continue
             package_choice = stripped[len("CONFIG_IOBROKER_PACKAGE_") : -len("=y")].lower()
-            if package_choice == "none":
-                continue
+            break
+        if package_choice == "one_to_one":
+            # Identity map over the enabled GPIO controllers.
+            package_pins = []
+            for ioport in sorted(ioports.keys()):
+                for num in ioports[ioport]:
+                    global_number = port_indexes[ioport] * 32 + num
+                    package_pins.append({"pin": global_number, "pad": global_number})
+                    package_pin_of_pad[global_number] = global_number
+        elif package_choice not in (None, "none"):
             package_toml = (
                 pathlib.Path(__file__).resolve().parent.parent
                 / "modules"
@@ -983,7 +991,6 @@ def zephyr_dts_to_cp_board(board_id, portdir, builddir, zephyrbuilddir, mpconfig
             for package_pin_entry in package_pins:
                 if "pad" in package_pin_entry:
                     package_pin_of_pad[package_pin_entry["pad"]] = package_pin_entry["pin"]
-            break
     # Board pin names from circuitpython.toml: ``[pins]`` maps a board module
     # name to a package pin number or ball id, resolved to a SoC pad with the
     # package pin map above. This is independent of Zephyr's devicetree

ports/zephyr-cp/modules/iobroker/Kconfig

@@ -18,8 +18,18 @@ choice IOBROKER_PACKAGE
 	help
 	  The module resolves requested package pins to SoC pads through the
 	  package pin map selected here. Reference maps shipped with the module
-	  live in packages/; when none applies to the SoC, the NONE option keeps
-	  the map empty and every package pin lookup fails with -EINVAL.
+	  live in packages/; the ONE_TO_ONE option is an identity map for boards
+	  without a transcribed physical package, and NONE keeps the map empty so
+	  every package pin lookup fails with -EINVAL.
+
+config IOBROKER_PACKAGE_ONE_TO_ONE
+	bool "1:1 (package pin number is the global pin number)"
+	help
+	  Identity package pin map: package pin N maps to SoC pad N, where the
+	  SoC pad is the global pin numbering (gpio port index * 32 + pin within
+	  the port). Boards without a transcribed physical package, such as the
+	  native simulator, use this so that pin objects can hand the iobroker
+	  module a package pin that resolves to their pad.
 
 config IOBROKER_PACKAGE_NONE
 	bool "None (package pin lookups fail)"

ports/zephyr-cp/modules/iobroker/Kconfig.packages

@@ -8,8 +8,8 @@
 # Choice defaults live here too, most-specific first: the development kits'
 # packages preselect the reference map for their SoC; boards with more than
 # one matching package (e.g. nRF52840 modules) set their choice explicitly in
-# board.conf; everything else falls back to NONE so package pin lookups fail
-# cleanly.
+# board.conf; SoCs with no reference map fall back to the 1:1 identity map
+# (package pin number == global pin number), which lets their pins resolve.
 
 config IOBROKER_PACKAGE_NRF54L15_QFN48
 	bool "nRF54L15/10/05 QFN48 (QFAA)"
@@ -67,5 +67,5 @@ choice IOBROKER_PACKAGE
 	default IOBROKER_PACKAGE_NRF5340_QKAA if SOC_NRF5340_CPUAPP_QKAA
 	default IOBROKER_PACKAGE_NRF52840_AQFN73 if SOC_NRF52840_QIAA
 	default IOBROKER_PACKAGE_RP2040_QFN56 if SOC_RP2040
-	default IOBROKER_PACKAGE_NONE
+	default IOBROKER_PACKAGE_ONE_TO_ONE
 endchoice

ports/zephyr-cp/modules/iobroker/README.md

@@ -59,10 +59,14 @@ const uint16_t iobroker_reserved_pads[];   // + _pin_count
 The package pin map is selected from the module's reference maps:
 `Kconfig.packages` offers one option per transcribed package
 (`packages/*.toml`), each visible only for the SoCs it applies to and
-preselected for the development kits. When no map applies to a SoC the
-`IOBROKER_PACKAGE_NONE` choice is used and an empty map is generated, so
+preselected for the development kits. SoCs with no reference map fall back to
+`IOBROKER_PACKAGE_ONE_TO_ONE`, an identity map where the package pin number
+is the global pin number (gpio port index * 32 + pin within the port), so
+boards without a transcribed physical package can still resolve their pins.
+`IOBROKER_PACKAGE_NONE` is also available and generates an empty map, making
 package pin lookups fail with `-EINVAL`. The selected TOML (or the empty
-map) is rendered into a build-directory translation unit at build time.
+map) is rendered into a build-directory translation unit at build time. The
+identity map needs no rendered table: the core applies it directly.
 New maps are transcribed from a SoC datasheet with `tools/gen_package.py`
 (see the script's docstring; the datasheets live in `datasheets/`).
 

ports/zephyr-cp/modules/iobroker/src/iobroker.c

@@ -39,27 +39,39 @@ int iobroker_gpio_split(uint16_t number, const struct device **port_out,
 int iobroker_gpio_package_pin(uint8_t port, gpio_pin_t pin,
     package_pin_t *package_pin_out) {
     uint16_t soc_pad = (uint16_t)((uint32_t)port * 32U + pin);
+    #if defined(CONFIG_IOBROKER_PACKAGE_ONE_TO_ONE)
+    // Identity map: the package pin is the global pin number.
+    *package_pin_out = soc_pad;
+    return 0;
+    #else
     for (size_t i = 0; i < iobroker_package_pin_count; i++) {
         if (iobroker_package_pins[i].soc_pad == soc_pad) {
             *package_pin_out = iobroker_package_pins[i].package_pin;
             return 0;
         }
     }
     return -EINVAL;
+    #endif
 }
 
 int iobroker_package_pin_soc_pad(package_pin_t pin, uint16_t *soc_pad_out) {
     if (pin == IOBROKER_NO_PIN) {
         *soc_pad_out = IOBROKER_NO_PIN;
         return 0;
     }
+    #if defined(CONFIG_IOBROKER_PACKAGE_ONE_TO_ONE)
+    // Identity map: the package pin is the global pin number.
+    *soc_pad_out = pin;
+    return 0;
+    #else
     for (size_t i = 0; i < iobroker_package_pin_count; i++) {
         if (iobroker_package_pins[i].package_pin == pin) {
             *soc_pad_out = iobroker_package_pins[i].soc_pad;
             return 0;
         }
     }
     return -EINVAL;
+    #endif
 }
 
 #if !IOBROKER_ROUTING