bslathi19/cocotbext-axi
1
0
Fork 0
Code Issues Actions Packages Projects Releases 5 Wiki Activity

Remove extraneous checks

Browse Source
This commit is contained in:
Alex Forencich
2020-10-21 15:44:42 -07:00
parent 35ff3fa3b6
commit 7851565206
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cocotbext/axi/axi_master.py
View File

@@ -750,13 +750,9 @@ class AxiMaster(object):
self.read_if = AxiMasterRead(entity, name, clock, reset) 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): 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) 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): 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) self.write_if.init_write(address, data, burst, size, lock, cache, prot, qos, region, user, token)
def idle(self): def idle(self):
@@ -767,42 +763,26 @@ class AxiMaster(object):
await RisingEdge(self.clock) await RisingEdge(self.clock)
async def wait_read(self): async def wait_read(self):
if not self.read_if:
raise Exception()
await self.read_if.wait() await self.read_if.wait()
async def wait_write(self): async def wait_write(self):
if not self.write_if:
raise Exception()
await self.write_if.wait() await self.write_if.wait()
def read_data_ready(self, token=None): def read_data_ready(self, token=None):
if not self.read_if:
raise Exception()
return self.read_if.read_data_ready(token) return self.read_if.read_data_ready(token)
def get_read_data(self, token=None): def get_read_data(self, token=None):
if not self.read_if:
raise Exception()
return self.read_if.get_read_data(token) return self.read_if.get_read_data(token)
def write_resp_ready(self, token=None): def write_resp_ready(self, token=None):
if not self.write_if:
raise Exception()
return self.write_if.write_resp_ready(token) return self.write_if.write_resp_ready(token)
def get_write_resp(self, token=None): def get_write_resp(self, token=None):
if not self.write_if:
raise Exception()
return self.write_if.get_write_resp(token) 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): 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) 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): 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) return await self.write_if.write(address, data, burst, size, lock, cache, prot, qos, region, user)

20
cocotbext/axi/axil_master.py
View File

@@ -499,13 +499,9 @@ class AxiLiteMaster(object):
self.read_if = AxiLiteMasterRead(entity, name, clock, reset) self.read_if = AxiLiteMasterRead(entity, name, clock, reset)
def init_read(self, address, length, prot=AxiProt.NONSECURE, token=None): 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) self.read_if.init_read(address, length, prot, token)
def init_write(self, address, data, prot=AxiProt.NONSECURE, token=None): 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) self.write_if.init_write(address, data, prot, token)
def idle(self): def idle(self):
@@ -516,42 +512,26 @@ class AxiLiteMaster(object):
await RisingEdge(self.clock) await RisingEdge(self.clock)
async def wait_read(self): async def wait_read(self):
if not self.read_if:
raise Exception()
await self.read_if.wait() await self.read_if.wait()
async def wait_write(self): async def wait_write(self):
if not self.write_if:
raise Exception()
await self.write_if.wait() await self.write_if.wait()
def read_data_ready(self, token=None): def read_data_ready(self, token=None):
if not self.read_if:
raise Exception()
return self.read_if.read_data_ready(token) return self.read_if.read_data_ready(token)
def get_read_data(self, token=None): def get_read_data(self, token=None):
if not self.read_if:
raise Exception()
return self.read_if.get_read_data(token) return self.read_if.get_read_data(token)
def write_resp_ready(self, token=None): def write_resp_ready(self, token=None):
if not self.write_if:
raise Exception()
return self.write_if.write_resp_ready(token) return self.write_if.write_resp_ready(token)
def get_write_resp(self, token=None): def get_write_resp(self, token=None):
if not self.write_if:
raise Exception()
return self.write_if.get_write_resp(token) return self.write_if.get_write_resp(token)
async def read(self, address, length, prot=AxiProt.NONSECURE): 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) return await self.read_if.read(address, length, prot)
async def write(self, address, data, prot=AxiProt.NONSECURE): 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) return await self.write_if.write(address, data, prot)