oep-client-python 0.0.19__tar.gz → 0.0.21__tar.gz

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## 0.0.21
+- (EN) Breaking: a bind's streams carry a length each (oep-spec probe.config §1.2, freeze decision 1, missed until now): `n × (len, kind, id)`, len 3 today; the fake skips a longer one's tail and refuses one under 3 as malformed.
+- (JA) 破壊的変更: bind のストリームの並びの各要素の前に長さを置く（oep-spec probe.config §1.2。凍結の決定 1 で漏れていた）: `n × (len、kind、id)`、今の len は 3。fake は長い要素の後ろを飛ばし、3 未満は malformed で断る。
+- (EN) `usb:X` is always a unit id, whatever its length (a 4-character unit id was read as a VID); a VID comes with its PID, `usb:VID:PID[:SERIAL]`.
+- (JA) `usb:X` は長さによらず unit id として読む（4 文字の unit id を VID と読んでいた）。VID は PID と一緒に `usb:VID:PID[:SERIAL]` で書く。
+- (EN) Breaking: the CLI's `name#k` is the list's instance, from 0 (oep-spec core §7.2's `name#instance`; `#0` may be left out). It was the k-th from 1.
+- (JA) 破壊的変更: CLI の `name#k` は list の instance（0 から）にした（oep-spec core §7.2 の `name#instance`、`#0` は省ける）。1 から数えた k 番目だった。
+- (EN) The fake probes number each interface's instance from 0 per name (core §7.2), as the probe firmware now does; they had arbitrary numbers.
+- (JA) fake の probe はインターフェースの instance を名前ごとに 0 から振る（core §7.2）。probe の firmware も同じにした。これまでは適当な番号だった。
+- (EN) README: `registry.INTERFACES[name]` is the public way to reach an interface's numbers by name.
+- (JA) README: 名前からインターフェースの番号を引く公開の入口は `registry.INTERFACES[name]` と書いた。
+
+## 0.0.20
+- (EN) A console write's chunk fits the probe's frame: frame - 12 - the stream's prefix (the console's stream u16; none on a fixture UART). It was frame - 13 for both, one byte over on a console with 64-byte frames. Found porting it to oep-client-js.
+- (JA) console の書き込みの 1 回の大きさが probe のフレームに収まるようにした: frame − 12 − stream の前置き（console は stream の u16、fixture UART は無し）。両方とも frame − 13 だったので、64 byte のフレームの console で 1 byte はみ出していた。oep-client-js に移すときに見つかった。
+
 ## 0.0.19
 - (EN) The pre-freeze decisions (oep-spec docs/v1-freeze-decisions.ja.md), in the fake and the client at once:
   - `oep.fixture.capture` is `oep.fixture.logic`; the I2C / SPI targets are the standard `oep.fixture.i2c-target` / `spi-target` (`fixture.I2cTarget` / `SpiTarget`; `esp32_targets` is gone). Their status is separate fields (`I2cStatus(state=, mode=, armed=, queued=, …)`); `read_hw` is gone, `set_stretch` is `stretch` (op 0x07).

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.19
+Version: 0.0.21
 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
@@ -64,7 +64,7 @@ oep-client-python X.Y.Z (until the v1 freeze every release may break the wire; t
 | `config` | `oep.probe.config` (slots, binds, plan / label / idle items, get / set / save / erase, the live slot and bind state) |
 | `capture` | `oep.fixture.logic` (revision 1, oep-spec oep-if-capture). Every segment read goes to the `Host.on_capture` callbacks as a `CaptureRecord` (the hook for run recorders; no wireskein dependency) |
 | `decode` | decoding capture channels (I2C) |
-| `registry` | generated from oep-spec's number table (never edited; copied again from oep-spec) |
+| `registry` | generated from oep-spec's number table (never edited; copied again from oep-spec). The public way to reach an interface by name is `registry.INTERFACES[name]` (`.revision`, `.op`, `.tlv`, `.enum`, e.g. `INTERFACES["oep.fixture.uart"].enum["role"]`); the module-level names (`FIXTURE_UART`, ...) are the same objects |
 | `arm` | `oep.wire.swd`, `oep.target.arm-adi`, MEM-AP, halting and calling functions on a Cortex-M |
 | `ch32_flash` | writing a CH32 (a RAM loader, page by page) |
 | `rp2350` | flash and reboot through the RP2350 boot ROM |

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/README.ja.md

@@ -38,7 +38,7 @@ X.Y.Z（v1 の凍結までは、どのリリースも wire を壊しうるので
 | `config` | `oep.probe.config`（スロット、bind、plan / label / idle の項目、get / set / save / erase、スロットと bind の今の状態） |
 | `capture` | `oep.fixture.logic`（revision 1、oep-spec の oep-if-capture）。読んだ区画は `Host.on_capture` の callback に `CaptureRecord` で渡る（記録の受け口。wireskein には依存しない） |
 | `decode` | キャプチャのチャネルの復号（I2C） |
-| `registry` | oep-spec の番号の表から生成したモジュール（編集しない。oep-spec から写し直す） |
+| `registry` | oep-spec の番号の表から生成したモジュール（編集しない。oep-spec から写し直す）。名前からインターフェースの番号を引く公開の入口は `registry.INTERFACES[name]`（`.revision`、`.op`、`.tlv`、`.enum`。例 `INTERFACES["oep.fixture.uart"].enum["role"]`）。`FIXTURE_UART` などのモジュールの名前は同じもの |
 | `arm` | `oep.wire.swd`、`oep.target.arm-adi`、MEM-AP、Cortex-M の停止と関数呼び出し |
 | `ch32_flash` | CH32 の書き込み（RAM ローダー、ページ単位の書き直し） |
 | `rp2350` | RP2350 の boot ROM 経由の flash と reboot |

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/README.md

@@ -42,7 +42,7 @@ oep-client-python X.Y.Z (until the v1 freeze every release may break the wire; t
 | `config` | `oep.probe.config` (slots, binds, plan / label / idle items, get / set / save / erase, the live slot and bind state) |
 | `capture` | `oep.fixture.logic` (revision 1, oep-spec oep-if-capture). Every segment read goes to the `Host.on_capture` callbacks as a `CaptureRecord` (the hook for run recorders; no wireskein dependency) |
 | `decode` | decoding capture channels (I2C) |
-| `registry` | generated from oep-spec's number table (never edited; copied again from oep-spec) |
+| `registry` | generated from oep-spec's number table (never edited; copied again from oep-spec). The public way to reach an interface by name is `registry.INTERFACES[name]` (`.revision`, `.op`, `.tlv`, `.enum`, e.g. `INTERFACES["oep.fixture.uart"].enum["role"]`); the module-level names (`FIXTURE_UART`, ...) are the same objects |
 | `arm` | `oep.wire.swd`, `oep.target.arm-adi`, MEM-AP, halting and calling functions on a Cortex-M |
 | `ch32_flash` | writing a CH32 (a RAM loader, page by page) |
 | `rp2350` | flash and reboot through the RP2350 boot ROM |

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.19"
+version = "0.0.21"
 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.19 → oep_client_python-0.0.21}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.19"
+__version__ = "0.0.21"

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/__main__.py

@@ -4,7 +4,7 @@
   oep config show <probe>
   oep config slot <probe> --name x035 --wire rvswd --pins 2,54 --attach at-boot --retry 1 --mechanism dmseq
   oep config bind <probe> --port 1 --mode last-reset --stream slot:x035
-  oep config plan <probe> oep.fixture.uart#2 rx=48 tx=49       (the fn's whole plan; fn number or name#instance)
+  oep config plan <probe> oep.fixture.uart#1 rx=48 tx=49       (the fn's whole plan; fn number or name#instance)
   oep config remove <probe> bind 1        oep config save <probe>        oep config erase <probe>
 
 <probe>: a serial port, tcp://HOST:PORT or usb[:VID:PID[:SERIAL]]. A change takes the lock (owner "oep config") and
@@ -79,7 +79,7 @@ def _config_parser(sub) -> None:
     bind.add_argument("--save", action="store_true")
     plan = cs.add_parser("plan", help="the pins an interface keeps (its whole plan, kept as a setting)")
     plan.add_argument("probe")
-    plan.add_argument("fn", help="an fn, or an interface name with #k for its k-th instance (1 = the first)")
+    plan.add_argument("fn", help="an fn, or name#instance (the list instance, 0 = the first; #0 may be left out, core §7.2)")
     plan.add_argument("roles", nargs="+", help="ROLE=CHANNEL, ROLE a number or the interface's role name (rx, tx, line...)")
     plan.add_argument("--save", action="store_true")
     label = cs.add_parser("label", help="name a channel (shown in oep.core's describe)")
@@ -116,20 +116,21 @@ def _pins(hst, fn: int, text: str | None, wire: str) -> tuple[int, int]:
 
 
 def _plan_fn(hst, spec: str) -> tuple[int, dict[str, int]]:
-    """fn and its role names (from the registry) for `spec`: an fn number, or name[#k] (k-th instance, 1-based)."""
+    """fn and its role names (from the registry) for `spec`: an fn number, or name[#instance] (the list's instance,
+    0-based, core §7.2)."""
     from . import registry as reg
     if spec.isdigit():
         fn = int(spec)
         name = next((e.name for e in core.list_entries(hst) if e.fn == fn), "")
     else:
         name, _, k = spec.partition("#")
-        fns = core.find_all(hst, name)
-        if not fns:
+        entries = [e for e in core.list_entries(hst, name, exact=True)]
+        if not entries:
             raise SystemExit(f"the probe offers no {name}")
-        index = int(k) - 1 if k else 0
-        if not 0 <= index < len(fns):
-            raise SystemExit(f"{name}: {len(fns)} instance(s), fns {fns}")
-        fn = fns[index]
+        instance = int(k) if k else 0
+        fn = next((e.fn for e in entries if e.instance == instance), None)
+        if fn is None:
+            raise SystemExit(f"{name}: instances {sorted(e.instance for e in entries)}, not {instance}")
     iface = reg.INTERFACES.get(name)
     roles = dict(iface.enum.get("role", {})) if iface else {}
     return fn, roles

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/config.py

@@ -111,7 +111,7 @@ class Bind:
     def value(self) -> bytes:
         v = struct.pack("<BBBB", self.port, MODE[self.mode], self.selected if self.mode == "manual" else 0,
                         len(self.streams))
-        return v + b"".join(struct.pack("<BH", STREAM[kind], i) for kind, i in self.streams)
+        return v + b"".join(struct.pack("<BBH", 3, STREAM[kind], i) for kind, i in self.streams)   # len, kind, id
 
 
 def item(it) -> bytes:
@@ -147,7 +147,12 @@ def decode(tag: int, v: bytes):
                     mechanism=_name(MECHANISM, mech), lock=lock, max_speed=max_speed, idle_clock=_name(IDLE_CLOCK, idle))
     if tag == ITEM["bind"] and len(v) >= 4:
         port, mode, selected, n = struct.unpack_from("<BBBB", v)
-        streams = [(_name(STREAM, v[4 + 3 * k]), struct.unpack_from("<H", v, 5 + 3 * k)[0]) for k in range(n)]
+        streams, at = [], 4
+        for _ in range(n):                                         # len, kind, id: a longer one's tail skipped
+            if at >= len(v) or v[at] < 3 or at + 1 + v[at] > len(v):
+                return (tag, v)
+            streams.append((_name(STREAM, v[at + 1]), struct.unpack_from("<H", v, at + 2)[0]))
+            at += 1 + v[at]
         return Bind(port=port, mode=_name(MODE, mode), streams=streams, selected=selected)
     return (tag, v)
 

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/console.py

@@ -136,10 +136,12 @@ class StreamIO:
         self.lost = 0
 
     def _limits(self) -> tuple[int, int]:
-        """(read, write) chunk sizes that fit the probe's frame: request header 6 + session 4 + stream 1 + count 2,
-        result header 5 + start 8 + flags 1."""
+        """(read, write) chunk sizes that fit the probe's frame: a write is request header 6 + session 4 + the stream's
+        prefix (the console's stream u16, none on a fixture UART) + count 2; a read's result is header 5 + start 8 +
+        flags 1. (The write was frame - 13 for both: one byte over on the console's 64-byte frames.)"""
         frame = self.source.host.confirmed()["max_frame"]
-        return max(1, min(self.MAX_READ, frame - 14)), max(1, min(self.MAX_WRITE, frame - 13))
+        write = frame - 12 - len(self.source._stream_prefix())
+        return max(1, min(self.MAX_READ, frame - 14)), max(1, min(self.MAX_WRITE, write))
 
     def read(self, n: int = 512) -> bytes:
         c = self.source.read_from(self.position, min(n, self._limits()[0]))

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/endpoint.py

@@ -217,6 +217,17 @@ class Slot:
     lock: tuple[int, bytes, bytes] | None              # (scheme, mask, value)
 
 
+def _bind_streams(v: bytes) -> list[int]:
+    """Where each stream of a bind value starts (probe.config §1.2: n × (len, kind, id), len >= 3, its tail skipped)."""
+    at, out = 4, []
+    for _ in range(v[3]):
+        if at >= len(v) or v[at] < 3 or at + 1 + v[at] > len(v):
+            raise Reject(m.MALFORMED)
+        out.append(at + 1)
+        at += 1 + v[at]
+    return out
+
+
 @dataclass(frozen=True)
 class Bind:
     port: int
@@ -1435,9 +1446,9 @@ class Endpoint:
             elif tag == ITEM["slot"]:
                 fns.add(struct.unpack_from("<H", value, 1)[0])
             elif tag == ITEM["bind"]:
-                for k in range(value[3]):
-                    if value[4 + 3 * k] == BIND_STREAM["fixture_uart"]:
-                        fns.add(struct.unpack_from("<H", value, 5 + 3 * k)[0])
+                for at in _bind_streams(value):
+                    if value[at] == BIND_STREAM["fixture_uart"]:
+                        fns.add(struct.unpack_from("<H", value, at + 1)[0])
         return fns
 
     def _apply_saved(self) -> None:
@@ -1459,9 +1470,9 @@ class Endpoint:
                 new[(tag, key)] = value[:1] + pack(struct.unpack_from("<H", value, 1)[0]) + value[3:]
             elif tag == ITEM["bind"]:
                 v = bytearray(value)
-                for k in range(v[3]):
-                    if v[4 + 3 * k] == BIND_STREAM["fixture_uart"]:
-                        v[5 + 3 * k:7 + 3 * k] = pack(struct.unpack_from("<H", v, 5 + 3 * k)[0])
+                for at in _bind_streams(value):
+                    if v[at] == BIND_STREAM["fixture_uart"]:
+                        v[at + 1:at + 3] = pack(struct.unpack_from("<H", v, at + 1)[0])
                 new[(tag, key)] = bytes(v)
             else:
                 new[(tag, key)] = value
@@ -1574,9 +1585,10 @@ class Endpoint:
         return Slot(n, wire_fn, (swdio, swclk), attach, retry_s, max_speed, idle_clock, mech, name.decode(), lock)
 
     def _parse_bind(self, v: bytes, slots: dict[int, Slot]) -> Bind:
-        t = Take(v)
-        port, mode, selected, n = t.take("BBBB")
-        streams = tuple(t.take("BH") for _ in range(n))
+        if len(v) < 4:
+            raise Reject(m.MALFORMED)
+        port, mode, selected, n = v[:4]
+        streams = tuple((v[at], struct.unpack_from("<H", v, at + 1)[0]) for at in _bind_streams(v))
         if n == 0:                                                 # after the streams: later fields, skipped
             raise Reject(m.MALFORMED)
         if port not in self.serial_ports:

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/fake.py

@@ -191,34 +191,34 @@ def p4_x035() -> FakeProbe:
               _transports([(TRANSPORT["usb_serial_jtag"], 0xFF), (TRANSPORT["vendor_bulk"], 0),
                            (TRANSPORT["hid"], 1), (TRANSPORT["usb_cdc"], 2)])
               + (catalog.u8(CORE_OEP_PID, 1), catalog.text(CORE_CHIP, "esp32p4 v1.0"))),
-        Offered(1, 1, "oep.wire.rvswd", (
+        Offered(1, 0, "oep.wire.rvswd", (
             catalog.channel_group(1, [(1, 2), (2, 54)]), 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),
+        Offered(2, 0, "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}) + (
+        Offered(3, 0, "oep.target.console", (catalog.tlv(MECHANISMS, bytes([0, 1, 2])),)),
+        Offered(4, 0, "oep.fixture.gpio", _roles({1: pins})),
+        Offered(5, 0, "oep.fixture.uart", _roles({1: pins, 2: pins}) + (
             catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
-        Offered(6, 4, "oep.fixture.uart", _roles({1: pins, 2: pins}) + (
+        Offered(6, 1, "oep.fixture.uart", _roles({1: pins, 2: pins}) + (
             catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
         # the P4's PARLIO: w 1-16, one-shot / repeat / streaming
-        Offered(7, 5, "oep.fixture.logic", _roles({k: pins for k in range(16)}) + (
+        Offered(7, 0, "oep.fixture.logic", _roles({k: pins for k in range(16)}) + (
             catalog.u32(MAX_CLOCK_HZ, 20_000_000), catalog.u32(MIN_CLOCK_HZ, 1_000),
             catalog.u16(MAX_LENGTH, 65000), catalog.u8(IMPLEMENTATION, 3))
             + _capture_decl(["one_shot", "repeat", "streaming"], 16, [1, 2, 4, 8, 16], 1 << 20, 8, 4096)),
-        Offered(8, 6, "oep.fixture.i2c-target", _roles({1: pins, 2: pins}) + (
+        Offered(8, 0, "oep.fixture.i2c-target", _roles({1: pins, 2: pins}) + (
             catalog.u16(MAX_LENGTH, 128), catalog.u32(MAX_CLOCK_HZ, 1_000_000),
             catalog.u32(FEATURES, 0b11), catalog.u8(IMPLEMENTATION, 2))),
-        Offered(9, 7, "oep.fixture.spi-target", _roles({1: pins, 2: pins, 3: pins, 4: pins}) + (
+        Offered(9, 0, "oep.fixture.spi-target", _roles({1: pins, 2: pins, 3: pins, 4: pins}) + (
             catalog.u16(MAX_LENGTH, 64), catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
-        _config(10, 8, slots_max=1),
+        _config(10, 0, slots_max=1),
         # the P4's ADC1 (GPIO16-23): one ADC for all its channels, 611 Hz - 83.3 kHz in all; ESP32-style attenuations
-        Offered(11, 1, "oep.fixture.analog", _roles({k: list(range(16, 24)) for k in range(4)}) + (
+        Offered(11, 0, "oep.fixture.analog", _roles({k: list(range(16, 24)) for k in range(4)}) + (
             catalog.u32(MAX_CLOCK_HZ, 83_333), catalog.u32(MIN_CLOCK_HZ, 611), catalog.u8(IMPLEMENTATION, 3))
             + _analog_decl([(0, 0, 950, 0), (1, 0, 1250, 2500), (2, 0, 1750, 6000), (3, 0, 3100, 12000)], 65536)),
         # the logic (fn 7) and the analog (fn 11) together; the ADC's 83.3 kHz is shared by its channels
-        Offered(12, 1, "oep.fixture.capture-group", _group_decl([7, 11], [(83_333, [11])], {11: 5000})),
+        Offered(12, 0, "oep.fixture.capture-group", _group_decl([7, 11], [(83_333, [11])], {11: 5000})),
     ])
 
 
@@ -231,26 +231,26 @@ def esp32_v003() -> FakeProbe:
         _core("3.0.0", "esp32", "0070070d9394", 40, reserved, f"{NS}.esp32-v003",
               {16: "SWIO", 23: "NRST", 22: "DUT TX", 21: "DUT RX"},
               _transports([(TRANSPORT["uart_bridge"], 0xFF)])),
-        Offered(1, 1, "oep.wire.swio", (catalog.channel_group(1, [(1, 16)]), catalog.role_channels(3, [23]),
+        Offered(1, 0, "oep.wire.swio", (catalog.channel_group(1, [(1, 16)]), catalog.role_channels(3, [23]),
                                         catalog.u8(IMPLEMENTATION, 1), catalog.u8(MAX_CONNECTIONS, 1))),
-        Offered(2, 1, "oep.target.riscv-dm", (catalog.u32(FEATURES, 0b0111), catalog.u8(IMPLEMENTATION, 1),
+        Offered(2, 0, "oep.target.riscv-dm", (catalog.u32(FEATURES, 0b0111), catalog.u8(IMPLEMENTATION, 1),
                                               catalog.u16(MAX_LENGTH, 40))),
-        Offered(3, 1, "oep.target.console", (catalog.tlv(MECHANISMS, bytes([0, 1, 2])),)),
-        Offered(4, 2, "oep.fixture.gpio", _roles({1: wired + [23]})),
-        Offered(5, 3, "oep.fixture.uart", _roles({1: wired, 2: wired}) + (
+        Offered(3, 0, "oep.target.console", (catalog.tlv(MECHANISMS, bytes([0, 1, 2])),)),
+        Offered(4, 0, "oep.fixture.gpio", _roles({1: wired + [23]})),
+        Offered(5, 0, "oep.fixture.uart", _roles({1: wired, 2: wired}) + (
             catalog.u32(MAX_CLOCK_HZ, 115_200), catalog.u8(IMPLEMENTATION, 2))),
         # the classic ESP32's GPIO sampler: a byte a sample (w 8), one-shot
-        Offered(6, 4, "oep.fixture.logic", _roles({k: wired for k in range(4)}) + (
+        Offered(6, 0, "oep.fixture.logic", _roles({k: wired for k in range(4)}) + (
             catalog.u32(MAX_CLOCK_HZ, 2_000_000), catalog.u32(MIN_CLOCK_HZ, 400_000), catalog.u8(IMPLEMENTATION, 1))
             + _capture_decl(["one_shot"], 8, [8], 65536, 1, 480)),
-        Offered(7, 5, "oep.fixture.i2c-target", _roles({1: wired, 2: wired}) + (
+        Offered(7, 0, "oep.fixture.i2c-target", _roles({1: wired, 2: wired}) + (
             catalog.u16(MAX_LENGTH, 16), catalog.u32(MAX_CLOCK_HZ, 100_000), catalog.u8(IMPLEMENTATION, 2))),
         # Two fixed pin sets (an example of channel_group; GPIO23 is the DUT's NRST on this jig).
-        Offered(8, 6, "oep.fixture.spi-target", (
+        Offered(8, 0, "oep.fixture.spi-target", (
             catalog.channel_group(1, [(1, 18), (2, 19), (3, 5), (4, 4)]),
             catalog.channel_group(2, [(1, 14), (2, 13), (3, 27), (4, 26)]),
             catalog.u16(MAX_LENGTH, 32), catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
-        _config(9, 7, slots_max=1, modes=0b011, storage=1024),
+        _config(9, 0, slots_max=1, modes=0b011, storage=1024),
     ])
 
 
@@ -264,17 +264,17 @@ def p4_bench() -> FakeProbe:
               {2: "A SWDIO", 3: "A SWCLK", 4: "B SWDIO", 5: "B SWCLK", 6: "C SWDIO", 7: "C SWCLK"},
               _transports([(TRANSPORT["usb_serial_jtag"], 0xFF), (TRANSPORT["vendor_bulk"], 0),
                            (TRANSPORT["hid"], 1), (TRANSPORT["usb_cdc"], 2)]) + (catalog.u8(CORE_OEP_PID, 1),)),
-        Offered(1, 1, "oep.wire.rvswd", (
+        Offered(1, 0, "oep.wire.rvswd", (
             catalog.channel_group(1, [(1, 2), (2, 3)]), catalog.channel_group(2, [(1, 4), (2, 5)]),
             catalog.channel_group(3, [(1, 6), (2, 7)]), catalog.u32(MAX_CLOCK_HZ, 5_000_000),
             catalog.u8(IMPLEMENTATION, 1), catalog.u8(MAX_CONNECTIONS, 2))),
-        Offered(2, 1, "oep.target.riscv-dm", (catalog.u32(FEATURES, 0b1111), catalog.u8(IMPLEMENTATION, 1),
+        Offered(2, 0, "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}) + (
+        Offered(3, 0, "oep.target.console", (catalog.tlv(MECHANISMS, bytes([0, 1, 2])),)),
+        Offered(4, 0, "oep.fixture.gpio", _roles({1: pins})),
+        Offered(5, 0, "oep.fixture.uart", _roles({1: pins, 2: pins}) + (
             catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
-        _config(6, 4, slots_max=4),
+        _config(6, 0, slots_max=4),
     ])
 
 
@@ -287,13 +287,13 @@ def rp2350_pins() -> FakeProbe:
     return FakeProbe("rp2350-pins", 1024, [
         _core("3.0.0", "rp2350", "e66138935f2b1f2c", 30, reserved, "",
               {}, _transports([(TRANSPORT["usb_cdc"], 0)])),
-        Offered(1, 1, "oep.wire.rvswd", _roles({1: pins, 2: pins, 3: pins}) + (
+        Offered(1, 0, "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),
+        Offered(2, 0, "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}) + (
+        Offered(3, 0, "oep.target.console", (catalog.tlv(MECHANISMS, bytes([0, 1, 2])),)),
+        Offered(4, 0, "oep.fixture.gpio", _roles({1: pins})),
+        Offered(5, 0, "oep.fixture.uart", _roles({1: pins, 2: pins}) + (
             catalog.u32(MAX_CLOCK_HZ, 3_000_000), catalog.u8(IMPLEMENTATION, 2))),
     ])
 

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/fake_serve.py

@@ -83,7 +83,7 @@ def build(a: argparse.Namespace) -> endpoint.Endpoint:
                             0, 0, mech, len(raw)) + raw + b"\x00"       # no speed ceiling, rests high, no lock
         items.append(bytes([_ITEM["slot"], len(value)]) + value)
     if a.bind:
-        streams = b"".join(struct.pack("<BH", reg.PROBE_CONFIG.enum["bind_stream"]["slot_console"], n)
+        streams = b"".join(struct.pack("<BBH", 3, reg.PROBE_CONFIG.enum["bind_stream"]["slot_console"], n)
                            for n in range(len(a.slot)))
         value = struct.pack("<BBBB", a.port_index, _MODES[a.bind.replace("-", "_")], 0, len(a.slot)) + streams
         items.append(bytes([_ITEM["bind"], len(value)]) + value)

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/src/oep_client/link.py

@@ -446,7 +446,7 @@ def open_host(target: str, timeout: float = 3.0):
         lk.transport = "tcp"
     elif target == "usb" or target.startswith("usb:"):
         parts = target.split(":")[1:]
-        if len(parts) == 1 and len(parts[0]) != 4:            # usb:UNIT_ID (a VID is 4 hex digits)
+        if len(parts) == 1:                                   # usb:UNIT_ID (any length: a VID comes with its PID)
             vid, pid = find_usb(parts[0])
             return open_usb_host(vid, pid, parts[0], timeout)
         vid = int(parts[0], 16) if parts else USB_VID

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/tests/test_capabilities.py

@@ -103,8 +103,8 @@ def test_p4_follows_the_agreed_names():
     by_name = {o.entry.name: o for o in caps.offers}
     assert len(caps.offers) == 13
     assert caps.requests["list"] == 1 and caps.requests["describe"] == 13
-    # the debug port: wire, riscv-dm and console are one instance
-    assert {by_name[n].entry.instance for n in ("oep.wire.rvswd", "oep.target.riscv-dm", "oep.target.console")} == {1}
+    # the debug port: wire, riscv-dm and console are the first instance of each
+    assert {by_name[n].entry.instance for n in ("oep.wire.rvswd", "oep.target.riscv-dm", "oep.target.console")} == {0}
     assert by_name["oep.wire.rvswd"].description.groups[1] == [(1, 2), (2, 54)]
     i2c = by_name["oep.fixture.i2c-target"]
     assert i2c.description.roles[1] == i2c.description.roles[2]
@@ -153,7 +153,7 @@ def test_unknown_interfaces_are_shown_raw():
 def test_text_and_json_outputs():
     caps = dump.collect(fake.p4_x035().call)
     text = dump.to_text(caps)
-    assert "instance 6" in text and "oep.fixture.i2c-target" in text
+    assert "instance 0" in text and "oep.fixture.i2c-target" in text
     assert "features: preloaded tx, clock stretching" in text
     data = json.loads(dump.to_json(caps))
     assert data["max_frame"] == 1024 and len(data["interfaces"]) == 13

{oep_client_python-0.0.19 → oep_client_python-0.0.21}/tests/test_fake_spec.py

@@ -59,7 +59,7 @@ def slot_item(n, wire, pair, attach=ATTACH["at_boot"], retry=1, mech=2, name=Non
 
 def bind_item(port, mode, streams, selected=0):
     return m.tlv(ITEM["bind"], struct.pack("<BBBB", port, mode, selected, len(streams))
-                 + b"".join(struct.pack("<BH", k, i) for k, i in streams))
+                 + b"".join(struct.pack("<BBH", 3, k, i) for k, i in streams))
 
 
 def describe(ep, fn):
@@ -204,6 +204,16 @@ def test_slot_names_are_url_safe(name):
 
 # ---- binds and the serial port ---------------------------------------------------------------------------
 
+def test_bind_streams_carry_a_len_and_a_longer_ones_tail_is_skipped():
+    ep, h = bench()
+    head = struct.pack("<BBBB", 0, MODE["mixed"], 0, 1)
+    longer = m.tlv(ITEM["bind"], head + struct.pack("<BBHH", 5, KIND["slot_console"], 0, 0xBEEF))
+    assert h.raw(6, 0x02, slot_item(0, 1, ep.pairs[1][0]) + longer).succeeded
+    assert ep.binds[0].streams == ((KIND["slot_console"], 0),)
+    short = m.tlv(ITEM["bind"], head + struct.pack("<BBH", 2, KIND["slot_console"], 0))
+    assert h.raw(6, 0x02, short).detail == m.MALFORMED
+
+
 def framed(req):
     return cobs.frame(req.pack())