diff --git a/cocotbext/axi/apb.py b/cocotbext/axi/apb.py index c302f56..e921d5c 100644 --- a/cocotbext/axi/apb.py +++ b/cocotbext/axi/apb.py @@ -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") diff --git a/cocotbext/axi/axi_master.py b/cocotbext/axi/axi_master.py index d041211..30072e3 100644 --- a/cocotbext/axi/axi_master.py +++ b/cocotbext/axi/axi_master.py @@ -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() diff --git a/cocotbext/axi/axi_slave.py b/cocotbext/axi/axi_slave.py index 5f10107..2f0a709 100644 --- a/cocotbext/axi/axi_slave.py +++ b/cocotbext/axi/axi_slave.py @@ -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() diff --git a/cocotbext/axi/axil_master.py b/cocotbext/axi/axil_master.py index d40a1ef..8245ced 100644 --- a/cocotbext/axi/axil_master.py +++ b/cocotbext/axi/axil_master.py @@ -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() diff --git a/cocotbext/axi/axil_slave.py b/cocotbext/axi/axil_slave.py index 3214d31..a775137 100644 --- a/cocotbext/axi/axil_slave.py +++ b/cocotbext/axi/axil_slave.py @@ -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() diff --git a/cocotbext/axi/axis.py b/cocotbext/axi/axis.py index 6a4429e..88a679e 100644 --- a/cocotbext/axi/axis.py +++ b/cocotbext/axi/axis.py @@ -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 diff --git a/cocotbext/axi/stream.py b/cocotbext/axi/stream.py index 0aa6625..965eb42 100644 --- a/cocotbext/axi/stream.py +++ b/cocotbext/axi/stream.py @@ -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 diff --git a/cocotbext/axi/version.py b/cocotbext/axi/version.py index f7ee773..887b2e7 100644 --- a/cocotbext/axi/version.py +++ b/cocotbext/axi/version.py @@ -1 +1 @@ -__version__ = "0.1.28" +__version__ = "0.1.30"