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/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fd7c2ba0bf14
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d557a9a2676d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 14, 2013

  1. videomixer: rescale pots

    Sebastien Bourdeauducq committed Jun 14, 2013
    Copy the full SHA
    3917ab4 View commit details
  2. asmicon/bankmachine: fix full selector

    Sebastien Bourdeauducq committed Jun 14, 2013
    Copy the full SHA
    d557a9a View commit details
Showing with 10 additions and 12 deletions.
  1. +8 −10 milkymist/asmicon/bankmachine.py
  2. +2 −2 software/videomixer/main.c
18 changes: 8 additions & 10 deletions milkymist/asmicon/bankmachine.py
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ def complete_selector(self, slicer, bankn, slots):
hits.append(hit)

# Determine best request
rr = RoundRobin(self.nslots, SP_CE)
rr = RoundRobin(len(slots), SP_CE)
has_hit = Signal()
self.comb += has_hit.eq(optree("|", hits))

@@ -124,7 +124,7 @@ def complete_selector(self, slicer, bankn, slots):
matures = []
for slot, os in zip(slots, outstandings):
mature = Signal()
comb.append(mature.eq(slot.mature & os))
self.comb += mature.eq(slot.mature & os)
matures.append(mature)
has_mature = Signal()
self.comb += has_mature.eq(optree("|", matures))
@@ -137,8 +137,8 @@ class _Buffer(Module):
def __init__(self, source):
self.stb = Signal()
self.ack = Signal()
self.tag = Signal(source.tag.bv)
self.adr = Signal(source.adr.bv)
self.tag = Signal(flen(source.tag))
self.adr = Signal(flen(source.adr))
self.we = Signal()

###
@@ -169,13 +169,11 @@ def __init__(self, geom_settings, timing_settings, address_align, bankn, slots,
# Sub components
slicer = _AddressSlicer(geom_settings, address_align)
if full_selector:
selector = _FullSelector(slicer, bankn, slots)
self.submodules.buf = _Buffer(selector)
cmdsource = self.buf
self.submodules.selector = _FullSelector(slicer, bankn, slots)
else:
selector = _SimpleSelector(slicer, bankn, slots)
cmdsource = selector
self.submodules += selector
self.submodules.selector = _SimpleSelector(slicer, bankn, slots)
self.submodules.buf = _Buffer(self.selector)
cmdsource = self.buf

# Row tracking
has_openrow = Signal()
4 changes: 2 additions & 2 deletions software/videomixer/main.c
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@

static int scale_pot(int raw, int range)
{
int pot_min = 64000;
int pot_max = 103000;
int pot_min = 85300;
int pot_max = 137000;
int scaled;

scaled = range*(raw - pot_min)/(pot_max - pot_min);