Skip to content

Commit

Permalink
Merge pull request #209 from slaclab/SsiPrbsRateGen
Browse files Browse the repository at this point in the history 
SsiPrbsRateGen Update
  • Loading branch information
@ruck314
ruck314 authored Apr 19, 2018
2 parents ccf2797 + 3980e82 commit 50c51f7
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 74 deletions.
9 changes: 3 additions & 6 deletions protocols/ssi/rtl/SsiPrbsRateGen.vhd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,9 @@ begin
axiSlaveRegisterR(axilEp, x"014", 0, frameRate);
axiSlaveRegisterR(axilEp, x"018", 0, frameRateMax);
axiSlaveRegisterR(axilEp, x"01C", 0, frameRateMin);
axiSlaveRegisterR(axilEp, x"020", 0, bandwidth(31 downto 0));
axiSlaveRegisterR(axilEp, x"024", 0, bandwidth(63 downto 32));
axiSlaveRegisterR(axilEp, x"028", 0, bandwidthMax(31 downto 0));
axiSlaveRegisterR(axilEp, x"02C", 0, bandwidthMax(63 downto 32));
axiSlaveRegisterR(axilEp, x"030", 0, bandwidthMin(31 downto 0));
axiSlaveRegisterR(axilEp, x"034", 0, bandwidthMin(63 downto 32));
axiSlaveRegisterR(axilEp, x"020", 0, bandwidth);
axiSlaveRegisterR(axilEp, x"028", 0, bandwidthMax);
axiSlaveRegisterR(axilEp, x"030", 0, bandwidthMin);

axiSlaveRegisterR(axilEp, x"040", 0, r.frameCount);

Expand Down
137 changes: 69 additions & 68 deletions python/surf/protocols/ssi/_SsiPrbsRateGen.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,141 +31,142 @@ def __init__( self,
# Variables
##############################

self.add (pr.RemoteCommand(
name = "statReset",
self.add(pr.RemoteCommand(
name = "StatReset",
description = "",
offset = 0x00,
bitSize = 1,
bitOffset = 0x00,
mode = "RW",
function = pr.Command.toggle
offset = 0x00,
bitSize = 1,
bitOffset = 0,
base = pr.UInt,
function = lambda cmd: cmd.toggle,
hidden = False,
))

self.add(pr.RemoteVariable(
name = "packetLength",
name = "PacketLength",
description = "",
offset = 0x04,
bitSize = 32,
bitOffset = 0x00,
offset = 0x04,
bitSize = 32,
bitOffset = 0,
base = pr.UInt,
mode = "RW",
))

self.add(pr.RemoteVariable(
name = "period",
name = "Period",
description = "",
offset = 0x08,
bitSize = 32,
bitOffset = 0x00,
offset = 0x08,
bitSize = 32,
bitOffset = 0,
base = pr.UInt,
mode = "RW",
))

self.add(pr.RemoteVariable(
name = "txEn",
name = "TxEn",
description = "",
offset = 0x0C,
bitSize = 1,
bitOffset = 0x00,
base = "bool",
offset = 0x0C,
bitSize = 1,
bitOffset = 0,
base = pr.Bool,
mode = "RW",
))

self.add(pr.RemoteCommand (
name = "oneShot",
self.add(pr.RemoteCommand(
name = "OneShot",
description = "",
offset = 0x0C,
bitSize = 1,
bitOffset = 0x01,
base = pr.UInt,
mode = "WO",
function = pr.Command.toggle
offset = 0x0C,
bitSize = 1,
bitOffset = 1,
base = pr.UInt,
function = pr.BaseCommand.toggle,
hidden = False,
))

self.add(pr.RemoteVariable(
name = "missed",
name = "Missed",
description = "",
offset = 0x10,
bitSize = 32,
bitOffset = 0x00,
base = "int",
offset = 0x10,
bitSize = 32,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "frameRate",
name = "FrameRate",
description = "",
offset = 0x14,
bitSize = 32,
bitOffset = 0x00,
base = "int",
offset = 0x14,
bitSize = 32,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "frameRateMax",
name = "FrameRateMax",
description = "",
offset = 0x18,
bitSize = 32,
bitOffset = 0x00,
base = "int",
offset = 0x18,
bitSize = 32,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "frameRateMin",
name = "FrameRateMin",
description = "",
offset = 0x1C,
bitSize = 32,
bitOffset = 0x00,
base = "int",
offset = 0x1C,
bitSize = 32,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "bandWidth",
name = "BandWidth",
description = "",
offset = 0x20,
bitSize = 64,
bitOffset = 0x00,
base = "int",
offset = 0x20,
bitSize = 64,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "bandWidthMax",
name = "BandWidthMax",
description = "",
offset = 0x28,
bitSize = 64,
bitOffset = 0x00,
base = "int",
offset = 0x28,
bitSize = 64,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "bandWidthMin",
name = "BandWidthMin",
description = "",
offset = 0x30,
bitSize = 64,
bitOffset = 0x00,
base = "int",
offset = 0x30,
bitSize = 64,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))

self.add(pr.RemoteVariable(
name = "frameCount",
name = "FrameCount",
description = "",
offset = 0x40,
bitSize = 64,
bitOffset = 0x00,
base = "int",
offset = 0x40,
bitSize = 64,
bitOffset = 0,
base = pr.UInt,
pollInterval = 1,
mode = "RO",
))
Expand Down

0 comments on commit 50c51f7

Please sign in to comment.