diff --git a/cocotbext/eth/eth_mac.py b/cocotbext/eth/eth_mac.py index 9fc2b20..3eff9fa 100644 --- a/cocotbext/eth/eth_mac.py +++ b/cocotbext/eth/eth_mac.py @@ -288,8 +288,8 @@ class EthMacTx(Reset): frame.sim_time_sfd = get_sim_time() if self.ptp_time is not None: - frame.ptp_timestamp = self.ptp_time.value.integer - frame.ptp_tag = cycle.tuser.integer >> 1 + frame.ptp_timestamp = int(self.ptp_time.value) + frame.ptp_tag = int(cycle.tuser) >> 1 self.ts_queue.put_nowait((frame.ptp_timestamp, frame.ptp_tag)) # process frame data @@ -297,14 +297,14 @@ class EthMacTx(Reset): byte_count = 0 for offset in range(self.byte_lanes): - if not hasattr(self.bus, "tkeep") or (cycle.tkeep.integer >> offset) & 1: - data.append((cycle.tdata.integer >> (offset * self.byte_size)) & self.byte_mask) + if not hasattr(self.bus, "tkeep") or (int(cycle.tkeep) >> offset) & 1: + data.append((int(cycle.tdata) >> (offset * self.byte_size)) & self.byte_mask) byte_count += 1 # wait for serialization time await Timer(self.time_scale*byte_count*8//self.speed, 'step') - if cycle.tlast.integer: + if int(cycle.tlast): frame.data = bytes(data) frame.sim_time_end = get_sim_time() self.log.info("RX frame: %s", frame) @@ -514,7 +514,7 @@ class EthMacRx(Reset): frame.sim_time_sfd = get_sim_time() if self.ptp_time is not None: - frame.ptp_timestamp = self.ptp_time.value.integer + frame.ptp_timestamp = int(self.ptp_time.value) tuser |= frame.ptp_timestamp << 1 # process frame data diff --git a/cocotbext/eth/gmii.py b/cocotbext/eth/gmii.py index 03f3a60..25c3433 100644 --- a/cocotbext/eth/gmii.py +++ b/cocotbext/eth/gmii.py @@ -278,7 +278,7 @@ class GmiiSource(Reset): while True: await clock_edge_event - if self.enable is None or self.enable.value: + if self.enable is None or int(self.enable.value): if ifg_cnt > 0: # in IFG ifg_cnt -= 1 @@ -297,7 +297,7 @@ class GmiiSource(Reset): frame.normalize() if self.mii_select is not None: - self.mii_mode = bool(self.mii_select.value.integer) + self.mii_mode = bool(int(self.mii_select.value)) if self.mii_mode: # convert to MII @@ -457,10 +457,10 @@ class GmiiSink(Reset): while True: await clock_edge_event - if self.enable is None or self.enable.value: - d_val = self.data.value.integer - dv_val = self.dv.value.integer - er_val = 0 if self.er is None else self.er.value.integer + if self.enable is None or int(self.enable.value): + d_val = int(self.data.value) + dv_val = int(self.dv.value) + er_val = 0 if self.er is None else int(self.er.value) if frame is None: if dv_val: @@ -472,7 +472,7 @@ class GmiiSink(Reset): # end of frame if self.mii_select is not None: - self.mii_mode = bool(self.mii_select.value.integer) + self.mii_mode = bool(int(self.mii_select.value)) if self.mii_mode: odd = True diff --git a/cocotbext/eth/mii.py b/cocotbext/eth/mii.py index 198e46b..596c7d1 100644 --- a/cocotbext/eth/mii.py +++ b/cocotbext/eth/mii.py @@ -179,7 +179,7 @@ class MiiSource(Reset): while True: await clock_edge_event - if self.enable is None or self.enable.value: + if self.enable is None or int(self.enable.value): if ifg_cnt > 0: # in IFG ifg_cnt -= 1 @@ -348,10 +348,10 @@ class MiiSink(Reset): while True: await clock_edge_event - if self.enable is None or self.enable.value: - d_val = self.data.value.integer - dv_val = self.dv.value.integer - er_val = 0 if self.er is None else self.er.value.integer + if self.enable is None or int(self.enable.value): + d_val = int(self.data.value) + dv_val = int(self.dv.value) + er_val = 0 if self.er is None else int(self.er.value) if frame is None: if dv_val: diff --git a/cocotbext/eth/rgmii.py b/cocotbext/eth/rgmii.py index 6786a0d..36efdbe 100644 --- a/cocotbext/eth/rgmii.py +++ b/cocotbext/eth/rgmii.py @@ -192,7 +192,7 @@ class RgmiiSource(Reset): self.data.value = d >> 4 self.ctrl.value = en ^ er - if self.enable is None or self.enable.value: + if self.enable is None or int(self.enable.value): in_ifg = False if ifg_cnt > 0: @@ -214,7 +214,7 @@ class RgmiiSource(Reset): frame.normalize() if self.mii_select is not None: - self.mii_mode = bool(self.mii_select.value.integer) + self.mii_mode = bool(int(self.mii_select.value)) if self.mii_mode: # convert to MII @@ -375,17 +375,17 @@ class RgmiiSink(Reset): while True: await clock_rising_edge_event - if self.enable is None or self.enable.value: + if self.enable is None or int(self.enable.value): # capture low nibble on rising edge - d_val = self.data.value.integer - dv_val = self.ctrl.value.integer + d_val = int(self.data.value) + dv_val = int(self.ctrl.value) await clock_falling_edge_event # capture high nibble on falling edge - d_val |= self.data.value.integer << 4 - er_val = dv_val ^ self.ctrl.value.integer + d_val |= int(self.data.value) << 4 + er_val = dv_val ^ int(self.ctrl.value) if frame is None: if dv_val: @@ -397,7 +397,7 @@ class RgmiiSink(Reset): # end of frame if self.mii_select is not None: - self.mii_mode = bool(self.mii_select.value.integer) + self.mii_mode = bool(int(self.mii_select.value)) if self.mii_mode: odd = True diff --git a/cocotbext/eth/xgmii.py b/cocotbext/eth/xgmii.py index b1b7733..45de500 100644 --- a/cocotbext/eth/xgmii.py +++ b/cocotbext/eth/xgmii.py @@ -286,7 +286,7 @@ class XgmiiSource(Reset): while True: await clock_edge_event - if self.enable is None or self.enable.value: + if self.enable is None or int(self.enable.value): if ifg_cnt + deficit_idle_cnt > self.byte_lanes-1 or (not self.enable_dic and ifg_cnt > 4): # in IFG ifg_cnt = ifg_cnt - self.byte_lanes @@ -488,9 +488,9 @@ class XgmiiSink(Reset): while True: await clock_edge_event - if self.enable is None or self.enable.value: - data_val = self.data.value.integer - ctrl_val = self.ctrl.value.integer + if self.enable is None or int(self.enable.value): + data_val = int(self.data.value) + ctrl_val = int(self.ctrl.value) for offset in range(self.byte_lanes): d_val = (data_val >> (offset*8)) & 0xff c_val = (ctrl_val >> offset) & 1