Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 2 commits
  • 2 files changed
  • 0 comments
  • 1 contributor
18  milkymist/asmicon/bankmachine.py
@@ -105,7 +105,7 @@ def complete_selector(self, slicer, bankn, slots):
105 105
 			hits.append(hit)
106 106
 		
107 107
 		# Determine best request
108  
-		rr = RoundRobin(self.nslots, SP_CE)
  108
+		rr = RoundRobin(len(slots), SP_CE)
109 109
 		has_hit = Signal()
110 110
 		self.comb += has_hit.eq(optree("|", hits))
111 111
 		
@@ -124,7 +124,7 @@ def complete_selector(self, slicer, bankn, slots):
124 124
 			matures = []
125 125
 			for slot, os in zip(slots, outstandings):
126 126
 				mature = Signal()
127  
-				comb.append(mature.eq(slot.mature & os))
  127
+				self.comb += mature.eq(slot.mature & os)
128 128
 				matures.append(mature)
129 129
 			has_mature = Signal()
130 130
 			self.comb += has_mature.eq(optree("|", matures))
@@ -137,8 +137,8 @@ class _Buffer(Module):
137 137
 	def __init__(self, source):
138 138
 		self.stb = Signal()
139 139
 		self.ack = Signal()
140  
-		self.tag = Signal(source.tag.bv)
141  
-		self.adr = Signal(source.adr.bv)
  140
+		self.tag = Signal(flen(source.tag))
  141
+		self.adr = Signal(flen(source.adr))
142 142
 		self.we = Signal()
143 143
 	
144 144
 		###
@@ -169,13 +169,11 @@ def __init__(self, geom_settings, timing_settings, address_align, bankn, slots,
169 169
 		# Sub components
170 170
 		slicer = _AddressSlicer(geom_settings, address_align)
171 171
 		if full_selector:
172  
-			selector = _FullSelector(slicer, bankn, slots)
173  
-			self.submodules.buf = _Buffer(selector)
174  
-			cmdsource = self.buf
  172
+			self.submodules.selector = _FullSelector(slicer, bankn, slots)
175 173
 		else:
176  
-			selector = _SimpleSelector(slicer, bankn, slots)
177  
-			cmdsource = selector
178  
-		self.submodules += selector
  174
+			self.submodules.selector = _SimpleSelector(slicer, bankn, slots)
  175
+		self.submodules.buf = _Buffer(self.selector)
  176
+		cmdsource = self.buf
179 177
 		
180 178
 		# Row tracking
181 179
 		has_openrow = Signal()
4  software/videomixer/main.c
@@ -13,8 +13,8 @@
13 13
 
14 14
 static int scale_pot(int raw, int range)
15 15
 {
16  
-	int pot_min = 64000;
17  
-	int pot_max = 103000;
  16
+	int pot_min = 85300;
  17
+	int pot_max = 137000;
18 18
 	int scaled;
19 19
 
20 20
 	scaled = range*(raw - pot_min)/(pot_max - pot_min);

No commit comments for this range

Something went wrong with that request. Please try again.