Cocotb 2.0 changes

value_change, kill -> cancel

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

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))

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))
 

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

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:

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))

cocotbext/eth/version.py

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

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

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

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

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

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