Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 from sergachev/master 

integration/soc: fix add_adapter for slaves
This commit is contained in:
enjoy-digital 2020-05-11 08:34:03 +02:00 committed by GitHub
parent 2d70220b80 e4fa4bbcf7
commit 57390666d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
litex/soc/integration/soc.py
View File

@ -282,7 +282,7 @@ class SoCBusHandler(Module):
return is_io return is_io
# Add Master/Slave ----------------------------------------------------------------------------- # Add Master/Slave -----------------------------------------------------------------------------
def add_adapter(self, name, interface): def add_adapter(self, name, interface, is_master):
if interface.data_width != self.data_width: if interface.data_width != self.data_width:
self.logger.info("{} Bus {} from {}-bit to {}-bit.".format( self.logger.info("{} Bus {} from {}-bit to {}-bit.".format(
colorer(name), colorer(name),
@ -290,7 +290,8 @@ class SoCBusHandler(Module):
colorer(interface.data_width), colorer(interface.data_width),
colorer(self.data_width))) colorer(self.data_width)))
new_interface = wishbone.Interface(data_width=self.data_width) new_interface = wishbone.Interface(data_width=self.data_width)
self.submodules += wishbone.Converter(interface, new_interface) args = (interface, new_interface) if is_master else (new_interface, interface)
self.submodules += wishbone.Converter(*args)
return new_interface return new_interface
else: else:
return interface return interface
@ -304,7 +305,7 @@ class SoCBusHandler(Module):
colorer("already declared", color="red"))) colorer("already declared", color="red")))
self.logger.error(self) self.logger.error(self)
raise raise
master = self.add_adapter(name, master) master = self.add_adapter(name, master, True)
self.masters[name] = master self.masters[name] = master
self.logger.info("{} {} as Bus Master.".format( self.logger.info("{} {} as Bus Master.".format(
colorer(name, color="underline"), colorer(name, color="underline"),
@ -336,7 +337,7 @@ class SoCBusHandler(Module):
colorer("already declared", color="red"))) colorer("already declared", color="red")))
self.logger.error(self) self.logger.error(self)
raise raise
slave = self.add_adapter(name, slave) slave = self.add_adapter(name, slave, False)
self.slaves[name] = slave self.slaves[name] = slave
self.logger.info("{} {} as Bus Slave.".format( self.logger.info("{} {} as Bus Slave.".format(
colorer(name, color="underline"), colorer(name, color="underline"),