diff --git a/src/eth/tb/taxi_eth_mac_1g_gmii/test_taxi_eth_mac_1g_gmii.py b/src/eth/tb/taxi_eth_mac_1g_gmii/test_taxi_eth_mac_1g_gmii.py index c1b2a1a..1a351a4 100644 --- a/src/eth/tb/taxi_eth_mac_1g_gmii/test_taxi_eth_mac_1g_gmii.py +++ b/src/eth/tb/taxi_eth_mac_1g_gmii/test_taxi_eth_mac_1g_gmii.py @@ -138,11 +138,11 @@ async def run_test_rx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] tx_frames = [] @@ -195,11 +195,11 @@ async def run_test_tx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] diff --git a/src/eth/tb/taxi_eth_mac_1g_gmii_fifo/test_taxi_eth_mac_1g_gmii_fifo.py b/src/eth/tb/taxi_eth_mac_1g_gmii_fifo/test_taxi_eth_mac_1g_gmii_fifo.py index 23b3c41..85c4cad 100644 --- a/src/eth/tb/taxi_eth_mac_1g_gmii_fifo/test_taxi_eth_mac_1g_gmii_fifo.py +++ b/src/eth/tb/taxi_eth_mac_1g_gmii_fifo/test_taxi_eth_mac_1g_gmii_fifo.py @@ -83,11 +83,11 @@ async def run_test_rx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.gmii_rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] @@ -122,11 +122,11 @@ async def run_test_tx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.gmii_rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] diff --git a/src/eth/tb/taxi_eth_mac_1g_rgmii/test_taxi_eth_mac_1g_rgmii.py b/src/eth/tb/taxi_eth_mac_1g_rgmii/test_taxi_eth_mac_1g_rgmii.py index ceb3e54..c554401 100644 --- a/src/eth/tb/taxi_eth_mac_1g_rgmii/test_taxi_eth_mac_1g_rgmii.py +++ b/src/eth/tb/taxi_eth_mac_1g_rgmii/test_taxi_eth_mac_1g_rgmii.py @@ -150,11 +150,11 @@ async def run_test_rx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] tx_frames = [] @@ -207,11 +207,11 @@ async def run_test_tx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] diff --git a/src/eth/tb/taxi_eth_mac_1g_rgmii_fifo/test_taxi_eth_mac_1g_rgmii_fifo.py b/src/eth/tb/taxi_eth_mac_1g_rgmii_fifo/test_taxi_eth_mac_1g_rgmii_fifo.py index f5bf39d..5cbd482 100644 --- a/src/eth/tb/taxi_eth_mac_1g_rgmii_fifo/test_taxi_eth_mac_1g_rgmii_fifo.py +++ b/src/eth/tb/taxi_eth_mac_1g_rgmii_fifo/test_taxi_eth_mac_1g_rgmii_fifo.py @@ -99,11 +99,11 @@ async def run_test_rx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.rgmii_rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] @@ -138,11 +138,11 @@ async def run_test_tx(dut, payload_lengths=None, payload_data=None, ifg=12, spee await RisingEdge(dut.rgmii_rx_clk) if speed == 10e6: - assert dut.link_speed == 0 + assert int(dut.link_speed.value) == 0 elif speed == 100e6: - assert dut.link_speed == 1 + assert int(dut.link_speed.value) == 1 else: - assert dut.link_speed == 2 + assert int(dut.link_speed.value) == 2 test_frames = [payload_data(x) for x in payload_lengths()] diff --git a/src/eth/tb/taxi_mac_pause_ctrl_rx/test_taxi_mac_pause_ctrl_rx.py b/src/eth/tb/taxi_mac_pause_ctrl_rx/test_taxi_mac_pause_ctrl_rx.py index 7565d9c..9d16503 100644 --- a/src/eth/tb/taxi_mac_pause_ctrl_rx/test_taxi_mac_pause_ctrl_rx.py +++ b/src/eth/tb/taxi_mac_pause_ctrl_rx/test_taxi_mac_pause_ctrl_rx.py @@ -213,7 +213,7 @@ async def run_test_pfc(dut): await tb.send_mcf(test_pkt) - while dut.rx_pfc_req.value == 0x00: + while int(dut.rx_pfc_req.value) == 0x00: await RisingEdge(dut.clk) dut.rx_pfc_ack.value = 0x01 @@ -299,14 +299,14 @@ async def run_test_pfc(dut): await tb.send_mcf(test_pkt) - while dut.rx_pfc_req.value != 0xff: + while int(dut.rx_pfc_req.value) != 0xff: await RisingEdge(dut.clk) dut.rx_pfc_ack.value = 0xff start_time = get_sim_time('sec') for k in range(8): - while dut.rx_pfc_req.value & (1 << k) != 0x00: + while int(dut.rx_pfc_req.value) & (1 << k) != 0x00: await RisingEdge(dut.clk) stop_time = get_sim_time('sec') @@ -326,7 +326,7 @@ async def run_test_pfc(dut): await tb.send_mcf(test_pkt) - while dut.rx_pfc_req.value & 0x01 == 0x00: + while int(dut.rx_pfc_req.value) & 0x01 == 0x00: await RisingEdge(dut.clk) dut.rx_pfc_ack.value = 0x01 @@ -337,7 +337,7 @@ async def run_test_pfc(dut): await tb.send_mcf(test_pkt) - while dut.rx_pfc_req.value & 0x02 == 0x00: + while int(dut.rx_pfc_req.value) & 0x02 == 0x00: await RisingEdge(dut.clk) dut.rx_pfc_ack.value = 0x03 @@ -346,7 +346,7 @@ async def run_test_pfc(dut): await tb.send_mcf(test_pkt) - while dut.rx_pfc_req.value: + while int(dut.rx_pfc_req.value): await RisingEdge(dut.clk) stop_time = get_sim_time('sec')