srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

sawg: don't use Cat() for signed signals 

c.f. #1039 #1040 #1022 #1058 #1044
This commit is contained in:
Robert Jördens 2018-06-09 07:33:47 +00:00
parent 5b73dd8604
commit 0b086225a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/gateware/dsp/sawg.py
View File

@ -183,8 +183,8 @@ class Channel(Module, SatAddMixin):
b.ce.eq(cfg.ce), b.ce.eq(cfg.ce),
u.o.ack.eq(cfg.ce), u.o.ack.eq(cfg.ce),
Cat(b.clr, a1.clr, a2.clr).eq(cfg.clr), Cat(b.clr, a1.clr, a2.clr).eq(cfg.clr),
Cat(b.xi).eq(Cat(hbf[0].o)), [i.eq(j) for i, j in zip(b.xi, hbf[0].o)],
Cat(b.yi).eq(Cat(hbf[1].o)), [i.eq(j) for i, j in zip(b.yi, hbf[1].o)],
] ]
hbf[0].i.reset_less = True hbf[0].i.reset_less = True
hbf[1].i.reset_less = True hbf[1].i.reset_less = True
@ -217,4 +217,4 @@ class Channel(Module, SatAddMixin):
] ]
def connect_y(self, buddy): def connect_y(self, buddy):
self.comb += Cat(buddy.y_in).eq(Cat(self.b.yo)) self.comb += [i.eq(j) for i, j in zip(buddy.y_in, self.b.yo)]