Fix some cocotb 2.0 warnings
Some checks failed
build / Build distributions (release) Successful in 8s
build / deploy (release) Successful in 7s
Regression Tests / Python 3.10 (push) Has been cancelled
Regression Tests / Python 3.11 (push) Has been cancelled
Regression Tests / Python 3.12 (push) Has been cancelled
Regression Tests / Python 3.13 (push) Has been cancelled
Regression Tests / Python 3.8 (push) Has been cancelled
Regression Tests / Python 3.9 (push) Has been cancelled
Some checks failed
build / Build distributions (release) Successful in 8s
build / deploy (release) Successful in 7s
Regression Tests / Python 3.10 (push) Has been cancelled
Regression Tests / Python 3.11 (push) Has been cancelled
Regression Tests / Python 3.12 (push) Has been cancelled
Regression Tests / Python 3.13 (push) Has been cancelled
Regression Tests / Python 3.8 (push) Has been cancelled
Regression Tests / Python 3.9 (push) Has been cancelled
This commit is contained in:
@@ -146,6 +146,9 @@ class ApbMaster(ApbPause, Region, Reset):
|
|||||||
self.command_queue.queue_occupancy_limit = 2
|
self.command_queue.queue_occupancy_limit = 2
|
||||||
self.current_command = None
|
self.current_command = None
|
||||||
|
|
||||||
|
self.read_resp = None
|
||||||
|
self.write_resp = None
|
||||||
|
|
||||||
self.in_flight_operations = 0
|
self.in_flight_operations = 0
|
||||||
self._idle = Event()
|
self._idle = Event()
|
||||||
self._idle.set()
|
self._idle.set()
|
||||||
@@ -268,7 +271,7 @@ class ApbMaster(ApbPause, Region, Reset):
|
|||||||
|
|
||||||
await self.command_queue.put(ApbWriteCmd(address, data, prot, event))
|
await self.command_queue.put(ApbWriteCmd(address, data, prot, event))
|
||||||
await event.wait()
|
await event.wait()
|
||||||
return event.data
|
return self.write_resp
|
||||||
|
|
||||||
async def _write_wrapper(self, address, data, prot, event):
|
async def _write_wrapper(self, address, data, prot, event):
|
||||||
event.set(await self.write(address, data, prot))
|
event.set(await self.write(address, data, prot))
|
||||||
@@ -294,7 +297,7 @@ class ApbMaster(ApbPause, Region, Reset):
|
|||||||
await self.command_queue.put(ApbReadCmd(address, length, prot, event))
|
await self.command_queue.put(ApbReadCmd(address, length, prot, event))
|
||||||
|
|
||||||
await event.wait()
|
await event.wait()
|
||||||
return event.data
|
return self.read_resp
|
||||||
|
|
||||||
async def _read_wrapper(self, address, length, prot, event):
|
async def _read_wrapper(self, address, length, prot, event):
|
||||||
event.set(await self.read(address, length, prot))
|
event.set(await self.read(address, length, prot))
|
||||||
@@ -436,14 +439,14 @@ class ApbMaster(ApbPause, Region, Reset):
|
|||||||
if pwrite:
|
if pwrite:
|
||||||
self.log.info("Write complete addr: 0x%08x prot: %s resp: %s length: %d",
|
self.log.info("Write complete addr: 0x%08x prot: %s resp: %s length: %d",
|
||||||
cmd.address, cmd.prot, resp, length)
|
cmd.address, cmd.prot, resp, length)
|
||||||
write_resp = ApbWriteResp(cmd.address, length, resp)
|
self.write_resp = ApbWriteResp(cmd.address, length, resp)
|
||||||
cmd.event.set(write_resp)
|
cmd.event.set()
|
||||||
else:
|
else:
|
||||||
if self.log.isEnabledFor(logging.INFO):
|
if self.log.isEnabledFor(logging.INFO):
|
||||||
self.log.info("Read complete addr: 0x%08x prot: %s resp: %s data: %s",
|
self.log.info("Read complete addr: 0x%08x prot: %s resp: %s data: %s",
|
||||||
cmd.address, cmd.prot, resp, ' '.join((f'{c:02x}' for c in read_data)))
|
cmd.address, cmd.prot, resp, ' '.join((f'{c:02x}' for c in read_data)))
|
||||||
read_resp = ApbReadResp(cmd.address, bytes(read_data), resp)
|
self.read_resp = ApbReadResp(cmd.address, bytes(read_data), resp)
|
||||||
cmd.event.set(read_resp)
|
cmd.event.set()
|
||||||
|
|
||||||
self.current_write_command = None
|
self.current_write_command = None
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class Reset:
|
|||||||
|
|
||||||
async def _run_reset(self, reset_signal, active_level):
|
async def _run_reset(self, reset_signal, active_level):
|
||||||
while True:
|
while True:
|
||||||
await Edge(reset_signal)
|
await reset_signal.value_change
|
||||||
try:
|
try:
|
||||||
level = bool(int(reset_signal.value))
|
level = bool(int(reset_signal.value))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__ = "0.1.28"
|
__version__ = "0.1.29"
|
||||||
|
|||||||
Reference in New Issue
Block a user