Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug put_ptr on start, separate put / get processes

This commit is contained in:
Florent Kermarrec 2012-09-15 20:22:02 +02:00
parent 50da5bfbf0
commit 88d5a593ef
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
migScope/recorder.py
View File

@ -44,26 +44,36 @@ class Storage:
If(self.rst, If(self.rst,
self._put_cnt.eq(0), self._put_cnt.eq(0),
self._put_ptr.eq(0), self._put_ptr.eq(0),
self._get_cnt.eq(0),
self._get_ptr.eq(0),
self.run.eq(0) self.run.eq(0)
).Elif(self.start & ~self.run, ).Elif(self.start & ~self.run,
self._put_cnt.eq(0), self._put_cnt.eq(0),
self._get_cnt.eq(0), self.run.eq(1),
self._get_ptr.eq(self._put_ptr-self.offset), If(self.put,
self.run.eq(1) self._put_cnt.eq(self._put_cnt+1),
self._put_ptr.eq(self._put_ptr+1)
)
).Elif(self.done, ).Elif(self.done,
self.run.eq(0) self.run.eq(0)
).Elif(self.put & ~self.done, ).Elif(self.put & ~self.done,
self._put_cnt.eq(self._put_cnt+1), self._put_cnt.eq(self._put_cnt+1),
self._put_ptr.eq(self._put_ptr+1) self._put_ptr.eq(self._put_ptr+1)
),
If(self.rst,
self._get_cnt.eq(0),
self._get_ptr.eq(0),
).Elif(self.start & ~self.run,
self._get_cnt.eq(0),
self._get_ptr.eq(self._put_ptr-self.offset-1),
).Elif(self.get, ).Elif(self.get,
self._get_cnt.eq(self._get_cnt+1), self._get_cnt.eq(self._get_cnt+1),
self._get_ptr.eq(self._get_ptr+1) self._get_ptr.eq(self._get_ptr+1)
) )
] ]
comb += [ comb += [
If((self._put_cnt == size_minus_offset-1) & self.run, If((self._put_cnt == size_minus_offset-2) & self.run,
self.done.eq(1) self.done.eq(1)
).Else( ).Else(
self.done.eq(0) self.done.eq(0)
@ -208,7 +218,7 @@ class Recorder:
self.storage.put_dat.eq(self.trig_dat) self.storage.put_dat.eq(self.trig_dat)
] ]
return self.bank.get_fragment()+\ return self.bank.get_fragment()+\
self.storage.get_fragment()+self.sequencer.get_fragment()+\ self.storage.get_fragment()+self.sequencer.get_fragment()+\
Fragment(comb=comb, sync=sync) Fragment(comb=comb, sync=sync)