Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b68c00d36fcc
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa8112c3f536
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 7, 2013

  1. lasmibus/crossbar: simplify master ack generation

    Sebastien Bourdeauducq committed Jul 7, 2013
    Copy the full SHA
    7e6fbd3 View commit details
  2. dma_lasmi/Reader: handle ack=1 when stb=0

    Sebastien Bourdeauducq committed Jul 7, 2013
    Copy the full SHA
    fa8112c View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 migen/actorlib/dma_lasmi.py
  2. +1 −1 migen/bus/lasmibus.py
2 changes: 1 addition & 1 deletion migen/actorlib/dma_lasmi.py
Original file line number Diff line number Diff line change
@@ -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)
]

2 changes: 1 addition & 1 deletion migen/bus/lasmibus.py
Original file line number Diff line number Diff line change
@@ -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)]