Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 2 additions and 2 deletions.
  1. +1 −1  migen/actorlib/dma_lasmi.py
  2. +1 −1  migen/bus/lasmibus.py
View
2  migen/actorlib/dma_lasmi.py
@@ -21,7 +21,7 @@ def __init__(self, lasmim, fifo_depth=None):
lasmim.we.eq(0),
lasmim.stb.eq(self.address.stb & request_enable),
lasmim.adr.eq(self.address.payload.a),
- self.address.ack.eq(lasmim.req_ack),
+ self.address.ack.eq(lasmim.req_ack & request_enable),
request_issued.eq(lasmim.stb & lasmim.req_ack)
]
View
2  migen/bus/lasmibus.py
@@ -85,7 +85,7 @@ def __init__(self, controllers, nmasters, cba_shift):
bank.we.eq(Array(self.masters)[rr.grant].we),
bank.stb.eq(Array(bank_requested)[rr.grant])
]
- master_req_acks = [master_req_ack | ((rr.grant == nm) & Array(bank_selected)[rr.grant] & bank.req_ack)
+ master_req_acks = [master_req_ack | ((rr.grant == nm) & bank_selected[nm] & bank.req_ack)
for nm, master_req_ack in enumerate(master_req_acks)]
master_dat_acks = [master_dat_ack | ((rr.grant == nm) & bank.dat_ack)
for nm, master_dat_ack in enumerate(master_dat_acks)]

No commit comments for this range

Something went wrong with that request. Please try again.