From 1636003e2cbd1b5b06eccf6df938cbc4e42003ac Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Sun, 8 Feb 2026 13:48:23 -0800 Subject: [PATCH] Cocotb 2.0 changes value_change, kill -> cancel --- cocotbext/eth/eth_mac.py | 6 +++--- cocotbext/eth/gmii.py | 6 +++--- cocotbext/eth/mii.py | 6 +++--- cocotbext/eth/ptp.py | 2 +- cocotbext/eth/reset.py | 2 +- cocotbext/eth/rgmii.py | 6 +++--- cocotbext/eth/version.py | 2 +- cocotbext/eth/xgmii.py | 4 ++-- tests/gmii/test_gmii.py | 2 +- tests/mii/test_mii.py | 2 +- tests/rgmii/test_rgmii.py | 2 +- tests/xgmii/test_xgmii.py | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cocotbext/eth/eth_mac.py b/cocotbext/eth/eth_mac.py index 47407ac..c5c9930 100644 --- a/cocotbext/eth/eth_mac.py +++ b/cocotbext/eth/eth_mac.py @@ -249,10 +249,10 @@ class EthMacTx(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None if self._run_ts_cr is not None: - self._run_ts_cr.kill() + self._run_ts_cr.cancel() self._run_ts_cr = None if self.ptp_ts_valid is not None: @@ -471,7 +471,7 @@ class EthMacRx(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False diff --git a/cocotbext/eth/gmii.py b/cocotbext/eth/gmii.py index 902da65..7c45c31 100644 --- a/cocotbext/eth/gmii.py +++ b/cocotbext/eth/gmii.py @@ -239,7 +239,7 @@ class GmiiSource(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -433,7 +433,7 @@ class GmiiSink(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -546,7 +546,7 @@ class GmiiPhy: raise ValueError("Invalid speed selection") if self._clock_cr is not None: - self._clock_cr.kill() + self._clock_cr.cancel() if self.speed == 1000e6: self._clock_cr = cocotb.start_soon(self._run_clocks(8*1e9/self.speed)) diff --git a/cocotbext/eth/mii.py b/cocotbext/eth/mii.py index 9643aff..b8ba1ef 100644 --- a/cocotbext/eth/mii.py +++ b/cocotbext/eth/mii.py @@ -140,7 +140,7 @@ class MiiSource(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -324,7 +324,7 @@ class MiiSink(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -432,7 +432,7 @@ class MiiPhy: raise ValueError("Invalid speed selection") if self._clock_cr is not None: - self._clock_cr.kill() + self._clock_cr.cancel() self._clock_cr = cocotb.start_soon(self._run_clocks(4*1e9/self.speed)) diff --git a/cocotbext/eth/ptp.py b/cocotbext/eth/ptp.py index c1f4eed..a77dd63 100644 --- a/cocotbext/eth/ptp.py +++ b/cocotbext/eth/ptp.py @@ -198,7 +198,7 @@ class PtpClock(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.ts_tod_s = 0 diff --git a/cocotbext/eth/reset.py b/cocotbext/eth/reset.py index 8d11fa3..959b3fa 100644 --- a/cocotbext/eth/reset.py +++ b/cocotbext/eth/reset.py @@ -56,7 +56,7 @@ class Reset: async def _run_reset(self, reset_signal, active_level): while True: - await Edge(reset_signal) + await reset_signal.value_change try: level = bool(int(reset_signal.value)) except ValueError: diff --git a/cocotbext/eth/rgmii.py b/cocotbext/eth/rgmii.py index 34c0012..a5d8058 100644 --- a/cocotbext/eth/rgmii.py +++ b/cocotbext/eth/rgmii.py @@ -140,7 +140,7 @@ class RgmiiSource(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -347,7 +347,7 @@ class RgmiiSink(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -470,7 +470,7 @@ class RgmiiPhy: raise ValueError("Invalid speed selection") if self._clock_cr is not None: - self._clock_cr.kill() + self._clock_cr.cancel() if self.speed == 1000e6: self._clock_cr = cocotb.start_soon(self._run_clock(8*1e9/self.speed)) diff --git a/cocotbext/eth/version.py b/cocotbext/eth/version.py index 9eb734d..e8438af 100644 --- a/cocotbext/eth/version.py +++ b/cocotbext/eth/version.py @@ -1 +1 @@ -__version__ = "0.1.23" +__version__ = "0.1.24" diff --git a/cocotbext/eth/xgmii.py b/cocotbext/eth/xgmii.py index bf78d23..19a8083 100644 --- a/cocotbext/eth/xgmii.py +++ b/cocotbext/eth/xgmii.py @@ -250,7 +250,7 @@ class XgmiiSource(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False @@ -461,7 +461,7 @@ class XgmiiSink(Reset): if state: self.log.info("Reset asserted") if self._run_cr is not None: - self._run_cr.kill() + self._run_cr.cancel() self._run_cr = None self.active = False diff --git a/tests/gmii/test_gmii.py b/tests/gmii/test_gmii.py index 954a806..7b74fa1 100644 --- a/tests/gmii/test_gmii.py +++ b/tests/gmii/test_gmii.py @@ -70,7 +70,7 @@ class TB: def set_enable_generator(self, generator=None): if self._enable_cr is not None: - self._enable_cr.kill() + self._enable_cr.cancel() self._enable_cr = None self._enable_generator = generator diff --git a/tests/mii/test_mii.py b/tests/mii/test_mii.py index cda0100..6f5e2bc 100644 --- a/tests/mii/test_mii.py +++ b/tests/mii/test_mii.py @@ -69,7 +69,7 @@ class TB: def set_enable_generator(self, generator=None): if self._enable_cr is not None: - self._enable_cr.kill() + self._enable_cr.cancel() self._enable_cr = None self._enable_generator = generator diff --git a/tests/rgmii/test_rgmii.py b/tests/rgmii/test_rgmii.py index c348deb..206df29 100644 --- a/tests/rgmii/test_rgmii.py +++ b/tests/rgmii/test_rgmii.py @@ -68,7 +68,7 @@ class TB: def set_enable_generator(self, generator=None): if self._enable_cr is not None: - self._enable_cr.kill() + self._enable_cr.cancel() self._enable_cr = None self._enable_generator = generator diff --git a/tests/xgmii/test_xgmii.py b/tests/xgmii/test_xgmii.py index 9854311..02702da 100644 --- a/tests/xgmii/test_xgmii.py +++ b/tests/xgmii/test_xgmii.py @@ -68,7 +68,7 @@ class TB: def set_enable_generator(self, generator=None): if self._enable_cr is not None: - self._enable_cr.kill() + self._enable_cr.cancel() self._enable_cr = None self._enable_generator = generator