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 #1597 from machdyne/master 

support multiple usb_ohci ports
This commit is contained in:
enjoy-digital 2023-02-10 14:38:16 +01:00 committed by GitHub
parent 2205a0c2c3 211dfb2168
commit d68bffb26e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
litex/soc/cores/usb_ohci.py
View File

@ -3,6 +3,7 @@
# #
# Copyright (c) 2021 Dolu1990 <charles.papon.90@gmail.com> # Copyright (c) 2021 Dolu1990 <charles.papon.90@gmail.com>
# Copyright (c) 2021 Florent Kermarrec <florent@enjoy-digital.fr> # Copyright (c) 2021 Florent Kermarrec <florent@enjoy-digital.fr>
# Copyright (c) 2023 Lone Dynamics Corporation <info@lonedynamics.com>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
import os import os
@ -30,7 +31,12 @@ class USBOHCI(Module):
# # # # # #
usb_ios = Record([ pn = len(pads.dp)
usb_ios = {}
for i in range(len(pads.dp)):
usb_ios[i] = Record([
("dp_i", 1), ("dp_o", 1), ("dp_oe", 1), ("dp_i", 1), ("dp_o", 1), ("dp_oe", 1),
("dm_i", 1), ("dm_o", 1), ("dm_oe", 1), ("dm_i", 1), ("dm_o", 1), ("dm_oe", 1),
]) ])
@ -69,24 +75,27 @@ class USBOHCI(Module):
o_io_interrupt = self.interrupt, o_io_interrupt = self.interrupt,
# USB # USB
i_io_usb_0_dp_read = usb_ios.dp_i, **{f"i_io_usb_{n}_dp_read": usb_ios[n].dp_i for n in range(pn)},
o_io_usb_0_dp_write = usb_ios.dp_o, **{f"o_io_usb_{n}_dp_write": usb_ios[n].dp_o for n in range(pn)},
o_io_usb_0_dp_writeEnable = usb_ios.dp_oe, **{f"o_io_usb_{n}_dp_writeEnable": usb_ios[n].dp_oe for n in range(pn)},
i_io_usb_0_dm_read = usb_ios.dm_i, **{f"i_io_usb_{n}_dm_read": usb_ios[n].dm_i for n in range(pn)},
o_io_usb_0_dm_write = usb_ios.dm_o, **{f"o_io_usb_{n}_dm_write": usb_ios[n].dm_o for n in range(pn)},
o_io_usb_0_dm_writeEnable = usb_ios.dm_oe, **{f"o_io_usb_{n}_dm_writeEnable": usb_ios[n].dm_oe for n in range(pn)},
)
for i in range(pn):
self.specials += SDRTristate(
io = pads.dp[i],
o = usb_ios[i].dp_o,
oe = usb_ios[i].dp_oe,
i = usb_ios[i].dp_i,
) )
self.specials += SDRTristate( self.specials += SDRTristate(
io = pads.dp, io = pads.dm[i],
o = usb_ios.dp_o, o = usb_ios[i].dm_o,
oe = usb_ios.dp_oe, oe = usb_ios[i].dm_oe,
i = usb_ios.dp_i, i = usb_ios[i].dm_i,
)
self.specials += SDRTristate(
io = pads.dm,
o = usb_ios.dm_o,
oe = usb_ios.dm_oe,
i = usb_ios.dm_i,
) )
self.add_sources(platform) self.add_sources(platform)
@ -117,7 +126,7 @@ class USBOHCI(Module):
gen_args.append(f"--netlist-name={self.get_netlist_name()}") gen_args.append(f"--netlist-name={self.get_netlist_name()}")
gen_args.append(f"--netlist-directory={vdir}") gen_args.append(f"--netlist-directory={vdir}")
cmd = 'cd {path} && sbt "lib/runMain spinal.lib.com.usb.ohci.UsbOhciWishbone {args}"'.format( cmd = 'cd {path} && sbt "runMain spinal.lib.com.usb.ohci.UsbOhciWishbone {args}"'.format(
path=os.path.join(vdir, "ext", "SpinalHDL"), args=" ".join(gen_args)) path=os.path.join(vdir, "ext", "SpinalHDL"), args=" ".join(gen_args))
print("!!! " + cmd) print("!!! " + cmd)
if os.system(cmd) != 0: if os.system(cmd) != 0: