Skip to content

Commit

Permalink
Remove deprecated assignments
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexforencich
alexforencich committed Nov 7, 2021
1 parent 448451e commit 73fe547
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 58 deletions.
10 changes: 5 additions & 5 deletions cocotbext/eth/eth_mac.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _handle_reset(self, state):
self._run_ts_cr = None

if self.ptp_ts_valid:
self.ptp_ts_valid <= 0
self.ptp_ts_valid.value = 0

self.active = False

Expand Down Expand Up @@ -324,14 +324,14 @@ async def _run(self):
async def _run_ts(self):
while True:
await RisingEdge(self.clock)
self.ptp_ts_valid <= 0
self.ptp_ts_valid.value = 0

if not self.ts_queue.empty():
ts, tag = self.ts_queue.get_nowait()
self.ptp_ts <= ts
self.ptp_ts.value = ts
if self.ptp_ts_tag is not None:
self.ptp_ts_tag <= tag
self.ptp_ts_valid <= 1
self.ptp_ts_tag.value = tag
self.ptp_ts_valid.value = 1


class EthMacRx(Reset):
Expand Down
26 changes: 13 additions & 13 deletions cocotbext/eth/gmii.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ def _handle_reset(self, state):
self._run_cr = None

self.active = False
self.data <= 0
self.data.value = 0
if self.er is not None:
self.er <= 0
self.dv <= 0
self.er.value = 0
self.dv.value = 0

if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
Expand Down Expand Up @@ -308,10 +308,10 @@ async def _run(self):
d = frame_data[frame_offset]
if frame.sim_time_sfd is None and d in (EthPre.SFD, 0xD):
frame.sim_time_sfd = get_sim_time()
self.data <= d
self.data.value = d
if self.er is not None:
self.er <= frame_error[frame_offset]
self.dv <= 1
self.er.value = frame_error[frame_offset]
self.dv.value = 1
frame_offset += 1

if frame_offset >= len(frame_data):
Expand All @@ -321,10 +321,10 @@ async def _run(self):
frame = None
self.current_frame = None
else:
self.data <= 0
self.data.value = 0
if self.er is not None:
self.er <= 0
self.dv <= 0
self.er.value = 0
self.dv.value = 0
self.active = False
self.idle_event.set()

Expand Down Expand Up @@ -536,8 +536,8 @@ async def _run_clocks(self, period):

while True:
await t
self.rx_clk <= 1
self.tx_clk <= 1
self.rx_clk.value = 1
self.tx_clk.value = 1
await t
self.rx_clk <= 0
self.tx_clk <= 0
self.rx_clk.value = 0
self.tx_clk.value = 0
26 changes: 13 additions & 13 deletions cocotbext/eth/mii.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ def _handle_reset(self, state):
self._run_cr = None

self.active = False
self.data <= 0
self.data.value = 0
if self.er is not None:
self.er <= 0
self.dv <= 0
self.er.value = 0
self.dv.value = 0

if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
Expand Down Expand Up @@ -202,10 +202,10 @@ async def _run(self):
d = frame_data[frame_offset]
if frame.sim_time_sfd is None and d == 0xD:
frame.sim_time_sfd = get_sim_time()
self.data <= d
self.data.value = d
if self.er is not None:
self.er <= frame_error[frame_offset]
self.dv <= 1
self.er.value = frame_error[frame_offset]
self.dv.value = 1
frame_offset += 1

if frame_offset >= len(frame_data):
Expand All @@ -215,10 +215,10 @@ async def _run(self):
frame = None
self.current_frame = None
else:
self.data <= 0
self.data.value = 0
if self.er is not None:
self.er <= 0
self.dv <= 0
self.er.value = 0
self.dv.value = 0
self.active = False
self.idle_event.set()

Expand Down Expand Up @@ -410,8 +410,8 @@ async def _run_clocks(self, period):

while True:
await t
self.tx_clk <= 1
self.rx_clk <= 1
self.tx_clk.value = 1
self.rx_clk.value = 1
await t
self.tx_clk <= 0
self.rx_clk <= 0
self.tx_clk.value = 0
self.rx_clk.value = 0
26 changes: 13 additions & 13 deletions cocotbext/eth/ptp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,13 @@ def _handle_reset(self, state):
self.ts_64_fns = 0
self.drift_cnt = 0
if self.ts_96 is not None:
self.ts_96 <= 0
self.ts_96.value = 0
if self.ts_64 is not None:
self.ts_64 <= 0
self.ts_64.value = 0
if self.ts_step is not None:
self.ts_step <= 0
self.ts_step.value = 0
if self.pps is not None:
self.pps <= 0
self.pps.value = 0
else:
self.log.info("Reset de-asserted")
if self._run_cr is None:
Expand All @@ -212,11 +212,11 @@ async def _run(self):
await RisingEdge(self.clock)

if self.ts_step is not None:
self.ts_step <= self.ts_updated
self.ts_step.value = self.ts_updated
self.ts_updated = False

if self.pps is not None:
self.pps <= 0
self.pps.value = 0

# increment 96 bit timestamp
if self.ts_96 is not None or self.pps is not None:
Expand All @@ -229,13 +229,13 @@ async def _run(self):
self.ts_96_s += 1
t -= (1000000000 << 16)
if self.pps is not None:
self.pps <= 1
self.pps.value = 1

self.ts_96_fns = t & 0xffff
self.ts_96_ns = t >> 16

if self.ts_96 is not None:
self.ts_96 <= (self.ts_96_s << 48) | (self.ts_96_ns << 16) | (self.ts_96_fns)
self.ts_96.value = (self.ts_96_s << 48) | (self.ts_96_ns << 16) | (self.ts_96_fns)

# increment 64 bit timestamp
if self.ts_64 is not None:
Expand All @@ -247,7 +247,7 @@ async def _run(self):
self.ts_64_fns = t & 0xffff
self.ts_64_ns = t >> 16

self.ts_64 <= (self.ts_64_ns << 16) | self.ts_64_fns
self.ts_64.value = (self.ts_64_ns << 16) | self.ts_64_fns

if self.drift_rate:
if self.drift_cnt > 0:
Expand Down Expand Up @@ -286,7 +286,7 @@ def __init__(self, ts_96=None, ts_64=None, pps=None, clock=None, *args, **kwargs
if self.ts_64 is not None:
self.ts_64.setimmediatevalue(0)
if self.pps is not None:
self.pps <= 0
self.pps.value = 0

self._run_cr = cocotb.fork(self._run())

Expand Down Expand Up @@ -321,12 +321,12 @@ async def _run(self):
self.ts_96_fns = self.ts_64_fns

if self.ts_96 is not None:
self.ts_96 <= (self.ts_96_s << 48) | (self.ts_96_ns << 16) | self.ts_96_fns
self.ts_96.value = (self.ts_96_s << 48) | (self.ts_96_ns << 16) | self.ts_96_fns

if self.ts_64 is not None:
self.ts_64 <= (self.ts_64_ns << 16) | self.ts_64_fns
self.ts_64.value = (self.ts_64_ns << 16) | self.ts_64_fns

if self.pps is not None:
self.pps <= int(self.last_ts_96_s != self.ts_96_s)
self.pps.value = int(self.last_ts_96_s != self.ts_96_s)

self.last_ts_96_s = self.ts_96_s
16 changes: 8 additions & 8 deletions cocotbext/eth/rgmii.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ def _handle_reset(self, state):
self._run_cr = None

self.active = False
self.data <= 0
self.ctrl <= 0
self.data.value = 0
self.ctrl.value = 0

if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
Expand Down Expand Up @@ -170,8 +170,8 @@ async def _run(self):
await RisingEdge(self.clock)

# send high nibble after rising edge, leading in to falling edge
self.data <= d >> 4
self.ctrl <= en ^ er
self.data.value = d >> 4
self.ctrl.value = en ^ er

if self.enable is None or self.enable.value:
if ifg_cnt > 0:
Expand Down Expand Up @@ -235,8 +235,8 @@ async def _run(self):
await FallingEdge(self.clock)

# send low nibble after falling edge, leading in to rising edge
self.data <= d & 0x0F
self.ctrl <= en
self.data.value = d & 0x0F
self.ctrl.value = en


class RgmiiSink(Reset):
Expand Down Expand Up @@ -448,6 +448,6 @@ async def _run_clock(self, period):

while True:
await t
self.rx_clk <= 1
self.rx_clk.value = 1
await t
self.rx_clk <= 0
self.rx_clk.value = 0
12 changes: 6 additions & 6 deletions cocotbext/eth/xgmii.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ def _handle_reset(self, state):
self._run_cr = None

self.active = False
self.data <= 0
self.ctrl <= 0
self.data.value = 0
self.ctrl.value = 0

if self.current_frame:
self.log.warning("Flushed transmit frame during reset: %s", self.current_frame)
Expand Down Expand Up @@ -351,11 +351,11 @@ async def _run(self):
d_val |= XgmiiCtrl.IDLE << k*8
c_val |= 1 << k

self.data <= d_val
self.ctrl <= c_val
self.data.value = d_val
self.ctrl.value = c_val
else:
self.data <= self.idle_d
self.ctrl <= self.idle_c
self.data.value = self.idle_d
self.ctrl.value = self.idle_c
self.active = False
self.idle_event.set()

Expand Down

0 comments on commit 73fe547

Please sign in to comment.