Cocotb 2.0 changes
Some checks are pending
Regression Tests / Python 3.10 (push) Waiting to run
Regression Tests / Python 3.11 (push) Waiting to run
Regression Tests / Python 3.12 (push) Waiting to run
Regression Tests / Python 3.13 (push) Waiting to run
Regression Tests / Python 3.8 (push) Waiting to run
Regression Tests / Python 3.9 (push) Waiting to run
build / Build distributions (push) Successful in 8s
build / deploy (push) Has been skipped

value_change, kill -> cancel
This commit is contained in:
2026-02-08 13:48:23 -08:00
parent bebafc3f73
commit 1636003e2c
12 changed files with 21 additions and 21 deletions

View File

@@ -249,10 +249,10 @@ class EthMacTx(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
if self._run_ts_cr is not None: if self._run_ts_cr is not None:
self._run_ts_cr.kill() self._run_ts_cr.cancel()
self._run_ts_cr = None self._run_ts_cr = None
if self.ptp_ts_valid is not None: if self.ptp_ts_valid is not None:
@@ -471,7 +471,7 @@ class EthMacRx(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False

View File

@@ -239,7 +239,7 @@ class GmiiSource(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -433,7 +433,7 @@ class GmiiSink(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -546,7 +546,7 @@ class GmiiPhy:
raise ValueError("Invalid speed selection") raise ValueError("Invalid speed selection")
if self._clock_cr is not None: if self._clock_cr is not None:
self._clock_cr.kill() self._clock_cr.cancel()
if self.speed == 1000e6: if self.speed == 1000e6:
self._clock_cr = cocotb.start_soon(self._run_clocks(8*1e9/self.speed)) self._clock_cr = cocotb.start_soon(self._run_clocks(8*1e9/self.speed))

View File

@@ -140,7 +140,7 @@ class MiiSource(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -324,7 +324,7 @@ class MiiSink(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -432,7 +432,7 @@ class MiiPhy:
raise ValueError("Invalid speed selection") raise ValueError("Invalid speed selection")
if self._clock_cr is not None: 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)) self._clock_cr = cocotb.start_soon(self._run_clocks(4*1e9/self.speed))

View File

@@ -198,7 +198,7 @@ class PtpClock(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.ts_tod_s = 0 self.ts_tod_s = 0

View File

@@ -56,7 +56,7 @@ class Reset:
async def _run_reset(self, reset_signal, active_level): async def _run_reset(self, reset_signal, active_level):
while True: while True:
await Edge(reset_signal) await reset_signal.value_change
try: try:
level = bool(int(reset_signal.value)) level = bool(int(reset_signal.value))
except ValueError: except ValueError:

View File

@@ -140,7 +140,7 @@ class RgmiiSource(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -347,7 +347,7 @@ class RgmiiSink(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -470,7 +470,7 @@ class RgmiiPhy:
raise ValueError("Invalid speed selection") raise ValueError("Invalid speed selection")
if self._clock_cr is not None: if self._clock_cr is not None:
self._clock_cr.kill() self._clock_cr.cancel()
if self.speed == 1000e6: if self.speed == 1000e6:
self._clock_cr = cocotb.start_soon(self._run_clock(8*1e9/self.speed)) self._clock_cr = cocotb.start_soon(self._run_clock(8*1e9/self.speed))

View File

@@ -1 +1 @@
__version__ = "0.1.23" __version__ = "0.1.24"

View File

@@ -250,7 +250,7 @@ class XgmiiSource(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False
@@ -461,7 +461,7 @@ class XgmiiSink(Reset):
if state: if state:
self.log.info("Reset asserted") self.log.info("Reset asserted")
if self._run_cr is not None: if self._run_cr is not None:
self._run_cr.kill() self._run_cr.cancel()
self._run_cr = None self._run_cr = None
self.active = False self.active = False

View File

@@ -70,7 +70,7 @@ class TB:
def set_enable_generator(self, generator=None): def set_enable_generator(self, generator=None):
if self._enable_cr is not None: if self._enable_cr is not None:
self._enable_cr.kill() self._enable_cr.cancel()
self._enable_cr = None self._enable_cr = None
self._enable_generator = generator self._enable_generator = generator

View File

@@ -69,7 +69,7 @@ class TB:
def set_enable_generator(self, generator=None): def set_enable_generator(self, generator=None):
if self._enable_cr is not None: if self._enable_cr is not None:
self._enable_cr.kill() self._enable_cr.cancel()
self._enable_cr = None self._enable_cr = None
self._enable_generator = generator self._enable_generator = generator

View File

@@ -68,7 +68,7 @@ class TB:
def set_enable_generator(self, generator=None): def set_enable_generator(self, generator=None):
if self._enable_cr is not None: if self._enable_cr is not None:
self._enable_cr.kill() self._enable_cr.cancel()
self._enable_cr = None self._enable_cr = None
self._enable_generator = generator self._enable_generator = generator

View File

@@ -68,7 +68,7 @@ class TB:
def set_enable_generator(self, generator=None): def set_enable_generator(self, generator=None):
if self._enable_cr is not None: if self._enable_cr is not None:
self._enable_cr.kill() self._enable_cr.cancel()
self._enable_cr = None self._enable_cr = None
self._enable_generator = generator self._enable_generator = generator