From c4ebf244a18042edf53e39af4e8e4336f4f154c9 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Sat, 28 Feb 2015 10:27:16 +0100 Subject: [PATCH] litescope: move files and modify import to misoclib.tools.litescope --- .../com/liteeth/example_designs/targets/base.py | 8 ++++---- .../liteeth/example_designs/targets/etherbone.py | 6 +++--- misoclib/com/liteeth/example_designs/targets/tty.py | 6 +++--- misoclib/com/liteeth/example_designs/targets/udp.py | 6 +++--- misoclib/com/liteeth/example_designs/test/make.py | 4 ++-- .../com/liteeth/example_designs/test/test_la.py | 2 +- misoclib/tools/.gitignore | 3 --- misoclib/tools/__init__.py | 0 misoclib/tools/{ => litescope}/LICENSE | 0 misoclib/tools/{ => litescope}/README | 0 misoclib/tools/litescope/bridge/uart2wb.py | 2 +- misoclib/tools/litescope/core/port.py | 2 +- misoclib/tools/litescope/core/storage.py | 2 +- misoclib/tools/litescope/core/trigger.py | 2 +- misoclib/tools/{ => litescope}/doc/.gitignore | 0 misoclib/tools/{ => litescope}/doc/Makefile | 0 misoclib/tools/{ => litescope}/doc/make.bat | 0 .../doc/source/_static/LiteScope_logo_full.png | Bin .../doc/source/_static/LiteScope_logo_full.svg | 0 .../enjoydigital_sphinx_rtd_theme/__init__.py | 0 .../enjoydigital_sphinx_rtd_theme/breadcrumbs.html | 0 .../enjoydigital_sphinx_rtd_theme/footer.html | 0 .../enjoydigital_sphinx_rtd_theme/layout.html | 0 .../enjoydigital_sphinx_rtd_theme/layout_old.html | 0 .../enjoydigital_sphinx_rtd_theme/search.html | 0 .../enjoydigital_sphinx_rtd_theme/searchbox.html | 0 .../static/css/badge_only.css | 0 .../static/css/theme - prior to centering.css | 0 .../static/css/theme.css | 0 .../static/fonts/fontawesome-webfont.eot | Bin .../static/fonts/fontawesome-webfont.svg | 0 .../static/fonts/fontawesome-webfont.ttf | Bin .../static/fonts/fontawesome-webfont.woff | Bin .../static/js/theme.js | 0 .../enjoydigital_sphinx_rtd_theme/theme.conf | 0 .../enjoydigital_sphinx_rtd_theme/versions.html | 0 misoclib/tools/{ => litescope}/doc/source/conf.py | 0 .../{ => litescope}/doc/source/docs/core/index.rst | 0 .../doc/source/docs/frontend/index.rst | 0 .../doc/source/docs/getting_started/FAQ.rst | 0 .../doc/source/docs/getting_started/bug_reports.rst | 0 .../doc/source/docs/getting_started/downloads.rst | 0 .../doc/source/docs/getting_started/index.rst | 0 .../tools/{ => litescope}/doc/source/docs/index.rst | 0 .../{ => litescope}/doc/source/docs/intro/about.rst | 0 .../doc/source/docs/intro/community.rst | 0 .../{ => litescope}/doc/source/docs/intro/index.rst | 0 .../doc/source/docs/intro/license.rst | 0 .../doc/source/docs/intro/release_notes.rst | 0 .../source/docs/intro/talks_and_publications.rst | 0 .../doc/source/home_page_layout.html | 0 misoclib/tools/{ => litescope}/doc/source/index.rst | 0 misoclib/tools/litescope/frontend/io.py | 2 +- misoclib/tools/litescope/frontend/la.py | 6 +++--- misoclib/tools/litescope/host/driver/etherbone.py | 2 +- misoclib/tools/litescope/host/driver/la.py | 12 ++++++------ misoclib/tools/litescope/host/driver/uart.py | 2 +- misoclib/tools/litescope/host/dump/csv.py | 2 +- misoclib/tools/litescope/host/dump/python.py | 2 +- misoclib/tools/litescope/host/dump/sigrok.py | 2 +- misoclib/tools/litescope/host/dump/vcd.py | 2 +- .../tools/{ => litescope}/litescope-version.txt | 0 misoclib/tools/{ => litescope}/make.py | 2 +- misoclib/tools/{ => litescope}/setup.py | 0 misoclib/tools/{ => litescope}/targets/__init__.py | 0 misoclib/tools/{ => litescope}/targets/simple.py | 10 +++++----- misoclib/tools/{ => litescope}/test/Makefile | 0 misoclib/tools/{ => litescope}/test/make.py | 4 ++-- misoclib/tools/{ => litescope}/test/test_io.py | 2 +- misoclib/tools/{ => litescope}/test/test_la.py | 2 +- misoclib/tools/{ => litescope}/test/test_regs.py | 0 71 files changed, 46 insertions(+), 49 deletions(-) delete mode 100644 misoclib/tools/.gitignore create mode 100644 misoclib/tools/__init__.py rename misoclib/tools/{ => litescope}/LICENSE (100%) rename misoclib/tools/{ => litescope}/README (100%) rename misoclib/tools/{ => litescope}/doc/.gitignore (100%) rename misoclib/tools/{ => litescope}/doc/Makefile (100%) rename misoclib/tools/{ => litescope}/doc/make.bat (100%) rename misoclib/tools/{ => litescope}/doc/source/_static/LiteScope_logo_full.png (100%) rename misoclib/tools/{ => litescope}/doc/source/_static/LiteScope_logo_full.svg (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf (100%) rename misoclib/tools/{ => litescope}/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html (100%) rename misoclib/tools/{ => litescope}/doc/source/conf.py (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/core/index.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/frontend/index.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/getting_started/FAQ.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/getting_started/bug_reports.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/getting_started/downloads.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/getting_started/index.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/index.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/intro/about.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/intro/community.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/intro/index.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/intro/license.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/intro/release_notes.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/docs/intro/talks_and_publications.rst (100%) rename misoclib/tools/{ => litescope}/doc/source/home_page_layout.html (100%) rename misoclib/tools/{ => litescope}/doc/source/index.rst (100%) rename misoclib/tools/{ => litescope}/litescope-version.txt (100%) rename misoclib/tools/{ => litescope}/make.py (98%) rename misoclib/tools/{ => litescope}/setup.py (100%) rename misoclib/tools/{ => litescope}/targets/__init__.py (100%) rename misoclib/tools/{ => litescope}/targets/simple.py (91%) rename misoclib/tools/{ => litescope}/test/Makefile (100%) rename misoclib/tools/{ => litescope}/test/make.py (87%) rename misoclib/tools/{ => litescope}/test/test_io.py (88%) rename misoclib/tools/{ => litescope}/test/test_la.py (87%) rename misoclib/tools/{ => litescope}/test/test_regs.py (100%) diff --git a/misoclib/com/liteeth/example_designs/targets/base.py b/misoclib/com/liteeth/example_designs/targets/base.py index 443eab5a..784e4762 100644 --- a/misoclib/com/liteeth/example_designs/targets/base.py +++ b/misoclib/com/liteeth/example_designs/targets/base.py @@ -9,10 +9,10 @@ from migen.bank.description import * from targets import * -from litescope.common import * -from litescope.bridge.uart2wb import LiteScopeUART2WB -from litescope.frontend.la import LiteScopeLA -from litescope.core.port import LiteScopeTerm +from misoclib.tools.litescope.common import * +from misoclib.tools.litescope.bridge.uart2wb import LiteScopeUART2WB +from misoclib.tools.litescope.frontend.la import LiteScopeLA +from misoclib.tools.litescope.core.port import LiteScopeTerm from misoclib.com.liteeth.common import * from misoclib.com.liteeth.generic import * diff --git a/misoclib/com/liteeth/example_designs/targets/etherbone.py b/misoclib/com/liteeth/example_designs/targets/etherbone.py index 5b58aa73..f1c9abfe 100644 --- a/misoclib/com/liteeth/example_designs/targets/etherbone.py +++ b/misoclib/com/liteeth/example_designs/targets/etherbone.py @@ -1,6 +1,6 @@ -from litescope.common import * -from litescope.frontend.la import LiteScopeLA -from litescope.core.port import LiteScopeTerm +from misoclib.tools.litescope.common import * +from misoclib.tools.litescope.frontend.la import LiteScopeLA +from misoclib.tools.litescope.core.port import LiteScopeTerm from misoclib.com.liteeth.common import * from misoclib.com.liteeth.generic import * diff --git a/misoclib/com/liteeth/example_designs/targets/tty.py b/misoclib/com/liteeth/example_designs/targets/tty.py index e2fbe87a..d3ffa50a 100644 --- a/misoclib/com/liteeth/example_designs/targets/tty.py +++ b/misoclib/com/liteeth/example_designs/targets/tty.py @@ -1,6 +1,6 @@ -from litescope.common import * -from litescope.frontend.la import LiteScopeLA -from litescope.core.port import LiteScopeTerm +from misoclib.tools.litescope.common import * +from misoclib.tools.litescope.frontend.la import LiteScopeLA +from misoclib.tools.litescope.core.port import LiteScopeTerm from misoclib.com.liteeth.common import * from misoclib.com.liteeth.generic import * diff --git a/misoclib/com/liteeth/example_designs/targets/udp.py b/misoclib/com/liteeth/example_designs/targets/udp.py index 9e4da6a1..18c80696 100644 --- a/misoclib/com/liteeth/example_designs/targets/udp.py +++ b/misoclib/com/liteeth/example_designs/targets/udp.py @@ -1,6 +1,6 @@ -from litescope.common import * -from litescope.frontend.la import LiteScopeLA -from litescope.core.port import LiteScopeTerm +from misoclib.tools.litescope.common import * +from misoclib.tools.litescope.frontend.la import LiteScopeLA +from misoclib.tools.litescope.core.port import LiteScopeTerm from misoclib.com.liteeth.common import * from misoclib.com.liteeth.generic import * diff --git a/misoclib/com/liteeth/example_designs/test/make.py b/misoclib/com/liteeth/example_designs/test/make.py index 05e13aad..ee69f866 100644 --- a/misoclib/com/liteeth/example_designs/test/make.py +++ b/misoclib/com/liteeth/example_designs/test/make.py @@ -17,10 +17,10 @@ def _get_args(): if __name__ == "__main__": args = _get_args() if args.bridge == "uart": - from litescope.host.driver.uart import LiteScopeUARTDriver + from misoclib.tools.litescope.host.driver.uart import LiteScopeUARTDriver wb = LiteScopeUARTDriver(args.port, args.baudrate, "./csr.csv", int(args.busword), debug=False) elif args.bridge == "etherbone": - from litescope.host.driver.etherbone import LiteScopeEtherboneDriver + from misoclib.tools.litescope.host.driver.etherbone import LiteScopeEtherboneDriver wb = LiteScopeEtherboneDriver(args.ip_address, int(args.udp_port), "./csr.csv", int(args.busword), debug=False) else: ValueError("Invalid bridge {}".format(args.bridge)) diff --git a/misoclib/com/liteeth/example_designs/test/test_la.py b/misoclib/com/liteeth/example_designs/test/test_la.py index c15de8c8..21faec4b 100644 --- a/misoclib/com/liteeth/example_designs/test/test_la.py +++ b/misoclib/com/liteeth/example_designs/test/test_la.py @@ -1,5 +1,5 @@ import time -from litescope.host.driver.la import LiteScopeLADriver +from misoclib.tools.litescope.host.driver.la import LiteScopeLADriver def main(wb): la = LiteScopeLADriver(wb.regs, "la", debug=True) diff --git a/misoclib/tools/.gitignore b/misoclib/tools/.gitignore deleted file mode 100644 index 065c5521..00000000 --- a/misoclib/tools/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -__pycache__ -*.pyc -*.vcd diff --git a/misoclib/tools/__init__.py b/misoclib/tools/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/misoclib/tools/LICENSE b/misoclib/tools/litescope/LICENSE similarity index 100% rename from misoclib/tools/LICENSE rename to misoclib/tools/litescope/LICENSE diff --git a/misoclib/tools/README b/misoclib/tools/litescope/README similarity index 100% rename from misoclib/tools/README rename to misoclib/tools/litescope/README diff --git a/misoclib/tools/litescope/bridge/uart2wb.py b/misoclib/tools/litescope/bridge/uart2wb.py index 731c1a5a..b78dc8b3 100644 --- a/misoclib/tools/litescope/bridge/uart2wb.py +++ b/misoclib/tools/litescope/bridge/uart2wb.py @@ -1,4 +1,4 @@ -from litescope.common import * +from misoclib.tools.litescope.common import * from migen.bus import wishbone from migen.genlib.misc import chooser from migen.genlib.cdc import MultiReg diff --git a/misoclib/tools/litescope/core/port.py b/misoclib/tools/litescope/core/port.py index eb681edf..6e186291 100644 --- a/misoclib/tools/litescope/core/port.py +++ b/misoclib/tools/litescope/core/port.py @@ -1,4 +1,4 @@ -from litescope.common import * +from misoclib.tools.litescope.common import * class LiteScopeTermUnit(Module): def __init__(self, dw): diff --git a/misoclib/tools/litescope/core/storage.py b/misoclib/tools/litescope/core/storage.py index 30aab161..12219b45 100644 --- a/misoclib/tools/litescope/core/storage.py +++ b/misoclib/tools/litescope/core/storage.py @@ -1,4 +1,4 @@ -from litescope.common import * +from misoclib.tools.litescope.common import * from migen.flow.plumbing import Buffer class LiteScopeSubSamplerUnit(Module): diff --git a/misoclib/tools/litescope/core/trigger.py b/misoclib/tools/litescope/core/trigger.py index 403e8248..c9b23c93 100644 --- a/misoclib/tools/litescope/core/trigger.py +++ b/misoclib/tools/litescope/core/trigger.py @@ -1,4 +1,4 @@ -from litescope.common import * +from misoclib.tools.litescope.common import * class LiteScopeSumUnit(Module, AutoCSR): def __init__(self, ports): diff --git a/misoclib/tools/doc/.gitignore b/misoclib/tools/litescope/doc/.gitignore similarity index 100% rename from misoclib/tools/doc/.gitignore rename to misoclib/tools/litescope/doc/.gitignore diff --git a/misoclib/tools/doc/Makefile b/misoclib/tools/litescope/doc/Makefile similarity index 100% rename from misoclib/tools/doc/Makefile rename to misoclib/tools/litescope/doc/Makefile diff --git a/misoclib/tools/doc/make.bat b/misoclib/tools/litescope/doc/make.bat similarity index 100% rename from misoclib/tools/doc/make.bat rename to misoclib/tools/litescope/doc/make.bat diff --git a/misoclib/tools/doc/source/_static/LiteScope_logo_full.png b/misoclib/tools/litescope/doc/source/_static/LiteScope_logo_full.png similarity index 100% rename from misoclib/tools/doc/source/_static/LiteScope_logo_full.png rename to misoclib/tools/litescope/doc/source/_static/LiteScope_logo_full.png diff --git a/misoclib/tools/doc/source/_static/LiteScope_logo_full.svg b/misoclib/tools/litescope/doc/source/_static/LiteScope_logo_full.svg similarity index 100% rename from misoclib/tools/doc/source/_static/LiteScope_logo_full.svg rename to misoclib/tools/litescope/doc/source/_static/LiteScope_logo_full.svg diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf diff --git a/misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html b/misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html similarity index 100% rename from misoclib/tools/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html rename to misoclib/tools/litescope/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html diff --git a/misoclib/tools/doc/source/conf.py b/misoclib/tools/litescope/doc/source/conf.py similarity index 100% rename from misoclib/tools/doc/source/conf.py rename to misoclib/tools/litescope/doc/source/conf.py diff --git a/misoclib/tools/doc/source/docs/core/index.rst b/misoclib/tools/litescope/doc/source/docs/core/index.rst similarity index 100% rename from misoclib/tools/doc/source/docs/core/index.rst rename to misoclib/tools/litescope/doc/source/docs/core/index.rst diff --git a/misoclib/tools/doc/source/docs/frontend/index.rst b/misoclib/tools/litescope/doc/source/docs/frontend/index.rst similarity index 100% rename from misoclib/tools/doc/source/docs/frontend/index.rst rename to misoclib/tools/litescope/doc/source/docs/frontend/index.rst diff --git a/misoclib/tools/doc/source/docs/getting_started/FAQ.rst b/misoclib/tools/litescope/doc/source/docs/getting_started/FAQ.rst similarity index 100% rename from misoclib/tools/doc/source/docs/getting_started/FAQ.rst rename to misoclib/tools/litescope/doc/source/docs/getting_started/FAQ.rst diff --git a/misoclib/tools/doc/source/docs/getting_started/bug_reports.rst b/misoclib/tools/litescope/doc/source/docs/getting_started/bug_reports.rst similarity index 100% rename from misoclib/tools/doc/source/docs/getting_started/bug_reports.rst rename to misoclib/tools/litescope/doc/source/docs/getting_started/bug_reports.rst diff --git a/misoclib/tools/doc/source/docs/getting_started/downloads.rst b/misoclib/tools/litescope/doc/source/docs/getting_started/downloads.rst similarity index 100% rename from misoclib/tools/doc/source/docs/getting_started/downloads.rst rename to misoclib/tools/litescope/doc/source/docs/getting_started/downloads.rst diff --git a/misoclib/tools/doc/source/docs/getting_started/index.rst b/misoclib/tools/litescope/doc/source/docs/getting_started/index.rst similarity index 100% rename from misoclib/tools/doc/source/docs/getting_started/index.rst rename to misoclib/tools/litescope/doc/source/docs/getting_started/index.rst diff --git a/misoclib/tools/doc/source/docs/index.rst b/misoclib/tools/litescope/doc/source/docs/index.rst similarity index 100% rename from misoclib/tools/doc/source/docs/index.rst rename to misoclib/tools/litescope/doc/source/docs/index.rst diff --git a/misoclib/tools/doc/source/docs/intro/about.rst b/misoclib/tools/litescope/doc/source/docs/intro/about.rst similarity index 100% rename from misoclib/tools/doc/source/docs/intro/about.rst rename to misoclib/tools/litescope/doc/source/docs/intro/about.rst diff --git a/misoclib/tools/doc/source/docs/intro/community.rst b/misoclib/tools/litescope/doc/source/docs/intro/community.rst similarity index 100% rename from misoclib/tools/doc/source/docs/intro/community.rst rename to misoclib/tools/litescope/doc/source/docs/intro/community.rst diff --git a/misoclib/tools/doc/source/docs/intro/index.rst b/misoclib/tools/litescope/doc/source/docs/intro/index.rst similarity index 100% rename from misoclib/tools/doc/source/docs/intro/index.rst rename to misoclib/tools/litescope/doc/source/docs/intro/index.rst diff --git a/misoclib/tools/doc/source/docs/intro/license.rst b/misoclib/tools/litescope/doc/source/docs/intro/license.rst similarity index 100% rename from misoclib/tools/doc/source/docs/intro/license.rst rename to misoclib/tools/litescope/doc/source/docs/intro/license.rst diff --git a/misoclib/tools/doc/source/docs/intro/release_notes.rst b/misoclib/tools/litescope/doc/source/docs/intro/release_notes.rst similarity index 100% rename from misoclib/tools/doc/source/docs/intro/release_notes.rst rename to misoclib/tools/litescope/doc/source/docs/intro/release_notes.rst diff --git a/misoclib/tools/doc/source/docs/intro/talks_and_publications.rst b/misoclib/tools/litescope/doc/source/docs/intro/talks_and_publications.rst similarity index 100% rename from misoclib/tools/doc/source/docs/intro/talks_and_publications.rst rename to misoclib/tools/litescope/doc/source/docs/intro/talks_and_publications.rst diff --git a/misoclib/tools/doc/source/home_page_layout.html b/misoclib/tools/litescope/doc/source/home_page_layout.html similarity index 100% rename from misoclib/tools/doc/source/home_page_layout.html rename to misoclib/tools/litescope/doc/source/home_page_layout.html diff --git a/misoclib/tools/doc/source/index.rst b/misoclib/tools/litescope/doc/source/index.rst similarity index 100% rename from misoclib/tools/doc/source/index.rst rename to misoclib/tools/litescope/doc/source/index.rst diff --git a/misoclib/tools/litescope/frontend/io.py b/misoclib/tools/litescope/frontend/io.py index feec8170..58fba266 100644 --- a/misoclib/tools/litescope/frontend/io.py +++ b/misoclib/tools/litescope/frontend/io.py @@ -1,4 +1,4 @@ -from litescope.common import * +from misoclib.tools.litescope.common import * class LiteScopeIO(Module, AutoCSR): def __init__(self, dw): diff --git a/misoclib/tools/litescope/frontend/la.py b/misoclib/tools/litescope/frontend/la.py index fd8bd269..09c023fb 100644 --- a/misoclib/tools/litescope/frontend/la.py +++ b/misoclib/tools/litescope/frontend/la.py @@ -1,6 +1,6 @@ -from litescope.common import * -from litescope.core.trigger import LiteScopeTrigger -from litescope.core.storage import LiteScopeSubSampler, LiteScopeRecorder, LiteScopeRunLengthEncoder +from misoclib.tools.litescope.common import * +from misoclib.tools.litescope.core.trigger import LiteScopeTrigger +from misoclib.tools.litescope.core.storage import LiteScopeSubSampler, LiteScopeRecorder, LiteScopeRunLengthEncoder from mibuild.tools import write_to_file diff --git a/misoclib/tools/litescope/host/driver/etherbone.py b/misoclib/tools/litescope/host/driver/etherbone.py index 12a58bc3..0f3efd15 100644 --- a/misoclib/tools/litescope/host/driver/etherbone.py +++ b/misoclib/tools/litescope/host/driver/etherbone.py @@ -1,5 +1,5 @@ import socket -from litescope.host.driver.reg import * +from misoclib.tools.litescope.host.driver.reg import * from liteeth.test.model.etherbone import * diff --git a/misoclib/tools/litescope/host/driver/la.py b/misoclib/tools/litescope/host/driver/la.py index a60d5d72..dcf09dfa 100644 --- a/misoclib/tools/litescope/host/driver/la.py +++ b/misoclib/tools/litescope/host/driver/la.py @@ -1,8 +1,8 @@ import csv from struct import * from migen.fhdl.structure import * -from litescope.host.dump import * -from litescope.host.driver.truthtable import * +from misoclib.tools.litescope.host.dump import * +from misoclib.tools.litescope.host.driver.truthtable import * class LiteScopeLADriver(): def __init__(self, regs, name, config_csv=None, clk_freq=None, debug=False): @@ -124,16 +124,16 @@ class LiteScopeLADriver(): print("saving to " + filename) name, ext = os.path.splitext(filename) if ext == ".vcd": - from litescope.host.dump.vcd import VCDDump + from misoclib.tools.litescope.host.dump.vcd import VCDDump dump = VCDDump() elif ext == ".csv": - from litescope.host.dump.csv import CSVDump + from misoclib.tools.litescope.host.dump.csv import CSVDump dump = CSVDump() elif ext == ".py": - from litescope.host.dump.python import PythonDump + from misoclib.tools.litescope.host.dump.python import PythonDump dump = PythonDump() elif ext == ".sr": - from litescope.host.dump.sigrok import SigrokDump + from misoclib.tools.litescope.host.dump.sigrok import SigrokDump if self.samplerate is None: raise ValueError("Unable to automatically retrieve clk_freq, clk_freq parameter required") dump = SigrokDump(samplerate=self.samplerate) diff --git a/misoclib/tools/litescope/host/driver/uart.py b/misoclib/tools/litescope/host/driver/uart.py index 53ab2cac..4771c989 100644 --- a/misoclib/tools/litescope/host/driver/uart.py +++ b/misoclib/tools/litescope/host/driver/uart.py @@ -1,6 +1,6 @@ import serial from struct import * -from litescope.host.driver.reg import * +from misoclib.tools.litescope.host.driver.reg import * def write_b(uart, data): uart.write(pack('B',data)) diff --git a/misoclib/tools/litescope/host/dump/csv.py b/misoclib/tools/litescope/host/dump/csv.py index 8face7f8..d30acb4c 100644 --- a/misoclib/tools/litescope/host/dump/csv.py +++ b/misoclib/tools/litescope/host/dump/csv.py @@ -1,4 +1,4 @@ -from litescope.host.dump import * +from misoclib.tools.litescope.host.dump import * class CSVDump(Dump): def __init__(self, init_dump=None): diff --git a/misoclib/tools/litescope/host/dump/python.py b/misoclib/tools/litescope/host/dump/python.py index 0dd9cdd1..005b6f87 100644 --- a/misoclib/tools/litescope/host/dump/python.py +++ b/misoclib/tools/litescope/host/dump/python.py @@ -1,4 +1,4 @@ -from litescope.host.dump import * +from misoclib.tools.litescope.host.dump import * class PythonDump(Dump): def __init__(self, init_dump=None): diff --git a/misoclib/tools/litescope/host/dump/sigrok.py b/misoclib/tools/litescope/host/dump/sigrok.py index 769d4536..1eb3f213 100644 --- a/misoclib/tools/litescope/host/dump/sigrok.py +++ b/misoclib/tools/litescope/host/dump/sigrok.py @@ -5,7 +5,7 @@ import zipfile import re from collections import OrderedDict -from litescope.host.dump import * +from misoclib.tools.litescope.host.dump import * class SigrokDump(Dump): def __init__(self, init_dump=None, samplerate=50000000): diff --git a/misoclib/tools/litescope/host/dump/vcd.py b/misoclib/tools/litescope/host/dump/vcd.py index 1646eb9f..1ed5c252 100644 --- a/misoclib/tools/litescope/host/dump/vcd.py +++ b/misoclib/tools/litescope/host/dump/vcd.py @@ -1,5 +1,5 @@ import datetime -from litescope.host.dump import * +from misoclib.tools.litescope.host.dump import * class VCDDump(Dump): def __init__(self, init_dump=None, timescale="1ps", comment=""): diff --git a/misoclib/tools/litescope-version.txt b/misoclib/tools/litescope/litescope-version.txt similarity index 100% rename from misoclib/tools/litescope-version.txt rename to misoclib/tools/litescope/litescope-version.txt diff --git a/misoclib/tools/make.py b/misoclib/tools/litescope/make.py similarity index 98% rename from misoclib/tools/make.py rename to misoclib/tools/litescope/make.py index 4fb2238c..5c0c85f3 100644 --- a/misoclib/tools/make.py +++ b/misoclib/tools/litescope/make.py @@ -10,7 +10,7 @@ from migen.bank.description import CSRStatus from mibuild import tools from mibuild.xilinx_common import * -from litescope.common import * +from misoclib.tools.litescope.common import * def get_csr_csv(regions): r = "" diff --git a/misoclib/tools/setup.py b/misoclib/tools/litescope/setup.py similarity index 100% rename from misoclib/tools/setup.py rename to misoclib/tools/litescope/setup.py diff --git a/misoclib/tools/targets/__init__.py b/misoclib/tools/litescope/targets/__init__.py similarity index 100% rename from misoclib/tools/targets/__init__.py rename to misoclib/tools/litescope/targets/__init__.py diff --git a/misoclib/tools/targets/simple.py b/misoclib/tools/litescope/targets/simple.py similarity index 91% rename from misoclib/tools/targets/simple.py rename to misoclib/tools/litescope/targets/simple.py index 27556fd3..95a81e50 100644 --- a/misoclib/tools/targets/simple.py +++ b/misoclib/tools/litescope/targets/simple.py @@ -7,11 +7,11 @@ from migen.bank.description import * from targets import * -from litescope.common import * -from litescope.bridge.uart2wb import LiteScopeUART2WB -from litescope.frontend.io import LiteScopeIO -from litescope.frontend.la import LiteScopeLA -from litescope.core.port import LiteScopeTerm +from misoclib.tools.litescope.common import * +from misoclib.tools.litescope.bridge.uart2wb import LiteScopeUART2WB +from misoclib.tools.litescope.frontend.io import LiteScopeIO +from misoclib.tools.litescope.frontend.la import LiteScopeLA +from misoclib.tools.litescope.core.port import LiteScopeTerm class _CRG(Module): def __init__(self, clk_in): diff --git a/misoclib/tools/test/Makefile b/misoclib/tools/litescope/test/Makefile similarity index 100% rename from misoclib/tools/test/Makefile rename to misoclib/tools/litescope/test/Makefile diff --git a/misoclib/tools/test/make.py b/misoclib/tools/litescope/test/make.py similarity index 87% rename from misoclib/tools/test/make.py rename to misoclib/tools/litescope/test/make.py index 92fe667b..335623c0 100644 --- a/misoclib/tools/test/make.py +++ b/misoclib/tools/litescope/test/make.py @@ -17,10 +17,10 @@ def _get_args(): if __name__ == "__main__": args = _get_args() if args.bridge == "uart": - from litescope.host.driver.uart import LiteScopeUARTDriver + from misoclib.tools.litescope.host.driver.uart import LiteScopeUARTDriver wb = LiteScopeUARTDriver(args.port, args.baudrate, "./csr.csv", int(args.busword), debug=False) elif args.bridge == "etherbone": - from litescope.host.driver.etherbone import LiteScopeEtherboneDriver + from misoclib.tools.litescope.host.driver.etherbone import LiteScopeEtherboneDriver wb = LiteScopeEtherboneDriver(args.ip_address, int(args.udp_port), "./csr.csv", int(args.busword), debug=False) else: ValueError("Invalid bridge {}".format(args.bridge)) diff --git a/misoclib/tools/test/test_io.py b/misoclib/tools/litescope/test/test_io.py similarity index 88% rename from misoclib/tools/test/test_io.py rename to misoclib/tools/litescope/test/test_io.py index 15440820..135de36a 100644 --- a/misoclib/tools/test/test_io.py +++ b/misoclib/tools/litescope/test/test_io.py @@ -1,5 +1,5 @@ import time -from litescope.host.driver.io import LiteScopeIODriver +from misoclib.tools.litescope.host.driver.io import LiteScopeIODriver def led_anim0(io): for i in range(10): diff --git a/misoclib/tools/test/test_la.py b/misoclib/tools/litescope/test/test_la.py similarity index 87% rename from misoclib/tools/test/test_la.py rename to misoclib/tools/litescope/test/test_la.py index 9ae14dd6..7a4b79e8 100644 --- a/misoclib/tools/test/test_la.py +++ b/misoclib/tools/litescope/test/test_la.py @@ -1,4 +1,4 @@ -from litescope.host.driver.la import LiteScopeLADriver +from misoclib.tools.litescope.host.driver.la import LiteScopeLADriver def main(wb): wb.open() diff --git a/misoclib/tools/test/test_regs.py b/misoclib/tools/litescope/test/test_regs.py similarity index 100% rename from misoclib/tools/test/test_regs.py rename to misoclib/tools/litescope/test/test_regs.py -- 2.30.2