Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 91245c7a255a
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4ec8f3507419
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 14, 2015

  1. interconnect/stream: deprecate Source/Sink

    @sbourdeauducq
    sbourdeauducq committed Dec 14, 2015
    Copy the full SHA
    27a0d8a View commit details

  2. integration/soc_sdram: do not call Record.connect directly

    @sbourdeauducq
    sbourdeauducq committed Dec 14, 2015
    Copy the full SHA
    4ec8f35 View commit details
Showing with 7 additions and 7 deletions.
  1. +3 −3 misoc/integration/soc_sdram.py
  2. +4 −4 misoc/interconnect/stream.py
6 changes: 3 additions & 3 deletions misoc/integration/soc_sdram.py
View file
Original file line number Diff line number Diff line change
@@ -14,21 +14,21 @@ class ControllerInjector(Module, AutoCSR):
def __init__(self, phy, controller_type, geom_settings, timing_settings):
self.submodules.dfii = dfii.DFIInjector(geom_settings.addressbits, geom_settings.bankbits,
phy.settings.dfi_databits, phy.settings.nphases)
self.comb += Record.connect(self.dfii.master, phy.dfi)
self.comb += self.dfii.master.connect(phy.dfi)

if controller_type == "lasmicon":
self.submodules.controller = controller = lasmicon.LASMIcon(phy.settings,
geom_settings,
timing_settings)
self.comb += Record.connect(controller.dfi, self.dfii.slave)
self.comb += controller.dfi.connect(self.dfii.slave)

self.submodules.crossbar = lasmi_bus.LASMIxbar([controller.lasmic],
controller.nrowbits)
elif controller_type == "minicon":
self.submodules.controller = controller = minicon.Minicon(phy.settings,
geom_settings,
timing_settings)
self.comb += Record.connect(controller.dfi, self.dfii.slave)
self.comb += controller.dfi.connect(self.dfii.slave)
else:
raise ValueError("Unsupported SDRAM controller type")

8 changes: 4 additions & 4 deletions misoc/interconnect/stream.py
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ def get_full_layout(self):
return full_layout


class _Endpoint(Record):
class Endpoint(Record):
def __init__(self, description_or_layout):
if isinstance(description_or_layout, EndpointDescription):
self.description = description_or_layout
@@ -53,12 +53,12 @@ def __getattr__(self, name):
return getattr(object.__getattribute__(self, "payload"), name)


class Source(_Endpoint):
class Source(Endpoint): # deprecated
def connect(self, sink):
return Record.connect(self, sink)


class Sink(_Endpoint):
class Sink(Endpoint): # deprecated
def connect(self, source):
return source.connect(self)

@@ -159,7 +159,7 @@ def __init__(self, layout, n):
def pack_layout(l, n):
return [("chunk"+str(i), l) for i in range(n)]

def get_endpoints(obj, filt=_Endpoint):
def get_endpoints(obj, filt=Endpoint):
if hasattr(obj, "get_endpoints") and callable(obj.get_endpoints):
return obj.get_endpoints(filt)
r = dict()