From 7851565206388683fd74c24a713134a97df3cca7 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Wed, 21 Oct 2020 15:44:42 -0700 Subject: [PATCH] Remove extraneous checks --- cocotbext/axi/axi_master.py | 20 -------------------- cocotbext/axi/axil_master.py | 20 -------------------- 2 files changed, 40 deletions(-) diff --git a/cocotbext/axi/axi_master.py b/cocotbext/axi/axi_master.py index fd39d22..1c1757c 100644 --- a/cocotbext/axi/axi_master.py +++ b/cocotbext/axi/axi_master.py @@ -750,13 +750,9 @@ class AxiMaster(object): self.read_if = AxiMasterRead(entity, name, clock, reset) def init_read(self, address, length, burst=AxiBurstType.INCR, size=None, lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0, token=None): - if not self.read_if: - raise Exception() self.read_if.init_read(address, length, burst, size, lock, cache, prot, qos, region, user, token) def init_write(self, address, data, burst=AxiBurstType.INCR, size=None, lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0, token=None): - if not self.write_if: - raise Exception() self.write_if.init_write(address, data, burst, size, lock, cache, prot, qos, region, user, token) def idle(self): @@ -767,42 +763,26 @@ class AxiMaster(object): await RisingEdge(self.clock) async def wait_read(self): - if not self.read_if: - raise Exception() await self.read_if.wait() async def wait_write(self): - if not self.write_if: - raise Exception() await self.write_if.wait() def read_data_ready(self, token=None): - if not self.read_if: - raise Exception() return self.read_if.read_data_ready(token) def get_read_data(self, token=None): - if not self.read_if: - raise Exception() return self.read_if.get_read_data(token) def write_resp_ready(self, token=None): - if not self.write_if: - raise Exception() return self.write_if.write_resp_ready(token) def get_write_resp(self, token=None): - if not self.write_if: - raise Exception() return self.write_if.get_write_resp(token) async def read(self, address, length, burst=AxiBurstType.INCR, size=None, lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0): - if not self.read_if: - raise Exception() return await self.read_if.read(address, length, burst, size, lock, cache, prot, qos, region, user) async def write(self, address, data, burst=AxiBurstType.INCR, size=None, lock=AxiLockType.NORMAL, cache=0b0011, prot=AxiProt.NONSECURE, qos=0, region=0, user=0): - if not self.write_if: - raise Exception() return await self.write_if.write(address, data, burst, size, lock, cache, prot, qos, region, user) diff --git a/cocotbext/axi/axil_master.py b/cocotbext/axi/axil_master.py index 70415e4..85c78d2 100644 --- a/cocotbext/axi/axil_master.py +++ b/cocotbext/axi/axil_master.py @@ -499,13 +499,9 @@ class AxiLiteMaster(object): self.read_if = AxiLiteMasterRead(entity, name, clock, reset) def init_read(self, address, length, prot=AxiProt.NONSECURE, token=None): - if not self.read_if: - raise Exception() self.read_if.init_read(address, length, prot, token) def init_write(self, address, data, prot=AxiProt.NONSECURE, token=None): - if not self.write_if: - raise Exception() self.write_if.init_write(address, data, prot, token) def idle(self): @@ -516,42 +512,26 @@ class AxiLiteMaster(object): await RisingEdge(self.clock) async def wait_read(self): - if not self.read_if: - raise Exception() await self.read_if.wait() async def wait_write(self): - if not self.write_if: - raise Exception() await self.write_if.wait() def read_data_ready(self, token=None): - if not self.read_if: - raise Exception() return self.read_if.read_data_ready(token) def get_read_data(self, token=None): - if not self.read_if: - raise Exception() return self.read_if.get_read_data(token) def write_resp_ready(self, token=None): - if not self.write_if: - raise Exception() return self.write_if.write_resp_ready(token) def get_write_resp(self, token=None): - if not self.write_if: - raise Exception() return self.write_if.get_write_resp(token) async def read(self, address, length, prot=AxiProt.NONSECURE): - if not self.read_if: - raise Exception() return await self.read_if.read(address, length, prot) async def write(self, address, data, prot=AxiProt.NONSECURE): - if not self.write_if: - raise Exception() return await self.write_if.write(address, data, prot)