acpki: update for combined RTIO channel/address

3 years ago · 62988a580e
parent a9c40f7478
commit 62988a580e
1 changed files with 3 additions and 9 deletions
--- a/src/gateware/acpki.py
+++ b/src/gateware/acpki.py
@ -190,16 +190,10 @@ class KernelInitiator(Module, AutoCSR):
        ]

        dout_cases = {}
-        dout_lw = Signal(32)
-        dout_hw = Signal(32)
-        self.comb += [
-            dout_lw.eq(self.engine.dout[:32]),
-            dout_hw.eq(self.engine.dout[32:])
-        ]
        dout_cases[0] = [
-            cmd.eq(dout_lw[24:]),
-            cri.chan_sel.eq(dout_lw[:24]),
-            cri.o_address.eq(dout_hw[:16])
+            cmd.eq(self.engine.dout[:8]),
+            cri.chan_sel.eq(self.engine.dout[40:]),
+            cri.o_address.eq(self.engine.dout[32:40])
        ]
        dout_cases[1] = [
            cri.o_timestamp.eq(self.engine.dout)