oep-client-python 0.0.32__tar.gz → 0.0.33__tar.gz

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.0.33
+- (JA) oep-spec ba4e8ee（debug §3.1、core §12 規則 8、probe.config の rvswd-rest）に追従。rvswd の線の休ませ方は、attach の idle_clock が無ければ
+  probe が決める（その SWCLK の channel の設定 rvswd-rest、無ければ target_id の系統: CH32L103 は low）。仮想ベンチはそのとおりに休ませ、attach の応答と
+  connections に使う休ませ方を返す。クライアントは `Wire.idle_clock`、`ConnectionInfo.idle_clock` で読み、`config.RvswdRest` と
+  `oep config rvswd-rest PROBE CH auto|high|low` で口ごとに自動を止められる。
+- (JA) oep-spec 91209aa の線の名前（swdio / swclk / swio / rx / tx）を registry から引く（`config.LINE_NAMES`）。console-passthrough は 13 byte のまま
+  （91209aa の idle_clock の欄は oep-spec edbe841 で取り下げ）。
+- (JA) tests/hw: `OEP_HW_IDLE_CLOCK=low|high` で rvswd の attach に休ませ方を明示できる。無ければ probe の判定に任せ、結果に使った休ませ方を記録する。
+- (JA) CI: equipment の段が走ったときだけ証跡を upload する（テストの段が落ちると .pytest-results/ が空で警告が出ていた）。
+
 ## 0.0.32
 - (JA) 仮想ベンチに `--minimal-ops`（`virtual_bench.minimal_ops`）を足す。console と fixture UART の任意の op（marks、clear、mark、write）を
   ops から外し、unknown_operation で答える。host が任意の op を describe の ops を見ずに使っていないかを、実機なしで試せる

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.32
+Version: 0.0.33
 Summary: Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a virtual bench
 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.32 → oep_client_python-0.0.33}/docs/spec-follow-notes.ja.md

@@ -595,3 +595,42 @@ B にした。core §12 の規則 7 を「他者は名前で識別する所か
 
 **仕様への提案の候補（まだ出していない）**: 共有ベクタのうち「仕様書の例の probe」に固有の値（fn 19 の CPU 捕捉の 16 ms、analog の skew や scale の値）を前提にするものは、
 実装の harness が名前で見分けて飛ばしている。ベクタに「例の probe の構成」を示す欄があれば、各実装が機械的に扱える。小さいので、ch32rv の追従の後にまとめて判断する。
+
+## 実機の入れ替え（2026-10-16、リリース 0.0.32）
+
+既存の OEP プローブ 6 台（RP2040 `53032847491a571c`、Pico 2 `9489dd2ae0953650`、P4 `30eda0ea068b` / `30eda0e34a0e`、
+P4X `e8f60ae84e28`、classic ESP32 `0070070d9394`）を Arduino 0.0.32 のリリース版に入れ替え、設定を新しい形（ラベル `S.N`、素通し、wifi）で入れ直した。
+
+| # | 見つけたこと | 判断 |
+|---|---|---|
+| H1 | capture の start の応答に、Arduino が仕様に無い blocking_ms(u32) を generation の前に残していた（logic、analog）。仕様の形で読む host は generation を TLV と読んで落ちる。共有ベクタは start の応答を見ていなかった | Arduino を直した（ffd6a14、未リリース。実機は 0.0.32 のまま）。**ベクタへの提案の候補**: capture / analog の start の応答の形 |
+| H2 | CH32L103（Pico 2 の rvswd）は、線を休ませる間に SWCLK が high だと debug module がリセットされる（DMCONTROL 0、hart が走る。リセット要因は増えない）。idle_clock low の attach なら halt が保たれる。旧設定の slot は idle_clock low を持っていた | tests/hw に OEP_HW_IDLE_CLOCK を足した。**仕様への提案の候補**: probe.config の console-passthrough（§1.2）に idle_clock が無く、L103 のような target では素通しを使えない（attach と同じ値を持たせる）。ベンチでは L103 の素通しを外した |
+
+### 決定: rvswd の線の休ませ方（2026-10-16、所有者が決定。oep-spec 3b32b12 / ba4e8ee）
+
+仕様にはまだ入れていない（oep-spec edbe841 で 1ad434f と 91209aa の欄を取り下げ、判断基準を probe ガイド §12 に書いた e25a654）。実装の試作は
+oep-client-python の `wip/rvswd-rest` ブランチ。
+
+- 事実: CH32L103 は high で休ませると約 1 ms で debug module がリセットされる。CH32X035 は low で休ませると attach できない。attach は 2 本とも high
+  から始まるので、どの系統でも target_id（DMI 0x7F）までは読める。ch32rv は今、L103 を見たら low で attach し直す回避を持っている（B になれば外す）。
+- 方向（所有者の意見）: 自動の決定は足してよい。初期設定はブラウザから行う予定で、時間の猶予が無い操作は host から間に合わない。
+  ただし自動を OFF にする手段もあった方がよい。
+- 案:
+  1. attach に idle_clock の TLV が無ければ、probe は target_id の系統（bit 31〜20）から決める。系統の表は registry（名前で引くデータ）。
+  2. 使った休ませ方は attach の応答と connections に必ず出す。
+  3. OFF は probe.config の項目 `rvswd-rest`（値: auto / high / low。項目が無ければ auto）。**口ごとに決める**: 1 台に X035 の口と L103 の口が
+     並ぶことがあるので、key は wire の fn ではなく、その口の SWCLK の channel（label / idle と同じ「channel が key」。attach は swclk を固定部で
+     名指すので probe はその channel の項目を引く。ユーザーと ch32rv の指摘）。host の居ない場面（素通し、ブラウザで設定した probe）にも効き、
+     console-passthrough に idle_clock の欄は要らない。
+  4. 優先: attach の TLV > 設定の `rvswd-rest`（high / low）> 自動（auto）。
+  5. 1 つの接続の休ませ方は 1 つ。変えるには detach が要る（違う TLV の attach は、生きた接続のピンなので cause 1 で断られる。ch32rv の
+     ブローカーは応答の休ませ方と合えば貸し、違えば断る）。
+  6. 系統の事実の正本は ch32-device-data の family 属性。registry の表はそこから作るか CI で突き合わせ、2 つの正本にしない。
+     DMI 0x7F の bit 31〜20 で系統を引けるかは、古い系統（V103 など）の id の形で確かめる（ch32rv の DB には例外の形がある）。
+- 残る論点: core §12 規則 8（チップ固有の処理を汎用のインターフェースに入れない）との関係。rvswd は対象の系統が限られる線なので、
+  その線の定義の中に置いてよいか。
+
+決定（所有者）: 基本は host が判定し、タイミング系などは probe の自動判定を足せる。自動判定は設定で OFF にでき、判定したことが分かるようにする
+（core §12 規則 8）。仕様は上の案のとおり（key は SWCLK の channel）。Python ebcf306 以降、Arduino 77a8002。
+実機（77a8002）: idle_clock 無しの attach で Pico 2 + L103 は low（halt を 3 秒保つ）、P4 + X035 は high。`rvswd-rest=high` で L103 は high になり halt が
+0.1 s で外れる（OFF が効く）。

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/pyproject.toml

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

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.32"
+__version__ = "0.0.33"

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/__main__.py

@@ -353,6 +353,12 @@ def _config_parser(sub) -> None:
     idle.add_argument("channel", type=int)
     idle.add_argument("mode", choices=sorted(config.IDLE))
     idle.add_argument("--save", action="store_true")
+    rest = cs.add_parser("rvswd-rest", help="how rvswd rests a port's SWCLK: auto (the probe decides from the target_id), "
+                                            "or high / low fixed (the automatic choice off; debug §3.1)")
+    rest.add_argument("probe")
+    rest.add_argument("channel", type=int, help="the port's SWCLK channel")
+    rest.add_argument("mode", choices=sorted(config.REST_MODE))
+    rest.add_argument("--save", action="store_true")
     dis = cs.add_parser("disable", help="channels the probe never drives or sets up (not on this board)")
     dis.add_argument("probe")
     dis.add_argument("channels", type=int, nargs="+")
@@ -435,6 +441,8 @@ def _config(args) -> int:
             _change(hst, cfg, [config.Label(channel=args.channel, text=args.text)], args.save)
         elif args.action == "idle":
             _change(hst, cfg, [config.Idle(channel=args.channel, mode=args.mode)], args.save)
+        elif args.action == "rvswd-rest":
+            _change(hst, cfg, [config.RvswdRest(channel=args.channel, mode=args.mode)], args.save)
         elif args.action == "disable":
             _change(hst, cfg, [config.Disable(channel=ch) for ch in args.channels], args.save)
         elif args.action == "remove":

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/config.py

@@ -36,6 +36,7 @@ NAMES = tuple(_CFG.names["setting"])                            # the standard i
 ITEM = {k.replace("-", "_"): i + 1 for i, k in enumerate(NAMES)}
 DESCRIBE = _CFG.tlv["describe"]
 IDLE = {k.replace("_", "-"): v for k, v in _CFG.enum["idle_mode"].items()}
+REST_MODE = dict(_CFG.enum["rvswd_rest_mode"])          # rvswd-rest: auto / high / low (debug §3.1)
 STORAGE_STATE = {v: k for k, v in _CFG.enum["storage_state"].items()}
 UNREADABLE = {v: k for k, v in _CFG.enum["storage_unreadable"].items()}
 FORM = _CFG.enum["setting_form"]
@@ -140,6 +141,27 @@ class Passthrough:
         return struct.pack("<HHIB", self.fn, self.rx, self.baud, self.format)
 
 
+@dataclass
+class RvswdRest:
+    """How an rvswd attach without idle_clock rests the SWCLK on `channel` (the port's SWCLK; debug §3.1): auto - the
+    probe's choice from the target_id it reads (also with no item) - or high / low fixed, the automatic choice off for
+    that port. An attach's idle_clock TLV still decides."""
+    channel: int
+    mode: str = "auto"
+    NAME = "rvswd-rest"
+
+    def key(self) -> int:
+        return self.channel
+
+    def value(self) -> bytes:
+        return struct.pack("<H", self.key()) + self.data()
+
+    def data(self) -> bytes:
+        if self.mode not in REST_MODE:
+            raise ValueError(f"rvswd-rest mode {self.mode!r}: one of {', '.join(REST_MODE)}")
+        return bytes([REST_MODE[self.mode]])
+
+
 @dataclass(kw_only=True)
 class ConsolePassthrough:
     """Serial port `port` carries the target's debug console - read by the probe itself over `wire_fn` on (swdio, swclk)
@@ -293,6 +315,8 @@ def decode(name: str, key: int, d: bytes, setting: Setting | None = None, netifs
     try:
         if name == "label":
             return Label(channel=key, text=d.decode("utf-8", "replace"))
+        if name == "rvswd-rest" and len(d) == 1 and d[0] in REST_MODE.values():
+            return RvswdRest(channel=key, mode={v: k for k, v in REST_MODE.items()}[d[0]])
         if name == "idle" and len(d) == 1:
             return Idle(channel=key, mode=_name(IDLE, d[0]))
         if name == "disable" and not d:

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/endpoint.py

@@ -117,7 +117,8 @@ RESET_MODE = _RV.enum["reset_mode"]
 READ_FROM = reg.COMMON.enum["read_from"]                  # position, oldest, now, last_mark (common §1.2)
 STEP_LEFT = _RV.tlv["step_answer"]["step_left"]            # step's answer: the hart could not be halted again (§4.2)
 ITEM = {k.replace("-", "_"): k for k in cfgmod.NAMES}       # the standard items by name (probe.config §1, core §7.7)
-CHANNEL_ITEMS = (ITEM["label"], ITEM["idle"], ITEM["disable"])   # items keyed by a channel (probe.config §1)
+CHANNEL_ITEMS = (ITEM["label"], ITEM["idle"], ITEM["disable"], ITEM["rvswd_rest"])   # keyed by a channel (probe.config §1)
+REST_MODE = cfgmod.REST_MODE
 IDLE_MODE = _CFG.enum["idle_mode"]
 CFG_DESCRIBE = cfgmod.DESCRIBE
 SETTING_FORM = _CFG.enum["setting_form"]
@@ -137,7 +138,18 @@ I2C_FEATURES, SPI_FEATURES = _I2C.enum["features"], _SPI.enum["features"]
 TARGET_ROLES = {"oep.fixture.gpio": {1}, "oep.fixture.uart": {1, 2}, _I2C.name: set(_I2C.enum["role"].values()),
                 _SPI.name: set(_SPI.enum["role"].values())}   # the plan roles each fixture takes
 UART_FORMAT_MASK = 0x1F                                    # the defined format bits (fixture §2)
-_T_SCAN, _T_ATTACH, _T_ATTACH_ANSWER = (reg.WIRE_RVSWD.tlv[k] for k in ("scan", "attach", "attach_answer"))
+_T_SCAN, _T_ATTACH, _T_ATTACH_ANSWER, _T_CONNECTIONS_ANSWER = (
+    reg.WIRE_RVSWD.tlv[k] for k in ("scan", "attach", "attach_answer", "connections_answer"))
+_IDLE_CLOCK = reg.WIRE_RVSWD.enum["idle_clock"]
+
+
+def rvswd_rest(target_id: int | None) -> int:
+    """The rest an rvswd attach without idle_clock uses (debug §3.1): low for a family in the registry's
+    idle_low_family (target_id >> target_id_family.shift), high otherwise and when no target_id was read."""
+    if target_id is None:
+        return _IDLE_CLOCK["high"]
+    family = target_id >> reg.WIRE_RVSWD.enum["target_id_family"]["shift"]
+    return _IDLE_CLOCK["low"] if family in reg.WIRE_RVSWD.enum["idle_low_family"].values() else _IDLE_CLOCK["high"]
 _WIRE_INDEX = reg.WIRE_RVSWD.tlv["unsupported_payload"]["index"]   # scan's candidate index (debug §1)
 ATTACH_METHOD = reg.WIRE_RVSWD.enum["attach_method"]
 GPIO_MODE_MAX = max(_GPIO.enum["mode"].values())           # 6: the modes revision 1 defines are 0-6 (fixture §1)
@@ -542,7 +554,7 @@ class Connection:
 
 
 ITEM_SIZES = {ITEM["idle"]: 1, ITEM["disable"]: 0, ITEM["passthrough"]: 9,     # the data of a fixed length (probe.config §1)
-              ITEM["console_passthrough"]: 13, ITEM["ipv4"]: 14}
+              ITEM["console_passthrough"]: 13, ITEM["ipv4"]: 14, ITEM["rvswd_rest"]: 1}
 PASSTHROUGHS = (ITEM["passthrough"], ITEM["console_passthrough"])
 
 
@@ -2293,8 +2305,11 @@ class Endpoint:
             if tg.havereset:
                 tg.havereset, flags = False, flags | ATTACH_FLAGS["havereset_acked"]
             c = self.conns[cid]
-            if idle_clock is not None:
-                c.idle_clock = idle_clock
+            if rvswd:                                              # the host's TLV, the setting, else from target_id (§3.1)
+                setting = self.config.get((ITEM["rvswd_rest"], pair[1]), bytes([REST_MODE["auto"]]))[0]
+                c.idle_clock = (idle_clock if idle_clock is not None
+                                else _IDLE_CLOCK["high"] if setting == REST_MODE["high"]
+                                else _IDLE_CLOCK["low"] if setting == REST_MODE["low"] else rvswd_rest(c.tid))
             if reset is not None and tg.reset_line not in (None, channel):
                 if method == 1:                                    # a line that resets nothing: halted where it ran
                     tg.halted, tg.dpc = True, tg.reset_vector + 0x2f8
@@ -2308,6 +2323,8 @@ class Endpoint:
             if tg.halted and method == 1:                          # bit3: the probe saw hart 0 halted (§3)
                 flags |= ATTACH_FLAGS["halted"]
                 tail += m.tlv(_T_ATTACH_ANSWER["dpc"], struct.pack("<I", tg.dpc))
+            if rvswd:                                              # the rest in use, always (§3.1)
+                tail += m.tlv(_T_ATTACH_ANSWER["idle_clock"], bytes([c.idle_clock]))
             return self._answer(struct.pack("<IIBI", cid, tg.dmstatus(), flags, c.speed) + tail)
         if op == O["detach"]:
             cid = t.take("I")
@@ -2321,24 +2338,31 @@ class Endpoint:
             first = t.take("B")
             t.tail()
             mine = sorted((c.order, cid) for cid, c in self.conns.items() if c.fn == fn)
-            rows = []
+            rows, rests = [], []
             for _, cid in mine:
                 c = self.conns[cid]
                 tid = b"" if c.tid is None else struct.pack("<I", c.tid)
                 scheme = TARGET_ID_SCHEME["dmi_7f"] if tid else 0
                 rows.append(struct.pack("<IHHIBB", cid, *c.pair, c.speed, scheme, len(tid)) + tid)
-            return m.COMPLETED, m.SUCCESS, self._paged(rows, first)
+                rests.append(c.idle_clock)
+            # rvswd: TLV idle_clock (entry_index, rest) for every entry of the page (§2.1, §3.1)
+            return m.COMPLETED, m.SUCCESS, self._paged(rows, first, rests if rvswd else None)
         return m.REJECTED, m.UNKNOWN_OPERATION, b""
 
-    def _paged(self, rows: list[bytes], first: int) -> bytes:
-        """more(u8) count(u8) the rows from `first` that fit the frame (connections, streams: core §2.3's lists)."""
+    def _paged(self, rows: list[bytes], first: int, rests: list[int] | None = None) -> bytes:
+        """more(u8) count(u8) the rows from `first` that fit the frame (connections, streams: core §2.3's lists);
+        with `rests` (rvswd's connections), each row's TLV idle_clock (entry_index, rest) after them, counted in."""
         budget = self.probe.max_frame - m.RESULT_HEADER - 2
         out: list[bytes] = []
-        for row in rows[first:]:
-            if out and sum(map(len, out)) + len(row) > budget:
+        tail: list[bytes] = []
+        for i, row in enumerate(rows[first:]):
+            extra = b"" if rests is None else m.tlv(_T_CONNECTIONS_ANSWER["idle_clock"], bytes([len(out), rests[first + i]]))
+            if out and sum(map(len, out + tail)) + len(row) + len(extra) > budget:
                 break
             out.append(row)
-        return bytes([int(first + len(out) < len(rows)), len(out)]) + b"".join(out)
+            if extra:
+                tail.append(extra)
+        return bytes([int(first + len(out) < len(rows)), len(out)]) + b"".join(out) + b"".join(tail)
 
     def _attach_methods(self, fn: int) -> set[int]:
         """method 0, and 1 when the wire declares features bit0 attach_halt (debug §3)."""
@@ -3275,6 +3299,8 @@ class Endpoint:
                     return True
                 if mode in (IDLE_MODE["pull_up"], IDLE_MODE["pull_down"]) and mode in self.no_pull.get(key, ()):
                     return True
+            if name == ITEM["rvswd_rest"] and d[0] not in REST_MODE.values():
+                return True                                        # a mode the definition leaves unused (§1)
         return False
 
     def _shown(self, name: str, d: bytes) -> bytes:

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/registry.py

@@ -3,7 +3,7 @@
 
 from types import SimpleNamespace as _NS
 
-REGISTRY_HASH = "0aaae1a1afbb5b02"
+REGISTRY_HASH = "66b19f04290391f3"
 SCHEMA = 1
 PROTOCOL_REVISION = 1
 CONFIRM_REQUEST_MAGIC = 'OEP?'
@@ -42,7 +42,7 @@ PROBE_LINK = _NS(name="oep.probe.link", revision=1, target=None, op={"source": 0
     line_names={}, names={})
 INTERFACES["oep.probe.link"] = PROBE_LINK
 WIRE_RVSWD = _NS(name="oep.wire.rvswd", revision=1, target="RISC-V targets whose debug module is reached over the two-wire RVSWD line", op={"scan": 0x10, "attach": 0x11, "detach": 0x12, "connections": 0x13}, lock_free={0x13},
-    tlv={"describe": {"max_connections": 0x40}, "scan": {"max_speed": 0x01, "idle_clock": 0x03}, "attach": {"idle_clock": 0x03, "reset": 0x04}, "attach_answer": {"target_id": 0x01, "dpc": 0x02}, "unavailable_payload": {"index": 0x40}, "unsupported_payload": {"index": 0x40}}, event={}, enum={"scan_kind": {"riscv_dm": 0x01}, "attach_flags": {"havereset_acked": 0x01, "halted": 0x08}, "features": {"attach_halt": 0x01}, "attach_method": {"run": 0x00, "halt": 0x01}, "pin_role": {"swdio": 0x01, "swclk": 0x02, "reset": 0x03}, "idle_clock": {"high": 0x00, "low": 0x01}}, own={},
+    tlv={"describe": {"max_connections": 0x40}, "scan": {"max_speed": 0x01, "idle_clock": 0x03}, "attach": {"idle_clock": 0x03, "reset": 0x04}, "attach_answer": {"target_id": 0x01, "dpc": 0x02, "idle_clock": 0x03}, "connections_answer": {"idle_clock": 0x02}, "unavailable_payload": {"index": 0x40}, "unsupported_payload": {"index": 0x40}}, event={}, enum={"scan_kind": {"riscv_dm": 0x01}, "attach_flags": {"havereset_acked": 0x01, "halted": 0x08}, "features": {"attach_halt": 0x01}, "attach_method": {"run": 0x00, "halt": 0x01}, "pin_role": {"swdio": 0x01, "swclk": 0x02, "reset": 0x03}, "idle_clock": {"high": 0x00, "low": 0x01}, "target_id_family": {"shift": 0x14}, "idle_low_family": {"ch32l103": 0x103}}, own={},
     line_names={}, names={})
 INTERFACES["oep.wire.rvswd"] = WIRE_RVSWD
 WIRE_SWIO = _NS(name="oep.wire.swio", revision=1, target="RISC-V targets whose debug module is reached over the one-wire SWIO line", op={"scan": 0x10, "attach": 0x11, "detach": 0x12, "connections": 0x13}, lock_free={0x13},
@@ -94,6 +94,6 @@ FIXTURE_CAPTURE_GROUP = _NS(name="oep.fixture.capture-group", revision=1, target
     line_names={}, names={})
 INTERFACES["oep.fixture.capture-group"] = FIXTURE_CAPTURE_GROUP
 PROBE_CONFIG = _NS(name="oep.probe.config", revision=1, target=None, op={"get": 0x10, "set": 0x11, "save": 0x12, "erase": 0x13, "unset": 0x14, "state": 0x15, "network": 0x16}, lock_free={0x10, 0x15, 0x16},
-    tlv={"describe": {"storage": 0x40, "setting": 0x41, "netif": 0x42}}, event={}, enum={"idle_mode": {"hi_z": 0x00, "pull_up": 0x01, "pull_down": 0x02, "output_low": 0x03, "output_high": 0x04}, "ipv4_mode": {"dhcp": 0x00, "static": 0x01}, "network_state": {"off": 0x00, "connecting": 0x01, "up": 0x02, "waiting": 0x03}, "network_reason": {"none": 0x00, "not_found": 0x01, "auth": 0x02, "no_address": 0x03, "other": 0x04}, "setting_form": {"named": 0x00, "bytes": 0x01, "text": 0x02, "u32": 0x03, "ipv4": 0x04, "bool": 0x05}, "setting_flag": {"secret": 0x01, "restart": 0x02}, "storage_state": {"none": 0x00, "applied": 0x01, "unreadable": 0x02, "partial": 0x03}, "storage_unreadable": {"none": 0x00, "form": 0x01, "item": 0x02, "capacity": 0x03}}, own={},
-    line_names={'nrst': 'the target reset line (Host only)', 'power_hi': 'target power on when high (Host only)', 'power_lo': 'target power on when low (Host only)'}, names={'setting': {'label': 'key channel; text 1-32 bytes', 'idle': 'key channel; mode(u8)', 'disable': 'key channel; no data', 'passthrough': 'key port; fn(u16) rx(u16) baud(u32) format(u8)', 'console-passthrough': 'key port; wire_fn(u16) swdio(u16) swclk(u16) max_speed(u32) console_fn(u16) mechanism(u8)', 'wifi': 'key entry; ssid_len(u8) ssid pass_len(u8) passphrase; passphrase write-only', 'ipv4': 'key netif; mode(u8) address(4) prefix(u8) gateway(4) dns(4)'}, 'netif': {'wifi': 'Wi-Fi station', 'ethernet': 'wired Ethernet'}})
+    tlv={"describe": {"storage": 0x40, "setting": 0x41, "netif": 0x42}}, event={}, enum={"idle_mode": {"hi_z": 0x00, "pull_up": 0x01, "pull_down": 0x02, "output_low": 0x03, "output_high": 0x04}, "rvswd_rest_mode": {"auto": 0x00, "high": 0x01, "low": 0x02}, "ipv4_mode": {"dhcp": 0x00, "static": 0x01}, "network_state": {"off": 0x00, "connecting": 0x01, "up": 0x02, "waiting": 0x03}, "network_reason": {"none": 0x00, "not_found": 0x01, "auth": 0x02, "no_address": 0x03, "other": 0x04}, "setting_form": {"named": 0x00, "bytes": 0x01, "text": 0x02, "u32": 0x03, "ipv4": 0x04, "bool": 0x05}, "setting_flag": {"secret": 0x01, "restart": 0x02}, "storage_state": {"none": 0x00, "applied": 0x01, "unreadable": 0x02, "partial": 0x03}, "storage_unreadable": {"none": 0x00, "form": 0x01, "item": 0x02, "capacity": 0x03}}, own={},
+    line_names={'swdio': 'the debug data line (2 wires: rvswd, swd) (Host only)', 'swclk': 'the debug clock line (2 wires: rvswd, swd) (Host only)', 'swio': 'the one debug wire (swio) (Host only)', 'rx': 'the fixture UART receive, wired to the target TX (Host only)', 'tx': 'the fixture UART transmit, wired to the target RX (Host only)', 'nrst': 'the target reset line (Host only)', 'power_hi': 'target power on when high (Host only)', 'power_lo': 'target power on when low (Host only)'}, names={'setting': {'label': 'key channel; text 1-32 bytes', 'idle': 'key channel; mode(u8)', 'disable': 'key channel; no data', 'passthrough': 'key port; fn(u16) rx(u16) baud(u32) format(u8)', 'console-passthrough': 'key port; wire_fn(u16) swdio(u16) swclk(u16) max_speed(u32) console_fn(u16) mechanism(u8)', 'wifi': 'key entry; ssid_len(u8) ssid pass_len(u8) passphrase; passphrase write-only', 'ipv4': 'key netif; mode(u8) address(4) prefix(u8) gateway(4) dns(4)', 'rvswd-rest': "key channel (the port's SWCLK); mode(u8): rvswd_rest_mode"}, 'netif': {'wifi': 'Wi-Fi station', 'ethernet': 'wired Ethernet'}})
 INTERFACES["oep.probe.config"] = PROBE_CONFIG

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/riscv.py

@@ -197,6 +197,10 @@ class WireBase(Interface):
     ONE_WIRE = False                                   # swio: swclk is 0xFFFF (§3)
     DEFAULT_MAX_SPEED = 1_000_000                      # when the wire declares no max_clock_hz either
 
+    def _is_rvswd(self) -> bool:
+        """The rest TLVs are rvswd's (debug §3.1); the name as opened, else the class's."""
+        return getattr(self, "name", self.NAME) == "oep.wire.rvswd"
+
     def _description(self) -> catalog.Description:
         return catalog.decode_description(b"".join(catalog.tlv(t, v) for t, v in describe(self.host, self.fn)))
 
@@ -307,17 +311,22 @@ class WireBase(Interface):
             for _ in range(count):
                 conn, swdio, swclk, speed, scheme, n = rd.take("IHHIBB")
                 tid = rd.bytes(n)
-                page.append([conn, (swdio, swclk), speed, (scheme, tid) if scheme else None, None])
+                page.append([conn, (swdio, swclk), speed, (scheme, tid) if scheme else None, None, None])
             for tag, value in m.split_tlvs(rd.rest()):
                 # entry_index(u8) targetsel(u32), repeatable; bit 7 in an answer: an unknown tag (core §2.2, §2.3)
                 if tag == _SELECTED_TARGET and len(value) == 5 and value[0] < len(page):
                     page[value[0]][4] = struct.unpack_from("<I", value, 1)[0]
+                # rvswd: entry_index(u8) idle_clock(u8) for every entry (debug §2.1, §3.1)
+                if self._is_rvswd() and tag == _REST and len(value) == 2 and value[0] < len(page):
+                    page[value[0]][5] = _REST_NAMES.get(value[1])
             out += [ConnectionInfo(*row) for row in page]
             if not more or not count or len(out) > 0xFF:
                 return out
 
 
 _SELECTED_TARGET = reg.WIRE_SWD.tlv["connections_answer"]["selected_target"]
+_REST = reg.WIRE_RVSWD.tlv["connections_answer"]["idle_clock"]
+_REST_NAMES = {v: k for k, v in reg.WIRE_RVSWD.enum["idle_clock"].items()}
 
 
 @dataclass(frozen=True)
@@ -329,6 +338,7 @@ class ConnectionInfo:
     speed_hz: int
     target_id: tuple[int, bytes] | None
     targetsel: int | None = None
+    idle_clock: str | None = None      # rvswd: "high" / "low", the rest the connection uses (debug §3.1)
 
 
 class Wire(WireBase):
@@ -342,6 +352,7 @@ class Wire(WireBase):
     SCHEME_DMI_7F = reg.COMMON.enum["target_id_scheme"]["dmi_7f"]   # the u32 at DMI 0x7F (oep-if-debug §3)
 
     TAG_DPC = reg.WIRE_RVSWD.tlv["attach_answer"]["dpc"]
+    TAG_REST = reg.WIRE_RVSWD.tlv["attach_answer"]["idle_clock"]
 
     def __init__(self, hst: h.Host, name: str = "oep.wire.rvswd"):
         super().__init__(hst, name)
@@ -397,6 +408,10 @@ class Wire(WireBase):
         dpc = tail.get(self.TAG_DPC)
         # dpc is a u32: a value of another length is broken, not used (core §2.3)
         self.dpc = struct.unpack("<I", dpc)[0] if self.halted and dpc is not None and len(dpc) == 4 else None
+        # rvswd: the rest the connection uses, the host's or the probe's choice from target_id (debug §3.1)
+        rest = tail.get(self.TAG_REST) if self._is_rvswd() else None
+        names = {v: k for k, v in self.IDLE_CLOCK.items()}
+        self.idle_clock = names.get(rest[0]) if rest is not None and len(rest) == 1 else None
         return conn, status
 
     def attach_under_reset(self, channel: int, hold_ms: int = 20, max_speed: int | None = None,

{oep_client_python-0.0.32 → oep_client_python-0.0.33}/src/oep_client/virtual_bench.py

@@ -262,7 +262,7 @@ def _setting(name: str, keys: int, form: int = 0, max_len: int = 0, flags: int =
 
 
 def _config(fn: int, instance: int, storage: int = 4096, *, channels: int = 64, ports: int = 4, netifs=(), wifi_entries: int = 4,
-            own=()) -> Offered:
+            own=(), rvswd: bool = False) -> Offered:
     """oep.probe.config's declarations (probe.config §4): the standard items label / idle / disable (keys: the
     channels), passthrough / console-passthrough (keys: the transports), with `netifs` (names) wifi / ipv4 and the
     network op; `own`: the probe's own items as (name, form, keys, max_len, flags) (§1.6). storage 0 = none - no storage
@@ -274,6 +274,8 @@ def _config(fn: int, instance: int, storage: int = 4096, *, channels: int = 64,
         if "wifi" in netifs:
             settings.append(_setting("wifi", wifi_entries))
         settings.append(_setting("ipv4", len(netifs) + 1))
+    if rvswd:                                              # its automatic rest can be turned off per port (debug §3.1)
+        settings.append(_setting("rvswd-rest", channels))
     settings += [_setting(name, keys, form, max_len, flags) for name, form, keys, max_len, flags in own]
     return Offered(fn, instance, "oep.probe.config", ops_of("oep.probe.config", *drop)
         + ((catalog.u32(_CFG["storage"], storage),) if storage else ()) + tuple(settings)
@@ -388,7 +390,7 @@ def p4_x035() -> VirtualProbe:
                     max_stretch_us=100_000),                                                       # stretch
         Offered(9, 0, "oep.fixture.spi-target", _roles({1: pins, 2: pins, 3: pins, 4: pins})
                 + _spi_decl(max_length=64, max_hz=3_000_000, features=0b1, queue_depth=8)),             # LSB first
-        _config(10, 0, channels=55, ports=4, netifs=("ethernet",)),
+        _config(10, 0, channels=55, ports=4, netifs=("ethernet",), rvswd=True),
         # the P4's ADC1 (GPIO16-23): one ADC for all its channels, 611 Hz - 83.3 kHz in all; ESP32-style attenuations
         Offered(11, 0, "oep.fixture.analog", _roles({k: list(range(16, 24)) for k in range(4)})
             + _analog_decl([(0, 0, 950), (1, 0, 1250), (2, 0, 1750), (3, 0, 3100)], 65536, 611, 83_333),
@@ -465,7 +467,7 @@ def p4_bench() -> VirtualProbe:
         _console(3),
         _gpio(4, pins),
         _uart(5, 0, pins, 3_000_000),
-        _config(6, 0, channels=55, ports=4),
+        _config(6, 0, channels=55, ports=4, rvswd=True),
         _link(7),
         _plan(8),
         _restart(9),