Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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 10 additions and 12 deletions.
  1. +8 −10 milkymist/asmicon/bankmachine.py
  2. +2 −2 software/videomixer/main.c
View
18 milkymist/asmicon/bankmachine.py
@@ -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()
View
4 software/videomixer/main.c
@@ -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);

No commit comments for this range

Something went wrong with that request. Please try again.