Change kill to cancel
Some checks failed
build / Build distributions (push) Successful in 7s
build / deploy (push) Has been skipped
build / Build distributions (release) Successful in 7s
build / deploy (release) Successful in 7s
Regression Tests / Python 3.10 (push) Has been cancelled
Regression Tests / Python 3.11 (push) Has been cancelled
Regression Tests / Python 3.12 (push) Has been cancelled
Regression Tests / Python 3.13 (push) Has been cancelled
Regression Tests / Python 3.8 (push) Has been cancelled
Regression Tests / Python 3.9 (push) Has been cancelled

This commit is contained in:
2026-02-08 13:51:40 -08:00
parent 9f8d271384
commit 80b4095d73
8 changed files with 21 additions and 21 deletions

View File

@@ -108,7 +108,7 @@ class ApbPause:
def set_pause_generator(self, generator=None):
if self._pause_cr is not None:
self._pause_cr.kill()
self._pause_cr.cancel()
self._pause_cr = None
self._pause_generator = generator
@@ -310,7 +310,7 @@ class ApbMaster(ApbPause, Region, Reset):
self.bus.penable.value = False
if self._run_cr is not None:
self._run_cr.kill()
self._run_cr.cancel()
self._run_cr = None
def flush_cmd(cmd):
@@ -519,7 +519,7 @@ class ApbSlave(ApbPause, Reset):
self.bus.pready.value = False
if self._run_cr is not None:
self._run_cr.kill()
self._run_cr.cancel()
self._run_cr = None
else:
self.log.info("Reset de-asserted")

View File

@@ -129,7 +129,7 @@ class TagContext:
def _flush(self):
flushed_cmds = []
if self._cr is not None:
self._cr.kill()
self._cr.cancel()
self._cr = None
self._manager._set_idle(self)
if self._current_cmd is not None:
@@ -431,10 +431,10 @@ class AxiMasterWrite(Region, Reset):
if state:
self.log.info("Reset asserted")
if self._process_write_cr is not None:
self._process_write_cr.kill()
self._process_write_cr.cancel()
self._process_write_cr = None
if self._process_write_resp_cr is not None:
self._process_write_resp_cr.kill()
self._process_write_resp_cr.cancel()
self._process_write_resp_cr = None
self.aw_channel.clear()
@@ -842,10 +842,10 @@ class AxiMasterRead(Region, Reset):
if state:
self.log.info("Reset asserted")
if self._process_read_cr is not None:
self._process_read_cr.kill()
self._process_read_cr.cancel()
self._process_read_cr = None
if self._process_read_resp_cr is not None:
self._process_read_resp_cr.kill()
self._process_read_resp_cr.cancel()
self._process_read_resp_cr = None
self.ar_channel.clear()

View File

@@ -99,7 +99,7 @@ class AxiSlaveWrite(Reset):
if state:
self.log.info("Reset asserted")
if self._process_write_cr is not None:
self._process_write_cr.kill()
self._process_write_cr.cancel()
self._process_write_cr = None
self.aw_channel.clear()
@@ -263,7 +263,7 @@ class AxiSlaveRead(Reset):
if state:
self.log.info("Reset asserted")
if self._process_read_cr is not None:
self._process_read_cr.kill()
self._process_read_cr.cancel()
self._process_read_cr = None
self.ar_channel.clear()

View File

@@ -211,10 +211,10 @@ class AxiLiteMasterWrite(Region, Reset):
if state:
self.log.info("Reset asserted")
if self._process_write_cr is not None:
self._process_write_cr.kill()
self._process_write_cr.cancel()
self._process_write_cr = None
if self._process_write_resp_cr is not None:
self._process_write_resp_cr.kill()
self._process_write_resp_cr.cancel()
self._process_write_resp_cr = None
self.aw_channel.clear()
@@ -463,10 +463,10 @@ class AxiLiteMasterRead(Region, Reset):
if state:
self.log.info("Reset asserted")
if self._process_read_cr is not None:
self._process_read_cr.kill()
self._process_read_cr.cancel()
self._process_read_cr = None
if self._process_read_resp_cr is not None:
self._process_read_resp_cr.kill()
self._process_read_resp_cr.cancel()
self._process_read_resp_cr = None
self.ar_channel.clear()

View File

@@ -93,7 +93,7 @@ class AxiLiteSlaveWrite(Reset):
if state:
self.log.info("Reset asserted")
if self._process_write_cr is not None:
self._process_write_cr.kill()
self._process_write_cr.cancel()
self._process_write_cr = None
self.aw_channel.clear()
@@ -212,7 +212,7 @@ class AxiLiteSlaveRead(Reset):
if state:
self.log.info("Reset asserted")
if self._process_read_cr is not None:
self._process_read_cr.kill()
self._process_read_cr.cancel()
self._process_read_cr = None
self.ar_channel.clear()

View File

@@ -369,7 +369,7 @@ class AxiStreamBase(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
@@ -408,7 +408,7 @@ class AxiStreamPause:
def set_pause_generator(self, generator=None):
if self._pause_cr is not None:
self._pause_cr.kill()
self._pause_cr.cancel()
self._pause_cr = None
self._pause_generator = generator

View File

@@ -153,7 +153,7 @@ class StreamBase(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
@@ -192,7 +192,7 @@ class StreamPause:
def set_pause_generator(self, generator=None):
if self._pause_cr is not None:
self._pause_cr.kill()
self._pause_cr.cancel()
self._pause_cr = None
self._pause_generator = generator

View File

@@ -1 +1 @@
__version__ = "0.1.28"
__version__ = "0.1.30"