oep-client-python 0.0.7__tar.gz → 0.0.8__tar.gz

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.0.8
+- (EN) Wires whose pins the host chooses (oep-if-debug §1, role_channels): the fake takes any allowed free pair, skips the pairs whose pins something holds in a count-0 scan, holds a live connection's pins against plans, and has a profile for it (`rp2350-pins`). `Wire.scan()` goes through the whole list (at most 255 pairs a request; count 0 continues with the new skip TLV until tried = 0).
+- (JA) host がピンを選ぶ wire（oep-if-debug §1、role_channels）: 偽の probe は、許された空いている組ならどれでも受け、count = 0 の scan では何かが持っているピンの組を飛ばし、生きている接続のピンを plan から守る。そのための profile（`rp2350-pins`）を足した。`Wire.scan()` は並びを最後まで回る（1 回 255 組まで。count = 0 は新しい skip の TLV で tried = 0 まで続ける）。
+
 ## 0.0.7
 - (EN) `oep dump` names the wires' reset role (role 3) and no longer lists riscv-dm's clobbers (gone: the probe puts the registers back itself, oep-if-debug §4.5).
 - (JA) `oep dump` は wire の reset の役（role 3）を名前で出し、riscv-dm の clobbers を出さなくなった（無くなった: probe が自分でレジスタを戻す、oep-if-debug §4.5）。

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.7
+Version: 0.0.8
 Summary: Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe
 Project-URL: Homepage, https://github.com/Open-Embedded-Probe/oep-client-python
 Project-URL: Repository, https://github.com/Open-Embedded-Probe/oep-client-python

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.7"
+version = "0.0.8"
 description = "Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe"
 readme = "README.md"
 license = "MIT"

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.7"
+__version__ = "0.0.8"

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/src/oep_client/endpoint.py

@@ -254,15 +254,26 @@ class Endpoint:
         self.pairs: dict[int, list[tuple[int, int]]] = {}  # wire fn -> allowed (swdio, swclk), declared order
         self.max_connections: dict[int, int] = {}
         self.reset_channels: dict[int, set[int]] = {}     # wire fn -> channels attach_under_reset may take (role 3)
+        self.pin_roles: dict[int, dict[int, set[int]]] = {}   # wire fn -> role -> candidates (role_channels wires)
         for fn, name in self.names.items():
             if name in WIRES:
                 self.pairs[fn] = [self._group_pair(name, t) for t in self.static[fn] if t[0] == catalog.CHANNEL_GROUP]
+                roles: dict[int, set[int]] = {}
+                for t in self.static[fn]:
+                    if t[0] == catalog.ROLE_CHANNELS and t[2] in (1, 2):
+                        roles.setdefault(t[2], set()).update(
+                            catalog.bitmap_to_channels(struct.unpack_from("<H", t, 3)[0], t[5:2 + t[1]]))
+                if roles:
+                    self.pin_roles[fn] = roles
                 self.reset_channels[fn] = {
                     c for t in self.static[fn] if t[0] == catalog.ROLE_CHANNELS and t[2] == PIN_ROLE_RESET
                     for c in catalog.bitmap_to_channels(struct.unpack_from("<H", t, 3)[0], t[5:2 + t[1]])}
                 self.max_connections[fn] = next((t[2] for t in self.static[fn] if t[0] == fake.MAX_CONNECTIONS), 1)
         self.targets: dict[tuple[int, tuple[int, int]], FakeTarget] = {
             (fn, p): FakeTarget() for fn in sorted(self.pairs) for p in self.pairs[fn]}
+        for fn in sorted(self.pin_roles):                          # any pair: one target, on the first pair
+            first = self._role_pairs(fn)[0]
+            self.targets[(fn, first)] = FakeTarget()
         self.target = next(iter(self.targets.values()), FakeTarget())
         self.mechanisms = set()
         for fn, name in self.names.items():
@@ -329,6 +340,38 @@ class Endpoint:
     def target_id(self, value: int | None) -> None:
         self.target.target_id = value
 
+    def _role_pairs(self, fn: int) -> list[tuple[int, int]]:
+        """A role_channels wire's pairs in the count = 0 order (oep-if-debug §1): swdio ascending, then swclk."""
+        roles = self.pin_roles[fn]
+        if self.names[fn] == "oep.wire.swio":
+            return [(d, 0xFFFF) for d in sorted(roles.get(1, ()))]
+        return [(d, c) for d in sorted(roles.get(1, ())) for c in sorted(roles.get(2, ())) if d != c]
+
+    def _allowed_pairs(self, fn: int) -> list[tuple[int, int]]:
+        return self._role_pairs(fn) if fn in self.pin_roles else self.pairs.get(fn, [])
+
+    def _allows(self, fn: int, pair: tuple[int, int]) -> bool:
+        if fn in self.pin_roles:
+            roles = self.pin_roles[fn]
+            swio = self.names[fn] == "oep.wire.swio"
+            return pair[0] in roles.get(1, ()) and (pair[1] == 0xFFFF if swio else
+                                                    pair[1] in roles.get(2, ()) and pair[1] != pair[0])
+        return pair in self.pairs.get(fn, [])
+
+    def _held(self, fn: int | None = None, pair: tuple[int, int] | None = None) -> set[int]:
+        """Channels something holds (core §8.1): the plan, the slots' pairs, the live connections' pairs - except
+        wire `fn`'s own connection on `pair` (attaching there again, or scanning through it)."""
+        held = {a[2] for a in self.plan}
+        held |= {p for s in self.slots.values() for p in s.pair if p != 0xFFFF and not (s.wire_fn == fn and s.pair == pair)}
+        held |= {p for c in self.conns.values() for p in c.pair if p != 0xFFFF and not (c.fn == fn and c.pair == pair)}
+        return held
+
+    def _target(self, fn: int, pair: tuple[int, int]) -> FakeTarget:
+        tg = self.targets.get((fn, pair))
+        if tg is None:                                             # a pair nothing is wired to
+            tg = self.targets[(fn, pair)] = FakeTarget(present=False)
+        return tg
+
     @staticmethod
     def _group_pair(name: str, t: bytes) -> tuple[int, int]:
         roles = {t[3 + 3 * i]: struct.unpack_from("<H", t, 4 + 3 * i)[0] for i in range((t[1] - 1) // 3)}
@@ -603,6 +646,7 @@ class Endpoint:
         named = {fn for fn, _, _ in got}
         kept = {a for a in self.plan if a[0] not in named}
         slot_pins = {p for s in self.slots.values() for p in s.pair if p != 0xFFFF}
+        slot_pins |= {p for c in self.conns.values() for p in c.pair if p != 0xFFFF}   # a live connection's pins too
         for fn, role, ch in got:
             roles = {"oep.fixture.gpio": {1}, "oep.fixture.uart": {1, 2}}.get(self.names.get(fn, ""), set())
             if role not in roles or any(k[2] == ch for k in kept) or ch in slot_pins:
@@ -646,17 +690,24 @@ class Endpoint:
 
     # ---- oep.wire.rvswd / swio ------------------------------------------------------------------
     def _wire(self, fn: int, op: int, t: Take) -> tuple[int, int, bytes]:
-        allowed = self.pairs.get(fn, [])
         if op == 0x01:                                             # scan: count(u8) pairs -> tried count found...
             count = t.take("B")
             pairs = [t.take("HH") for _ in range(count)]
-            t.tail()
-            if any(p not in allowed for p in pairs):
-                raise Reject(m.UNAVAILABLE)
-            pairs = pairs or allowed
+            got, _ = t.tail({0x01})
+            if 0x01 in got and (count or len(got[0x01]) != 2):
+                raise Reject(m.MALFORMED)                          # skip goes with count 0 only
+            live = [c.pair for c in self.conns.values() if c.fn == fn]
+            full = len(live) >= self.max_connections.get(fn, 1)   # every seat taken: the live pairs only
+            if any(not self._allows(fn, p) or set(p) & self._held(fn, p) or (full and p not in live) for p in pairs):
+                raise Reject(m.UNAVAILABLE)                        # not allowed, held (§8.1), or no seat to try it on
+            if not pairs:                                          # the count-0 list, from `skip` on (oep-if-debug §1)
+                skip = struct.unpack("<H", got[0x01])[0] if 0x01 in got else 0
+                pairs = [p for p in self._allowed_pairs(fn)
+                         if not set(p) & self._held(fn, p) and (not full or p in live)][skip:]
+            pairs = pairs[:255]                                    # tried is a u8
             found = []
             for p in pairs:
-                tg = self.targets[(fn, p)]
+                tg = self._target(fn, p)
                 if tg.present:                                     # a live connection's pair: read over it, no restart
                     found.append(struct.pack("<BHHI", 1, *p, tg.dmstatus()))
             return m.COMPLETED, m.SUCCESS, struct.pack("<BB", len(pairs), len(found)) + b"".join(found)
@@ -675,7 +726,7 @@ class Endpoint:
                 raise Reject(m.MALFORMED)
             idle_clock = got[0x04][0] if 0x04 in got else 0
             pair = self._pick_pair(fn, got)
-            tg = self.targets[(fn, pair)]
+            tg = self._target(fn, pair)
             speed = min(4_000_000, struct.unpack("<I", got[0x01])[0]) if 0x01 in got else 4_000_000
             cid = self._conn_at(fn, pair)
             flags = 0
@@ -729,14 +780,14 @@ class Endpoint:
         return m.REJECTED, m.UNKNOWN_OPERATION, b""
 
     def _pick_pair(self, fn: int, got: dict[int, bytes]) -> tuple[int, int]:
-        allowed = self.pairs.get(fn, [])
         if 0x03 in got:
             if len(got[0x03]) != 4:
                 raise Reject(m.MALFORMED)
             pair = struct.unpack("<HH", got[0x03])
-            if pair not in allowed:
-                raise Reject(m.UNAVAILABLE)                        # a pair this probe does not allow
+            if not self._allows(fn, pair) or set(pair) & self._held(fn, pair):
+                raise Reject(m.UNAVAILABLE)                        # not allowed here, or its pins are held (§8.1)
             return pair
+        allowed = self._allowed_pairs(fn)
         if len(allowed) != 1:
             raise Reject(m.UNAVAILABLE)                            # the host chooses among several
         return allowed[0]
@@ -779,7 +830,7 @@ class Endpoint:
 
     def _target_of(self, cid: int) -> FakeTarget:
         c = self.conns[cid]
-        return self.targets[(c.fn, c.pair)]
+        return self._target(c.fn, c.pair)
 
     # ---- oep.target.riscv-dm --------------------------------------------------------------------
     @staticmethod
@@ -1181,7 +1232,7 @@ class Endpoint:
         places = [(s.wire_fn, s.pair) for s in slots.values()]
         if len(set(places)) != len(places):
             raise Reject(m.UNAVAILABLE)
-        for fn in self.pairs:
+        for fn in self.pairs:                                      # every wire (pin_roles wires have an empty list)
             if sum(1 for s in slots.values() if s.wire_fn == fn and s.attach == SLOT_ATTACH["at_boot"]) > \
                     self.max_connections.get(fn, 1):
                 raise Reject(m.UNAVAILABLE)
@@ -1244,7 +1295,7 @@ class Endpoint:
             raise Reject(m.MALFORMED)
         if not SLOT_NAME.fullmatch(name.decode("ascii", "replace")):
             raise Reject(m.MALFORMED)
-        if self.names.get(wire_fn) not in WIRES or (swdio, swclk) not in self.pairs.get(wire_fn, []):
+        if self.names.get(wire_fn) not in WIRES or not self._allows(wire_fn, (swdio, swclk)):
             raise Reject(m.UNAVAILABLE)
         if mech not in self.mechanisms:
             raise Reject(m.UNSUPPORTED)
@@ -1301,7 +1352,7 @@ class Endpoint:
         s = self.slots[n]
         rt = self.slot_rt[n]
         rt.last_try_ms = self.now()
-        tg = self.targets[(s.wire_fn, s.pair)]
+        tg = self._target(s.wire_fn, s.pair)
         cid = self._conn_at(s.wire_fn, s.pair)
         if cid is None:
             if not tg.present:

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/src/oep_client/fake.py

@@ -139,7 +139,8 @@ def _core(firmware: str, model: str, unit_id: bytes, channels: int, reserved: li
     return Offered(0, 0, "oep.core", (
         catalog.text(CORE_FIRMWARE, firmware), catalog.text(CORE_MODEL, model), catalog.tlv(CORE_UNIT_ID, unit_id),
         catalog.u16(CORE_CHANNELS, channels), catalog.tlv(CORE_RESERVED, struct.pack("<H", base) + bits),
-        catalog.text(CORE_PROFILE, profile)) + tuple(_label(c, n) for c, n in labels.items()) + extra)
+        ) + ((catalog.text(CORE_PROFILE, profile),) if profile else ()) + tuple(_label(c, n) for c, n in labels.items())
+        + extra)
 
 
 def p4_x035() -> FakeProbe:
@@ -230,4 +231,24 @@ def p4_bench() -> FakeProbe:
     ])
 
 
-PROFILES = {"p4-x035": p4_x035, "esp32-v003": esp32_v003, "p4-bench": p4_bench}
+def rp2350_pins() -> FakeProbe:
+    """A board firmware whose wire takes its pins from the host (oep-if-debug §1, role_channels): any two of GP0-GP29
+    but GP19 (the Pro Micro RP2350's PSRAM CS) are an RVSWD pair, a reset line or fixture pins. USB CDC (serial port 0).
+    The fake target answers on (0, 1), the first pair."""
+    reserved = [19]
+    pins = [p for p in range(30) if p not in reserved]
+    return FakeProbe("rp2350-pins", 1024, [
+        _core("3.0.0", "sparkfun-promicro-rp2350", bytes.fromhex("e66138935f2b1f2c"), 30, reserved, "",
+              {}, _transports([(TRANSPORT["usb_cdc"], 0)])),
+        Offered(1, 1, "oep.wire.rvswd", _roles({1: pins, 2: pins, 3: pins}) + (
+            catalog.u32(MAX_CLOCK_HZ, 5_000_000), catalog.u8(IMPLEMENTATION, 1), catalog.u8(MAX_CONNECTIONS, 1))),
+        Offered(2, 1, "oep.target.riscv-dm", (catalog.u32(FEATURES, 0b1111), catalog.u8(IMPLEMENTATION, 1),
+                                              catalog.u16(MAX_LENGTH, 1000))),
+        Offered(3, 1, "oep.target.console", (catalog.tlv(MECHANISMS, bytes([0, 1, 2])),)),
+        Offered(4, 2, "oep.fixture.gpio", _roles({1: pins})),
+        Offered(5, 3, "oep.fixture.uart", _roles({1: pins, 2: pins}) + (
+            catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
+    ])
+
+
+PROFILES = {"p4-x035": p4_x035, "esp32-v003": esp32_v003, "p4-bench": p4_bench, "rp2350-pins": rp2350_pins}

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/src/oep_client/registry.py

@@ -2,7 +2,7 @@
 
 from types import SimpleNamespace as _NS
 
-REGISTRY_HASH = "dd6d527421bb6206"
+REGISTRY_HASH = "08b7d1656bf59269"
 SCHEMA = 1
 PROTOCOL_REVISION = 1
 CONFIRM_REQUEST_MAGIC = 'OEP?'
@@ -25,13 +25,13 @@ CORE = _NS(name="oep.core", revision=1, op={"confirm": 0x01, "list": 0x02, "desc
     closed_tail={0x40}, tlv={"plan_apply": {"role_assignment": 0x90}, "open": {"owner": 0x01}, "lock_state_answer": {"owner": 0x01}, "locked_payload": {"owner": 0x01}, "describe": {"firmware": 0x40, "model": 0x41, "unit_id": 0x42, "channels": 0x43, "reserved": 0x44, "profile": 0x45, "label": 0x46, "resets_on_open": 0x47, "transport": 0x49, "oep_pid": 0x4A, "plan_roles": 0x4B}}, event={"heartbeat": 0x01}, enum={"transport_kind": {"uart_bridge": 0x01, "usb_cdc": 0x02, "usb_serial_jtag": 0x03, "vendor_bulk": 0x04, "hid": 0x05, "tcp": 0x06}}, own={})
 INTERFACES["oep.core"] = CORE
 WIRE_RVSWD = _NS(name="oep.wire.rvswd", revision=1, op={"scan": 0x01, "attach": 0x02, "detach": 0x03, "attach_under_reset": 0x04, "connections": 0x05}, lock_free={0x05},
-    closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "pins": 0x03, "idle_clock": 0x04}, "attach_under_reset": {"max_speed": 0x01, "pins": 0x03, "idle_clock": 0x04}, "attach_answer": {"target_id": 0x10}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "target_id_scheme": {"wch_dmi_7f": 0x01}, "attach_method": {"run": 0x00, "halt": 0x01}, "pin_role": {"swdio": 0x01, "swclk": 0x02, "reset": 0x03}, "idle_clock": {"high": 0x00, "low": 0x01}}, own={})
+    closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "scan": {"skip": 0x01}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "pins": 0x03, "idle_clock": 0x04}, "attach_under_reset": {"max_speed": 0x01, "pins": 0x03, "idle_clock": 0x04}, "attach_answer": {"target_id": 0x10}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "target_id_scheme": {"wch_dmi_7f": 0x01}, "attach_method": {"run": 0x00, "halt": 0x01}, "pin_role": {"swdio": 0x01, "swclk": 0x02, "reset": 0x03}, "idle_clock": {"high": 0x00, "low": 0x01}}, own={})
 INTERFACES["oep.wire.rvswd"] = WIRE_RVSWD
 WIRE_SWIO = _NS(name="oep.wire.swio", revision=1, op={"scan": 0x01, "attach": 0x02, "detach": 0x03, "attach_under_reset": 0x04, "connections": 0x05}, lock_free={0x05},
-    closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "pins": 0x03}, "attach_under_reset": {"max_speed": 0x01, "pins": 0x03}, "attach_answer": {"target_id": 0x10}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "target_id_scheme": {"wch_dmi_7f": 0x01}, "attach_method": {"run": 0x00, "halt": 0x01}, "pin_role": {"swdio": 0x01, "reset": 0x03}}, own={})
+    closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "scan": {"skip": 0x01}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "pins": 0x03}, "attach_under_reset": {"max_speed": 0x01, "pins": 0x03}, "attach_answer": {"target_id": 0x10}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "target_id_scheme": {"wch_dmi_7f": 0x01}, "attach_method": {"run": 0x00, "halt": 0x01}, "pin_role": {"swdio": 0x01, "reset": 0x03}}, own={})
 INTERFACES["oep.wire.swio"] = WIRE_SWIO
 WIRE_SWD = _NS(name="oep.wire.swd", revision=1, op={"scan": 0x01, "attach": 0x02, "detach": 0x03, "connections": 0x05}, lock_free={0x05},
-    closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "targetsel": 0x02, "pins": 0x03}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "pin_role": {"swdio": 0x01, "swclk": 0x02}}, own={})
+    closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "scan": {"skip": 0x01}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "targetsel": 0x02, "pins": 0x03}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "pin_role": {"swdio": 0x01, "swclk": 0x02}}, own={})
 INTERFACES["oep.wire.swd"] = WIRE_SWD
 TARGET_RISCV_DM = _NS(name="oep.target.riscv-dm", revision=1, op={"dmi": 0x01, "halt": 0x02, "resume": 0x03, "reset": 0x04, "read_block": 0x05, "write_block": 0x06, "run": 0x07, "step": 0x08}, lock_free={},
     closed_tail={}, tlv={"describe": {}, "reset": {"method": 0x01}}, event={}, enum={"dmi_step": {"write": 0x01, "read": 0x02, "poll_reads": 0x03, "wait_us": 0x04, "poll_us": 0x05}, "reset_mode": {"run": 0x00, "run_verified": 0x01, "halt_at_reset": 0x02}, "reset_method": {"probe_default": 0x00, "ndmreset": 0x01, "system_reset": 0x02}}, own={})

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/src/oep_client/riscv.py

@@ -76,23 +76,36 @@ class WireBase(Interface):
     TAG_MAX_SPEED = 0x01
     TAG_PINS = 0x03          # swdio(u16) swclk(u16, 0xFFFF on one wire), critical (oep-if-debug §1)
 
+    TAG_SKIP = 0x01          # scan, count 0 only: pairs of the count-0 list to skip (oep-if-debug §1)
+
     def scan(self, pairs: list[tuple[int, int]] | None = None) -> list[Found]:
-        """Try `pairs` of (swdio, swclk); None = every pair the probe allows (describe's channel_group /
-        role_channels). A pair the probe does not allow refuses the whole scan (rejected unavailable). The probe stops
-        when its answer would not fit one frame and says how many pairs it tried; the rest go again (oep-if-debug §1)."""
-        pairs = list(pairs or [])
+        """Try `pairs` of (swdio, swclk); None = every pair the probe allows and nothing holds (describe's
+        channel_group / role_channels, oep-if-debug §1). A pair the probe does not allow, or one whose pins something
+        holds, refuses the whole scan (rejected unavailable). The probe tries at most 255 pairs a request and stops early
+        when its answer would not fit one frame; this goes on until every pair is tried (count 0: with skip until
+        tried = 0)."""
         out = []
+        pairs = list(pairs or [])
+        skip = 0
         while True:
-            body = bytes([len(pairs)]) + b"".join(struct.pack("<HH", d, c) for d, c in pairs)
+            chunk = pairs[:255]
+            body = bytes([len(chunk)]) + b"".join(struct.pack("<HH", d, c) for d, c in chunk)
+            if not pairs and skip:
+                body += m.tlv(self.TAG_SKIP, struct.pack("<H", skip))
             rd = m.Reader(self._call(self.SCAN, body).payload)
             tried, count = rd.take("BB")
             for _ in range(count):
                 kind, dio, clk, status = rd.take("BHHI")
                 out.append(Found(kind, (dio, clk), status))
             rd.tail()
-            if not pairs or tried >= len(pairs) or tried == 0:
+            if tried == 0:
                 return out
-            pairs = pairs[tried:]
+            if pairs:
+                pairs = pairs[tried:]
+                if not pairs:
+                    return out
+            else:
+                skip += tried
 
     def detach(self, conn: int) -> None:
         self._call(self.DETACH, struct.pack("<H", conn))

{oep_client_python-0.0.7 → oep_client_python-0.0.8}/tests/test_fake_spec.py

@@ -431,3 +431,45 @@ def test_idle_clock_is_rvswd_s_and_a_slot_carries_the_line_settings():
     assert hv.raw(9, 0x02, slot_item(0, 1, v003.pairs[1][0], idle=1)).detail == m.MALFORMED   # swio has no idle_clock
     r = hv.raw(1, 0x02, b"\x01" + idle_low)
     assert r.resolution == m.REJECTED and r.detail == m.UNSUPPORTED  # an unknown critical TLV on swio
+
+
+def pins_probe():
+    ep = endpoint.Endpoint(fake.rp2350_pins(), Clock())
+    h = Host(ep)
+    h.open()
+    return ep, h
+
+
+def test_a_wire_takes_any_free_pair_the_host_names():
+    """oep-if-debug §1: role_channels pairs; count 0 in swdio / swclk order; a live connection holds its pins."""
+    ep, h = pins_probe()
+    pins = lambda d, c: m.tlv(0x03, struct.pack("<HH", d, c), critical=True)
+    r = m.Reader(h.ok(1, 0x01, b"\x00"))                              # count 0: the first 255 free pairs
+    tried, count = r.take("BB")
+    assert tried == 255 and count == 1 and r.take("BHHI")[1:3] == (0, 1)
+    skip = lambda n: m.tlv(0x01, struct.pack("<H", n))
+    assert m.Reader(h.ok(1, 0x01, b"\x00" + skip(29 * 28 - 10))).take("B") == 10   # the last ten
+    assert m.Reader(h.ok(1, 0x01, b"\x00" + skip(29 * 28))).take("B") == 0         # the end
+    assert h.raw(1, 0x01, b"\x01" + struct.pack("<HH", 0, 1) + skip(1)).detail == m.MALFORMED
+    conn = struct.unpack_from("<H", h.ok(1, 0x02, b"\x01" + pins(0, 1)))[0]
+    assert h.raw(1, 0x02, b"\x01" + pins(1, 2)).detail == m.UNAVAILABLE    # GP1 is the live connection's
+    assert h.raw(0, m.OP_PLAN_APPLY, m.tlv(0x90, struct.pack("<HBH", 4, 1, 0))).detail == m.UNAVAILABLE
+    assert m.Reader(h.ok(1, 0x01, b"\x00")).take("B") == 1           # its one seat is taken: the live pair only
+    assert h.raw(1, 0x01, b"\x01" + struct.pack("<HH", 2, 3)).detail == m.UNAVAILABLE
+    h.ok(1, 0x03, struct.pack("<H", conn) + m.tlv(0x01, b""))       # detach (force): the pins go back
+    h.ok(0, m.OP_PLAN_APPLY, m.tlv(0x90, struct.pack("<HBH", 4, 1, 5)))
+    assert h.raw(1, 0x01, b"\x01" + struct.pack("<HH", 5, 6)).detail == m.UNAVAILABLE   # GP5 is the plan's
+    assert h.raw(1, 0x02, b"\x01" + pins(3, 3)).detail == m.UNAVAILABLE                 # one channel twice
+    assert h.raw(1, 0x02, b"\x01" + pins(19, 3)).detail == m.UNAVAILABLE                # not offered (PSRAM CS)
+    r = h.raw(1, 0x02, b"\x01" + pins(7, 8))                        # a free pair nothing answers on
+    assert r.resolution == m.COMPLETED and not r.succeeded
+
+
+def test_the_client_scan_walks_the_whole_count_0_list():
+    from oep_client import host as hh, target
+    ep = endpoint.Endpoint(fake.rp2350_pins(), Clock())
+    hst = hh.Host(lambda b: ep.handle(b, 0))
+    hst.open(3000)
+    ep._target(1, (28, 29)).present = True                        # the last pair of the list
+    found = target.Wire(hst).scan()
+    assert [f.pins for f in found] == [(0, 1), (28, 29)]