frontend/avalon: Remove downconvert specific logic (no longer required with LiteDRAMNativePortConverter improvement).

This commit is contained in:
Florent Kermarrec 2023-05-31 16:54:56 +02:00
parent 045c8da62e
commit 4a8b102c7e
1 changed files with 2 additions and 38 deletions

View File

@ -96,8 +96,8 @@ class LiteDRAMAvalonMM2Native(LiteXModule):
port.cmd.we.eq(avalon.write), port.cmd.we.eq(avalon.write),
port.cmd.valid.eq(1), port.cmd.valid.eq(1),
port.cmd.last.eq(1), port.cmd.last.eq(1),
If((downconvert == True) | port.cmd.ready, If(port.cmd.ready,
avalon.waitrequest.eq(downconvert == True), avalon.waitrequest.eq(0),
If(port.cmd.we, If(port.cmd.we,
NextState("SINGLE_WRITE") NextState("SINGLE_WRITE")
).Else( ).Else(
@ -112,28 +112,11 @@ class LiteDRAMAvalonMM2Native(LiteXModule):
avalon.waitrequest.eq(1), avalon.waitrequest.eq(1),
port.rdata.ready.eq(0), port.rdata.ready.eq(0),
If((downconvert == True),
port.cmd.addr.eq(address),
port.cmd.we.eq(1),
port.cmd.valid.eq(1),
If(port.cmd.ready,
NextValue(cmd_ready_seen, 1)
),
If(cmd_ready_seen,
port.cmd.valid.eq(0),
port.cmd.we.eq(0)
),
),
port.wdata.data.eq(writedata), port.wdata.data.eq(writedata),
port.wdata.valid.eq(1), port.wdata.valid.eq(1),
port.wdata.we.eq(byteenable), port.wdata.we.eq(byteenable),
If(port.wdata.ready, If(port.wdata.ready,
If((downconvert == True),
avalon.waitrequest.eq(0)
),
NextState("START") NextState("START")
) )
) )
@ -142,29 +125,10 @@ class LiteDRAMAvalonMM2Native(LiteXModule):
avalon.waitrequest.eq(1), avalon.waitrequest.eq(1),
port.rdata.ready.eq(1), port.rdata.ready.eq(1),
If((downconvert == True),
port.cmd.addr.eq(address),
port.cmd.we.eq(0),
port.cmd.valid.eq(1),
If(port.cmd.ready,
NextValue(cmd_ready_seen, 1)
),
If(cmd_ready_seen,
port.cmd.valid.eq(0),
port.cmd.we.eq(0)
),
),
If(port.rdata.valid, If(port.rdata.valid,
avalon.readdata.eq(port.rdata.data), avalon.readdata.eq(port.rdata.data),
avalon.readdatavalid.eq(1), avalon.readdatavalid.eq(1),
If((downconvert == True),
port.cmd.valid.eq(0),
avalon.waitrequest.eq(0),
),
NextState("START") NextState("START")
) )
) )